mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
0.3 --> 0.5
xwais disabled because of a problem in myAsciiSink.c this port is no longer broken temporarily set to NO_PACKAGE and NO_INSTALL, work in progress
This commit is contained in:
Adam David
parent
80ccdddb9a
commit
88b54656a8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=4433
5 changed files with 177 additions and 113 deletions
|
|
@ -1,18 +1,31 @@
|
||||||
# New ports collection makefile for: wais
|
# New ports collection makefile for: wais
|
||||||
# Version required: 0.3
|
# Version required: 0.5
|
||||||
# Date created: 20 Sep 1994
|
# Date created: 20 Sep 1994
|
||||||
# Whom: adam
|
# Whom: adam
|
||||||
#
|
#
|
||||||
# $Id: Makefile,v 1.7 1995/11/27 04:05:48 asami Exp $
|
# $Id: Makefile,v 1.8 1996/04/12 08:43:43 asami Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
DISTNAME= freeWAIS-0.3
|
DISTNAME= freeWAIS-0.5
|
||||||
CATEGORIES+= net
|
CATEGORIES+= net
|
||||||
MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
|
MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
|
||||||
|
|
||||||
BROKEN= yes
|
NO_PACKAGE= not yet
|
||||||
USE_GMAKE= yes
|
NO_INSTALL= almost
|
||||||
|
ALL_TARGET= freebsd
|
||||||
|
MAKE_ENV:= TOP=${WRKSRC}
|
||||||
|
|
||||||
is_depended: all
|
is_depended: all
|
||||||
|
|
||||||
|
pre-patch:
|
||||||
|
@${CP} ${WRKSRC}/Makefile.bsdi ${WRKSRC}/Makefile.freebsd
|
||||||
|
@mv ${WRKSRC}/src/client/x/Imakefile ${WRKDIR} \
|
||||||
|
&& ${SED} -e '\;/SETME_IN_Imakefile;s;;${WRKSRC};' \
|
||||||
|
<${WRKDIR}/Imakefile >${WRKSRC}/src/client/x/Imakefile
|
||||||
|
|
||||||
|
.if ${MAKEFILE} != Makefile.freebsd
|
||||||
|
do-install:
|
||||||
|
${MAKE} MAKEFILE=Makefile.freebsd do-install
|
||||||
|
.endif
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
MD5 (freeWAIS-0.3.tar.gz) = bbde34318619da836de0ede92536fc32
|
MD5 (freeWAIS-0.5.tar.gz) = 320271bac5afc30e3375ac0de63498fd
|
||||||
|
|
|
||||||
|
|
@ -1,49 +1,91 @@
|
||||||
*** ir/irtfiles.c Wed Jan 19 16:10:32 1994
|
*** src/ir/sockets.c.old Wed Apr 26 12:18:43 1995
|
||||||
--- ir/irtfiles.c Fri Sep 16 23:14:03 1994
|
--- src/ir/sockets.c Tue Nov 12 23:20:17 1996
|
||||||
***************
|
***************
|
||||||
*** 75,80 ****
|
*** 81,88 ****
|
||||||
--- 75,81 ----
|
#if (defined(ultrix) || defined(BSD) || defined(Mach))
|
||||||
|
extern int errno;
|
||||||
#include <ctype.h>
|
|
||||||
#include <string.h>
|
|
||||||
+ #include <sys/types.h>
|
|
||||||
#include "panic.h"
|
|
||||||
#include "irdirent.h"
|
|
||||||
#include "irhash.h"
|
|
||||||
*** ir/sockets.c.ORIG Sat Jan 29 00:06:01 1994
|
|
||||||
--- ir/sockets.c Sat Mar 18 23:34:57 1995
|
|
||||||
***************
|
|
||||||
*** 77,84 ****
|
|
||||||
extern int errno;
|
|
||||||
#endif /* ultrix BSD or Mach */
|
#endif /* ultrix BSD or Mach */
|
||||||
|
!
|
||||||
- extern char *sys_errlist[];
|
extern char *sys_errlist[];
|
||||||
-
|
|
||||||
|
|
||||||
/* XXX
|
/* XXX
|
||||||
still need:
|
--- 81,90 ----
|
||||||
--- 77,82 ----
|
#if (defined(ultrix) || defined(BSD) || defined(Mach))
|
||||||
*** ir/waisserver.c.ORIG Thu Mar 3 04:04:51 1994
|
extern int errno;
|
||||||
--- ir/waisserver.c Sat Mar 18 23:35:49 1995
|
#endif /* ultrix BSD or Mach */
|
||||||
|
!
|
||||||
|
! #ifndef __bsdi__
|
||||||
|
extern char *sys_errlist[];
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
|
||||||
|
/* XXX
|
||||||
***************
|
***************
|
||||||
*** 447,453 ****
|
*** 203,209 ****
|
||||||
struct dirent **list;
|
if(source.sin_family == AF_INET) {
|
||||||
int naptime = 0;
|
struct hostent *peer = NULL;
|
||||||
extern int errno;
|
|
||||||
- extern char *sys_errlist[];
|
|
||||||
extern void filename_finish_header_function();
|
|
||||||
dataopsrec dataops;
|
|
||||||
|
|
||||||
--- 447,452 ----
|
|
||||||
*** x/myAsciiSrc.c.ORIG Sun Jan 9 06:01:37 1994
|
|
||||||
--- x/myAsciiSrc.c Sat Mar 18 23:45:03 1995
|
|
||||||
***************
|
|
||||||
*** 116,122 ****
|
|
||||||
static String MyStrncpy(), StorePiecesInString();
|
|
||||||
static Boolean SetValues(), WriteToFile();
|
|
||||||
extern int errno, sys_nerr;
|
|
||||||
- extern char* sys_errlist[];
|
|
||||||
|
|
||||||
#define superclass (&textSrcClassRec)
|
! #if defined(__DGUX__) || defined(LINUX)
|
||||||
MyAsciiSrcClassRec myasciiSrcClassRec = {
|
peer = gethostbyaddr((char *)&source.sin_addr.s_addr, 4, AF_INET);
|
||||||
--- 116,121 ----
|
#else
|
||||||
|
peer = gethostbyaddr((struct sockaddr_in*)&source.sin_addr, 4, AF_INET);
|
||||||
|
--- 205,211 ----
|
||||||
|
if(source.sin_family == AF_INET) {
|
||||||
|
struct hostent *peer = NULL;
|
||||||
|
|
||||||
|
! #if defined(__DGUX__) || defined(LINUX) || defined(__bsdi__) /* XXX */
|
||||||
|
peer = gethostbyaddr((char *)&source.sin_addr.s_addr, 4, AF_INET);
|
||||||
|
#else
|
||||||
|
peer = gethostbyaddr((struct sockaddr_in*)&source.sin_addr, 4, AF_INET);
|
||||||
|
*** src/ir/irfiles.c.old Wed Apr 26 12:18:41 1995
|
||||||
|
--- src/ir/irfiles.c Tue Nov 12 23:27:43 1996
|
||||||
|
***************
|
||||||
|
*** 297,303 ****
|
||||||
|
|
||||||
|
else {
|
||||||
|
|
||||||
|
! if( utlk_using_lock_and_get_pid(db->database_file, LOCK_INDEX, (pid_t) &pid) &&
|
||||||
|
(pid != getpid()) ) {
|
||||||
|
waislog(WLOG_HIGH, WLOG_ERROR,
|
||||||
|
"an indexing is currently running on the database. Try again later.");
|
||||||
|
--- 297,303 ----
|
||||||
|
|
||||||
|
else {
|
||||||
|
|
||||||
|
! if( utlk_using_lock_and_get_pid(db->database_file, LOCK_INDEX, (pid_t *) &pid) &&
|
||||||
|
(pid != getpid()) ) {
|
||||||
|
waislog(WLOG_HIGH, WLOG_ERROR,
|
||||||
|
"an indexing is currently running on the database. Try again later.");
|
||||||
|
*** src/client/x/scommands.c.old Wed Apr 26 12:18:39 1995
|
||||||
|
--- src/client/x/scommands.c Wed Nov 13 01:41:42 1996
|
||||||
|
***************
|
||||||
|
*** 159,165 ****
|
||||||
|
edit_source->maintainer = s_strdup(GetString(maintainerwid));
|
||||||
|
|
||||||
|
if (edit_source->description != NULL) s_free(edit_source->description);
|
||||||
|
! edit_source->description = s_strdup(GetAsciiString(descwid));
|
||||||
|
|
||||||
|
strncpy(edit_source->server, GetString(serverwid), STRINGSIZE);
|
||||||
|
strncpy(edit_source->service, GetString(servicewid), STRINGSIZE);
|
||||||
|
--- 159,165 ----
|
||||||
|
edit_source->maintainer = s_strdup(GetString(maintainerwid));
|
||||||
|
|
||||||
|
if (edit_source->description != NULL) s_free(edit_source->description);
|
||||||
|
! edit_source->description = s_strdup((String)GetAsciiString(descwid));
|
||||||
|
|
||||||
|
strncpy(edit_source->server, GetString(serverwid), STRINGSIZE);
|
||||||
|
strncpy(edit_source->service, GetString(servicewid), STRINGSIZE);
|
||||||
|
*** src/client/x/catalog.c.old Wed Apr 26 12:18:39 1995
|
||||||
|
--- src/client/x/catalog.c Wed Nov 13 01:45:20 1996
|
||||||
|
***************
|
||||||
|
*** 27,32 ****
|
||||||
|
--- 27,34 ----
|
||||||
|
#include "xwais.h"
|
||||||
|
#include "cat.h"
|
||||||
|
|
||||||
|
+ #undef index
|
||||||
|
+
|
||||||
|
static Boolean busy = FALSE;
|
||||||
|
static long last_doc = -1;
|
||||||
|
static Catbuff scat = NULL;
|
||||||
|
|
|
||||||
|
|
@ -1,72 +1,81 @@
|
||||||
*** Makefile.ORIG Tue Mar 15 20:30:00 1994
|
*** Makefile.old Wed May 3 08:55:29 1995
|
||||||
--- Makefile Sat Mar 18 23:28:59 1995
|
--- Makefile Tue Nov 12 21:25:49 1996
|
||||||
***************
|
***************
|
||||||
*** 15,21 ****
|
*** 97,109 ****
|
||||||
#
|
default:
|
||||||
# Revision 1.5 92/02/27 10:07:24 jonathan
|
@echo "You have to specify which system to build for."
|
||||||
# got rid of automatic setting of TOP. Used Simon's approach instead.
|
@echo "Say 'make <system>', where <system> is one of the following:"
|
||||||
!
|
! @echo "aix, bsdi, dynix, hpux, irix-cc, irix-gcc, linux, osf,"
|
||||||
# Revision 1.4 92/02/13 12:27:53 jonathan
|
@echo "solaris, sunos, ultrix-cc or ultrix-gcc"
|
||||||
# Removed references to seeker.
|
|
||||||
#
|
all:
|
||||||
--- 15,21 ----
|
@echo "You have to specify which system to build for."
|
||||||
#
|
@echo "Say 'make <system>', where <system> is one of the following:"
|
||||||
# Revision 1.5 92/02/27 10:07:24 jonathan
|
! @echo "aix, bsdi, dynix, hpux, irix-cc, irix-gcc, linux, osf,"
|
||||||
# got rid of automatic setting of TOP. Used Simon's approach instead.
|
@echo "solaris, sunos, ultrix-cc or ultrix-gcc"
|
||||||
! #
|
|
||||||
# Revision 1.4 92/02/13 12:27:53 jonathan
|
aix::
|
||||||
# Removed references to seeker.
|
--- 97,109 ----
|
||||||
#
|
default:
|
||||||
|
@echo "You have to specify which system to build for."
|
||||||
|
@echo "Say 'make <system>', where <system> is one of the following:"
|
||||||
|
! @echo "aix, bsdi, dynix, freebsd, hpux, irix-cc, irix-gcc, linux, osf,"
|
||||||
|
@echo "solaris, sunos, ultrix-cc or ultrix-gcc"
|
||||||
|
|
||||||
|
all:
|
||||||
|
@echo "You have to specify which system to build for."
|
||||||
|
@echo "Say 'make <system>', where <system> is one of the following:"
|
||||||
|
! @echo "aix, bsdi, dynix, freebsd, hpux, irix-cc, irix-gcc, linux, osf,"
|
||||||
|
@echo "solaris, sunos, ultrix-cc or ultrix-gcc"
|
||||||
|
|
||||||
|
aix::
|
||||||
***************
|
***************
|
||||||
*** 118,124 ****
|
*** 118,123 ****
|
||||||
# Use this version of CFLAGS for Linux with gcc
|
--- 118,128 ----
|
||||||
# CFLAGS = -O2 -ansi -m486 -fwritable-strings -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB -DLINUX
|
|
||||||
|
|
||||||
! CFLAGS = -ansi -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB
|
dynix::
|
||||||
|
$(MAKE) -f Makefile.dynix TOP=$(TOP)
|
||||||
|
+ touch $(TOP)/$(RELEASE)
|
||||||
|
+ @echo "Welcome to freeWAIS version $(VERSION)"
|
||||||
|
+
|
||||||
|
+ freebsd::
|
||||||
|
+ $(MAKE) -f Makefile.freebsd TOP=$(TOP)
|
||||||
|
touch $(TOP)/$(RELEASE)
|
||||||
|
@echo "Welcome to freeWAIS version $(VERSION)"
|
||||||
|
|
||||||
# Solaris should use
|
*** Makefile.freebsd.orig Wed Nov 13 00:13:50 1996
|
||||||
#LIB = -ltcpip -lsocket -lnsl
|
--- Makefile.freebsd Wed Nov 13 00:24:30 1996
|
||||||
--- 118,124 ----
|
|
||||||
# Use this version of CFLAGS for Linux with gcc
|
|
||||||
# CFLAGS = -O2 -ansi -m486 -fwritable-strings -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB -DLINUX
|
|
||||||
|
|
||||||
! CFLAGS = -ansi -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB -D__bsdi__
|
|
||||||
|
|
||||||
# Solaris should use
|
|
||||||
#LIB = -ltcpip -lsocket -lnsl
|
|
||||||
***************
|
***************
|
||||||
*** 133,139 ****
|
*** 149,155 ****
|
||||||
#Solaris machines don't use -k
|
# -DSOLARIS for SunOS 5.2 (Solaris 2.2) machines.
|
||||||
MFLAGS = -k
|
#
|
||||||
|
# Use this version of CFLAGS for BSDI
|
||||||
|
! CFLAGS = -I$(INCLUDE) -DBSD43 -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB
|
||||||
|
|
||||||
! MAKE = make $(MFLAGS)
|
#
|
||||||
|
# Flag definitions
|
||||||
|
--- 149,155 ----
|
||||||
|
# -DSOLARIS for SunOS 5.2 (Solaris 2.2) machines.
|
||||||
|
#
|
||||||
|
# Use this version of CFLAGS for BSDI
|
||||||
|
! CFLAGS = -I$(INCLUDE) -D__bsdi__ -DBSD43 -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB
|
||||||
|
|
||||||
#default: config.h lib ir ui bin doc x tags
|
#
|
||||||
default: config.h lib ir ui bin x check
|
# Flag definitions
|
||||||
--- 133,141 ----
|
//***************
|
||||||
#Solaris machines don't use -k
|
//*** 216,222 ****
|
||||||
MFLAGS = -k
|
cd $(SRCDIR)/server; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \
|
||||||
|
INCLUDE="$(INCLUDE)" RANLIB=$(RANLIB) TOP=$(TOP) LIBS="$(LIBS)"
|
||||||
|
|
||||||
! MAKE = gmake $(MFLAGS)
|
! clients: ui waissearch waisq swais # xwais
|
||||||
!
|
|
||||||
! all: config.h lib ir ui bin
|
|
||||||
|
|
||||||
#default: config.h lib ir ui bin doc x tags
|
waissearch::
|
||||||
default: config.h lib ir ui bin x check
|
cd $(CLIENTDIR)/waissearch; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \
|
||||||
***************
|
--- 216,222 ----
|
||||||
*** 169,175 ****
|
cd $(SRCDIR)/server; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \
|
||||||
# you may have to edit the CFLAGS in the Makefile yourself.
|
INCLUDE="$(INCLUDE)" RANLIB=$(RANLIB) TOP=$(TOP) LIBS="$(LIBS)"
|
||||||
|
|
||||||
x::
|
! clients: ui waissearch waisq swais xwais
|
||||||
! cd x; xmkmf; make depend; make
|
|
||||||
# cd x; (env TOP=$(TOP) CC=$(CC) CFLAGS="$(CFLAGS)" MAKE="$(MAKE)" ./makex.sh)
|
|
||||||
|
|
||||||
bin::
|
waissearch::
|
||||||
--- 171,177 ----
|
cd $(CLIENTDIR)/waissearch; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \
|
||||||
# you may have to edit the CFLAGS in the Makefile yourself.
|
|
||||||
|
|
||||||
x::
|
|
||||||
! cd x; xmkmf; ${MAKE} depend; ${MAKE}
|
|
||||||
# cd x; (env TOP=$(TOP) CC=$(CC) CFLAGS="$(CFLAGS)" MAKE="$(MAKE)" ./makex.sh)
|
|
||||||
|
|
||||||
bin::
|
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
FreeWAIS 0.3 from CNIDR
|
FreeWAIS from CNIDR
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue