diff options
author | Adam David <adam@FreeBSD.org> | 1996-11-13 10:56:28 +0000 |
---|---|---|
committer | Adam David <adam@FreeBSD.org> | 1996-11-13 10:56:28 +0000 |
commit | 88b54656a82582902029da97c5c4dd6b7d25751c (patch) | |
tree | 3f846ac52a92318c9938220d96957df5cb872958 /net/wais | |
parent | Mark this port BROKEN, until Chuck can figure out the quirks. (diff) |
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
Notes
Notes:
svn path=/head/; revision=4433
Diffstat (limited to 'net/wais')
-rw-r--r-- | net/wais/Makefile | 23 | ||||
-rw-r--r-- | net/wais/distinfo | 2 | ||||
-rw-r--r-- | net/wais/files/patch-aa | 128 | ||||
-rw-r--r-- | net/wais/files/patch-ab | 125 | ||||
-rw-r--r-- | net/wais/pkg-descr | 2 |
5 files changed, 172 insertions, 108 deletions
diff --git a/net/wais/Makefile b/net/wais/Makefile index 8caeed52ffb2..a2d6efa25ea5 100644 --- a/net/wais/Makefile +++ b/net/wais/Makefile @@ -1,18 +1,31 @@ # New ports collection makefile for: wais -# Version required: 0.3 +# Version required: 0.5 # Date created: 20 Sep 1994 # 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 MASTER_SITES= ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/ -BROKEN= yes -USE_GMAKE= yes +NO_PACKAGE= not yet +NO_INSTALL= almost +ALL_TARGET= freebsd +MAKE_ENV:= TOP=${WRKSRC} 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> diff --git a/net/wais/distinfo b/net/wais/distinfo index 515995dd0da9..37b9a8e81eff 100644 --- a/net/wais/distinfo +++ b/net/wais/distinfo @@ -1 +1 @@ -MD5 (freeWAIS-0.3.tar.gz) = bbde34318619da836de0ede92536fc32 +MD5 (freeWAIS-0.5.tar.gz) = 320271bac5afc30e3375ac0de63498fd diff --git a/net/wais/files/patch-aa b/net/wais/files/patch-aa index 9abfe3d4cfa8..6a9141942faf 100644 --- a/net/wais/files/patch-aa +++ b/net/wais/files/patch-aa @@ -1,49 +1,91 @@ -*** ir/irtfiles.c Wed Jan 19 16:10:32 1994 ---- ir/irtfiles.c Fri Sep 16 23:14:03 1994 +*** src/ir/sockets.c.old Wed Apr 26 12:18:43 1995 +--- src/ir/sockets.c Tue Nov 12 23:20:17 1996 *************** -*** 75,80 **** ---- 75,81 ---- - - #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; +*** 81,88 **** + #if (defined(ultrix) || defined(BSD) || defined(Mach)) + extern int errno; + #endif /* ultrix BSD or Mach */ +! + extern char *sys_errlist[]; + + + /* XXX +--- 81,90 ---- + #if (defined(ultrix) || defined(BSD) || defined(Mach)) + extern int errno; #endif /* ultrix BSD or Mach */ +! +! #ifndef __bsdi__ + extern char *sys_errlist[]; ++ #endif + + + /* XXX +*************** +*** 203,209 **** + if(source.sin_family == AF_INET) { + struct hostent *peer = NULL; -- extern char *sys_errlist[]; -- +! #if defined(__DGUX__) || defined(LINUX) + peer = gethostbyaddr((char *)&source.sin_addr.s_addr, 4, AF_INET); + #else + peer = gethostbyaddr((struct sockaddr_in*)&source.sin_addr, 4, AF_INET); +--- 205,211 ---- + if(source.sin_family == AF_INET) { + struct hostent *peer = NULL; - /* XXX - still need: ---- 77,82 ---- -*** ir/waisserver.c.ORIG Thu Mar 3 04:04:51 1994 ---- ir/waisserver.c Sat Mar 18 23:35:49 1995 +! #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 *************** -*** 447,453 **** - struct dirent **list; - int naptime = 0; - 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 +*** 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 *************** -*** 116,122 **** - static String MyStrncpy(), StorePiecesInString(); - static Boolean SetValues(), WriteToFile(); - extern int errno, sys_nerr; -- extern char* sys_errlist[]; - - #define superclass (&textSrcClassRec) - MyAsciiSrcClassRec myasciiSrcClassRec = { ---- 116,121 ---- +*** 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; diff --git a/net/wais/files/patch-ab b/net/wais/files/patch-ab index 88fe96bb8ace..6fef16f42ac6 100644 --- a/net/wais/files/patch-ab +++ b/net/wais/files/patch-ab @@ -1,72 +1,81 @@ -*** Makefile.ORIG Tue Mar 15 20:30:00 1994 ---- Makefile Sat Mar 18 23:28:59 1995 +*** Makefile.old Wed May 3 08:55:29 1995 +--- Makefile Tue Nov 12 21:25:49 1996 *************** -*** 15,21 **** - # - # Revision 1.5 92/02/27 10:07:24 jonathan - # got rid of automatic setting of TOP. Used Simon's approach instead. -! - # Revision 1.4 92/02/13 12:27:53 jonathan - # Removed references to seeker. - # ---- 15,21 ---- - # - # Revision 1.5 92/02/27 10:07:24 jonathan - # got rid of automatic setting of TOP. Used Simon's approach instead. -! # - # Revision 1.4 92/02/13 12:27:53 jonathan - # Removed references to seeker. - # -*************** -*** 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 +*** 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, hpux, irix-cc, irix-gcc, linux, osf," + @echo "solaris, sunos, ultrix-cc or ultrix-gcc" -! CFLAGS = -ansi -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB + 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, hpux, irix-cc, irix-gcc, linux, osf," + @echo "solaris, sunos, ultrix-cc or ultrix-gcc" - # Solaris should use - #LIB = -ltcpip -lsocket -lnsl ---- 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 + aix:: +--- 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" -! CFLAGS = -ansi -I$(SUPDIR) -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB -D__bsdi__ + 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" - # Solaris should use - #LIB = -ltcpip -lsocket -lnsl + aix:: *************** -*** 133,139 **** - #Solaris machines don't use -k - MFLAGS = -k +*** 118,123 **** +--- 118,128 ---- -! MAKE = make $(MFLAGS) + 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)" - #default: config.h lib ir ui bin doc x tags - default: config.h lib ir ui bin x check ---- 133,141 ---- - #Solaris machines don't use -k - MFLAGS = -k +*** Makefile.freebsd.orig Wed Nov 13 00:13:50 1996 +--- Makefile.freebsd Wed Nov 13 00:24:30 1996 +*************** +*** 149,155 **** + # -DSOLARIS for SunOS 5.2 (Solaris 2.2) machines. + # + # Use this version of CFLAGS for BSDI +! CFLAGS = -I$(INCLUDE) -DBSD43 -DTELL_USER -DUSG -DSECURE_SERVER -DRELEVANCE_FEEDBACK -DBOOLEANS -DPARTIALWORD -DLITERAL -DSOUND -DBIBDB -! MAKE = gmake $(MFLAGS) -! -! all: config.h lib ir ui bin + # + # 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 -*************** -*** 169,175 **** - # you may have to edit the CFLAGS in the Makefile yourself. + # + # Flag definitions +//*************** +//*** 216,222 **** + cd $(SRCDIR)/server; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \ + INCLUDE="$(INCLUDE)" RANLIB=$(RANLIB) TOP=$(TOP) LIBS="$(LIBS)" - x:: -! cd x; xmkmf; make depend; make - # cd x; (env TOP=$(TOP) CC=$(CC) CFLAGS="$(CFLAGS)" MAKE="$(MAKE)" ./makex.sh) +! clients: ui waissearch waisq swais # xwais - bin:: ---- 171,177 ---- - # you may have to edit the CFLAGS in the Makefile yourself. + waissearch:: + cd $(CLIENTDIR)/waissearch; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \ +--- 216,222 ---- + cd $(SRCDIR)/server; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \ + INCLUDE="$(INCLUDE)" RANLIB=$(RANLIB) TOP=$(TOP) LIBS="$(LIBS)" - x:: -! cd x; xmkmf; ${MAKE} depend; ${MAKE} - # cd x; (env TOP=$(TOP) CC=$(CC) CFLAGS="$(CFLAGS)" MAKE="$(MAKE)" ./makex.sh) +! clients: ui waissearch waisq swais xwais - bin:: + waissearch:: + cd $(CLIENTDIR)/waissearch; $(MAKE) CC=$(CC) CFLAGS="$(CFLAGS)" \ diff --git a/net/wais/pkg-descr b/net/wais/pkg-descr index 59372c301599..1f976d568f80 100644 --- a/net/wais/pkg-descr +++ b/net/wais/pkg-descr @@ -1 +1 @@ -FreeWAIS 0.3 from CNIDR +FreeWAIS from CNIDR |