Add wais support.

PR:		11728
Submitted by:	Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>

3 files changed, 128 insertions, 2 deletions

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index f906eb7d76c2..089f809908e4 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -3,7 +3,7 @@
 # Date created:		11 Dec 1994
 # Whom:			ats (original)
 #
-# $Id: Makefile,v 1.7 1996/11/17 01:48:15 max Exp $
+# $Id: Makefile,v 1.8 1998/07/05 23:17:09 steve Exp $
 #
 
 DISTNAME=	gopher2_3
@@ -13,15 +13,25 @@ MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=  /nonexistent:${PORTSDIR}/net/wais:build
+
 DATADIR=	$(PREFIX)/gopher-data
+WaisTop=	$(PORTSDIR)/net/wais/work/freeWAIS-0.5
 CONFIGURE_ENV=	LIBS='-lcompat -lcrypt'
-CONFIGURE_ARGS=	--enable-datadir=$(DATADIR) --disable-debug --with-x
+CONFIGURE_ARGS=	--enable-datadir=$(DATADIR) --disable-debug --enable-locale
 GNU_CONFIGURE=	yes
 
 MAN1=	gopher.1 gophfilt.1
 MAN5=	gopherd.conf.5 gopherrc.5
 MAN8=	gopherd.8 gopherindex.8
 
+pre-configure:
+# This ones are for FreeWAIS-0.4 and >
+	ln -s ${WaisTop}/include $(WaisTop)/ir
+	ln -s ${WaisTop}/src/client/ui $(WaisTop)
+	ln -s ${WaisTop}/bin $(WRKSRC)
+# This is the new configuration method
+	ln -s ${WaisTop} $(WRKSRC)/wais
 pre-install:
 	$(MKDIR) $(DATADIR)
 
diff --git a/net/gopher/files/patch-ca b/net/gopher/files/patch-ca
new file mode 100644
index 000000000000..13450385a491
--- /dev/null
+++ b/net/gopher/files/patch-ca
@@ -0,0 +1,74 @@
+*** Makefile.config.in.orig	Thu Jan  4 13:52:31 1996
+--- Makefile.config.in	Thu May 13 12:25:07 1999
+***************
+*** 160,166 ****
+  # 
+  # Comment this to make a slimmer executable...
+  
+! DEBUGGING = @DEBUGGING@
+  
+  #------------------------------------------------
+  # Uncomment out the following lines to use SOCKS
+--- 160,166 ----
+  # 
+  # Comment this to make a slimmer executable...
+  
+! #DEBUGGING = @DEBUGGING@
+  
+  #------------------------------------------------
+  # Uncomment out the following lines to use SOCKS
+***************
+*** 208,215 ****
+  
+  
+  #SERVEROPTS	= -DSETPROCTITLE -DCAPFILES #-DBIO -DDL -DLOADRESTRICT
+! SERVEROPTS	= @SERVEROPTS@
+! WAISTYPE	= @WAISTYPE@
+  
+  DLPATH		= @DLPATH@
+  DLOBJS		= @DLOBJS@
+--- 208,215 ----
+  
+  
+  #SERVEROPTS	= -DSETPROCTITLE -DCAPFILES #-DBIO -DDL -DLOADRESTRICT
+! SERVEROPTS	= @SERVEROPTS@ -DADD_DATE_AND_TIME 
+! WAISTYPE	= @WAISTYPE@ -DFREEWAIS_0_4
+  
+  DLPATH		= @DLPATH@
+  DLOBJS		= @DLOBJS@
+***************
+*** 226,232 ****
+  #
+  
+  
+! CLIENTOPTS = -DNOBANNER -DCTRLCPROMPTS -DCONTROLX #-DNOMAIL -DREMOTEUSER -D
+  
+  #-----------------------------------------------------------------
+  # Optional localization and internationalization features
+--- 226,232 ----
+  #
+  
+  
+! CLIENTOPTS = -DNOBANNER -DCTRLCPROMPTS -DCONTROLX -DNOMAIL #-DREMOTEUSER -D
+  
+  #-----------------------------------------------------------------
+  # Optional localization and internationalization features
+***************
+*** 277,284 ****
+  
+  OBJINCLUDES 	= -I@top_srcdir@/object
+  OTHERINCLUDES	= -I@top_srcdir@
+! WAISINCLUDES	= -I@top_srcdir@/wais -I../ui
+  INCLUDES	= -I@top_srcdir@ -I@top_srcdir@/object 
+  
+! LDFLAGS		= -L../object
+  SHELL		= /bin/sh
+--- 277,284 ----
+  
+  OBJINCLUDES 	= -I@top_srcdir@/object
+  OTHERINCLUDES	= -I@top_srcdir@
+! WAISINCLUDES	= -I@top_srcdir@/wais -I../wais/ir -I../wais/ui
+  INCLUDES	= -I@top_srcdir@ -I@top_srcdir@/object 
+  
+! LDFLAGS		= -L../object -L../wais/lib
+  SHELL		= /bin/sh
diff --git a/net/gopher/files/patch-cb b/net/gopher/files/patch-cb
new file mode 100644
index 000000000000..70b8cc3d825a
--- /dev/null
+++ b/net/gopher/files/patch-cb
@@ -0,0 +1,42 @@
+*** gopherd/Makefile.in.orig	Thu Jan  4 13:30:50 1996
+--- gopherd/Makefile.in	Thu May 13 10:40:59 1999
+***************
+*** 140,146 ****
+                    ../ui/source.o ../bin/libftw.a
+  SF1WAISOBJ       = ../ir/libinv.a ../ir/libwais.a ../ir/liblocal.a\
+  		  ../ui/source.o ../ir/libinv.a ../regexp/libregexp.a
+! SFWAISOBJ      = ../ir/libwais.a ../ui/source.o ../regexp/libregexp.a 
+  
+  
+  CCFLAGS	= $(OPT) -DDATA_DIRECTORY=\"$(SERVERDATA)\" $(DEBUGGING) \
+--- 140,146 ----
+                    ../ui/source.o ../bin/libftw.a
+  SF1WAISOBJ       = ../ir/libinv.a ../ir/libwais.a ../ir/liblocal.a\
+  		  ../ui/source.o ../ir/libinv.a ../regexp/libregexp.a
+! SFWAISOBJ      = ../lib/libwais.a ../ui/source.o ../regexp/libregexp.a 
+  
+  
+  CCFLAGS	= $(OPT) -DDATA_DIRECTORY=\"$(SERVERDATA)\" $(DEBUGGING) \
+***************
+*** 170,179 ****
+  # Special rule for wais gateway
+  #
+  waisgopher.o: waisgopher.c
+! 	$(CC) $(CCFLAGS) -I../wais/ir -I../wais/ui -c $(srcdir)/waisgopher.c
+  
+  Waisindex.o: Waisindex.c
+! 	$(CC) $(CCFLAGS) -I../wais/ir -c $(srcdir)/Waisindex.c
+  
+  gopherd.o: gopherd.c $(top_srcdir)/patchlevel.h
+  	$(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c \
+--- 170,179 ----
+  # Special rule for wais gateway
+  #
+  waisgopher.o: waisgopher.c
+! 	$(CC) $(CCFLAGS) $(WAISINCLUDES) -c $(srcdir)/waisgopher.c
+  
+  Waisindex.o: Waisindex.c
+! 	$(CC) $(CCFLAGS) $(WAISINCLUDES) -c $(srcdir)/Waisindex.c
+  
+  gopherd.o: gopherd.c $(top_srcdir)/patchlevel.h
+  	$(CC) $(CCFLAGS) -DCONF_FILE=\"$(SERVERDIR)/gopherd.conf\" -c \