9 files changed, 221 insertions, 95 deletions

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index a80e39173728..f906eb7d76c2 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,17 +1,28 @@
 # New ports collection makefile for:	gopher
-# Version required:	2.1.3
+# Version required:	2.3
 # Date created:		11 Dec 1994
-# Whom:			ats
+# Whom:			ats (original)
 #
-# $Id: Makefile,v 1.6 1995/11/27 04:04:57 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/17 01:48:15 max Exp $
 #
 
-DISTNAME=	gopher2_1_3
-PKGNAME=	gopher-2.1.3
+DISTNAME=	gopher2_3
+PKGNAME=	gopher-2.3
 CATEGORIES=	net
-MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/old-versions/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/
 
-USE_GMAKE=	yes
+MAINTAINER=	ports@FreeBSD.org
+
+DATADIR=	$(PREFIX)/gopher-data
+CONFIGURE_ENV=	LIBS='-lcompat -lcrypt'
+CONFIGURE_ARGS=	--enable-datadir=$(DATADIR) --disable-debug --with-x
+GNU_CONFIGURE=	yes
+
+MAN1=	gopher.1 gophfilt.1
+MAN5=	gopherd.conf.5 gopherrc.5
+MAN8=	gopherd.8 gopherindex.8
+
+pre-install:
+	$(MKDIR) $(DATADIR)
 
 .include <bsd.port.mk>
diff --git a/net/gopher/distinfo b/net/gopher/distinfo
index 8bfd68df68d7..1cfe915f224c 100644
--- a/net/gopher/distinfo
+++ b/net/gopher/distinfo
@@ -1 +1 @@
-MD5 (gopher2_1_3.tar.Z) = d50328dc4a4ba5c59708bf42ecc431d2
+MD5 (gopher2_3.tar.gz) = a5dd2c53f62e5300dc6b546c1fec06f7
diff --git a/net/gopher/files/patch-aa b/net/gopher/files/patch-aa
index b0681a146299..4a691eb70fe7 100644
--- a/net/gopher/files/patch-aa
+++ b/net/gopher/files/patch-aa
@@ -1,48 +1,38 @@
-*** gopherd/error.c.ORIG	Tue Jul 19 22:27:54 1994
---- gopherd/error.c	Sun Dec 11 19:44:34 1994
+*** gopherd/error.c.orig	Fri Dec 27 17:13:12 1996
+--- gopherd/error.c	Fri Dec 27 17:26:28 1996
 ***************
-*** 287,293 ****
+*** 255,261 ****
   
   extern int errno;		/* UNIX error number */
   extern int sys_nerr;		/* # of error message strings in sys table */
-- extern char *sys_errlist[];	/* the system error message table */
+! #ifdef __NetBSD__
+  extern const char *const sys_errlist[];	/* the system error message table */
+  #else
+  extern char *sys_errlist[];	/* the system error message table */
+--- 255,261 ----
   
-  #ifdef SYS5
-  int t_errno;
---- 287,292 ----
-*** gopher/globals.h.ORIG	Wed Jul  6 17:38:40 1994
---- gopher/globals.h	Sun Dec 11 19:50:17 1994
+  extern int errno;		/* UNIX error number */
+  extern int sys_nerr;		/* # of error message strings in sys table */
+! #if !(defined(BSD) && (BSD >= 199103))
+  extern const char *const sys_errlist[];	/* the system error message table */
+  #else
+  extern char *sys_errlist[];	/* the system error message table */
+*** gopher/globals.h.orig	Fri Nov  3 16:18:17 1995
+--- gopher/globals.h	Mon Apr 14 15:33:32 1997
 ***************
-*** 120,126 ****
+*** 129,135 ****
   
   #ifndef VMS
   extern char **environ;                  /* User environment array */
-- extern char *sys_errlist[];
-  #endif
-  
-  /*** VMS needs special interrupt and subprocess handling ***/
---- 120,125 ----
-*** gopher/gopher.c.ORIG	Fri Nov 25 18:40:21 1994
---- gopher/gopher.c	Sun Dec 11 19:51:49 1994
-***************
-*** 1149,1155 ****
+! #ifdef __NetBSD__
+  extern const char *const sys_errlist[];
   #else
-  extern int h_errno;
-  extern int sys_nerr;
-- extern char *sys_errlist[];
-  extern int  errno;
-  #endif
+  extern char *sys_errlist[];
+--- 129,135 ----
   
---- 1149,1154 ----
-*** Makefile.config.ORIG	Wed Nov 30 01:12:16 1994
---- Makefile.config	Sun Dec 11 19:57:37 1994
-***************
-*** 304,309 ****
---- 304,310 ----
-  
-  OTHERLIBS	=  $(UMAXLIBS) $(SEQLIBS) $(PTXLIBS) $(SCOLIBS) \
-  		   $(SVR4LIBS) $(AUXLIBS) $(DGUXLIBS) $(SOCKSLIBS)
-+ OTHERLIBS	= -lcompat -lcrypt
-  
-  CLIENTLIBS 	= -lcurses -ltermcap -lgopher $(OTHERLIBS)
-  SERVERLIBS 	= -lm -lgopher $(OTHERLIBS) $(LOADLIBS)
+  #ifndef VMS
+  extern char **environ;                  /* User environment array */
+! #if defined(__NetBSD__) || defined(__FreeBSD__)
+  extern const char *const sys_errlist[];
+  #else
+  extern char *sys_errlist[];
diff --git a/net/gopher/files/patch-ab b/net/gopher/files/patch-ab
index 49f0f6904de2..502ff4b74df6 100644
--- a/net/gopher/files/patch-ab
+++ b/net/gopher/files/patch-ab
@@ -1,26 +1,33 @@
---- ./gopherd/AUTH.c.org	Mon Feb  6 13:25:13 1995
-+++ ./gopherd/AUTH.c	Thu May 11 19:26:05 1995
-@@ -216,19 +216,23 @@
- 	  return(AUTHRES_SYSERR);
-      }
- 
-+#ifndef __FreeBSD__
-      if (fgetpwent(ourpasswd) == NULL) {
- 	  Debugmsg("fgetpwent failed...");
- 	  return(AUTHRES_SYSERR);
-      }
-+#endif
- 
-      fseek(ourpasswd, 0L,SEEK_SET);
- 
-      /** Mimic getpwnam, sigh why isn't setpwfile() everywhere....**/
- 
-+#ifndef __FreeBSD__
-      while ((pw = fgetpwent(ourpasswd)) != NULL) {
- 	  if (strcmp(pw->pw_name, username) == 0)
- 	       return(AUTHunix_checkuser(pw, password));
-      }
-+#endif
-      return(AUTHRES_NOUSER);
- #else
-      return(AUTHRES_SYSERR);
+*** gopherd/AUTH.c.orig	Tue Apr 29 12:28:14 1997
+--- gopherd/AUTH.c	Tue Apr 29 12:33:45 1997
+***************
+*** 259,273 ****
+--- 259,276 ----
+  	  return(AUTHRES_SYSERR);
+       }
+       
++ #ifndef __FreeBSD__
+       if (fgetpwent(ourpasswd) == NULL) {
+  	  Debugmsg("fgetpwent failed...");
+  	  return(AUTHRES_SYSERR);
+       }
++ #endif
+       
+       fseek(ourpasswd, 0L,SEEK_SET);
+  
+       /** Mimic getpwnam, sigh why isn't setpwfile() everywhere....**/
+       
++ #ifndef __FreeBSD__
+       while ((pw = fgetpwent(ourpasswd)) != NULL) {
+  	  if (strcmp(pw->pw_name, username) == 0) {
+  	       pwcheck = AUTHunix_checkuser(pw, password);
+***************
+*** 291,296 ****
+--- 294,300 ----
+  		    return(pwcheck);
+  	  }
+       }
++ #endif
+       return(AUTHRES_NOUSER);
+  #else
+       return(AUTHRES_SYSERR);
diff --git a/net/gopher/files/patch-ac b/net/gopher/files/patch-ac
index 62d0571d7e2b..df44d27f0a29 100644
--- a/net/gopher/files/patch-ac
+++ b/net/gopher/files/patch-ac
@@ -1,19 +1,14 @@
-*** gopher/upload.c.dist	Tue Feb 18 17:31:30 1997
---- gopher/upload.c	Tue Feb 18 17:40:22 1997
+*** gopher/gopher.c.orig	Wed Jan 22 21:10:11 1997
+--- gopher/gopher.c	Wed Jan 22 21:11:29 1997
 ***************
-*** 123,129 ****
-  		    CURenter();
-  		    return;
-  	       }
-! 	       while(gets(inputline)) {
-  		    ZapCRLF(inputline);
-  		    if (strcmp(inputline, ".") == 0) 
-  			 break;
---- 123,129 ----
-  		    CURenter();
-  		    return;
-  	       }
-! 	       while(fgets(inputline, 256, stdin)) {
-  		    ZapCRLF(inputline);
-  		    if (strcmp(inputline, ".") == 0) 
-  			 break;
+*** 1182,1188 ****
+--- 1182,1190 ----
+  #else
+  extern int h_errno;
+  extern int sys_nerr;
++ #ifndef __FreeBSD__
+  extern char *sys_errlist[];
++ #endif
+  extern int  errno;
+  #endif
+  
diff --git a/net/gopher/files/patch-ba b/net/gopher/files/patch-ba
new file mode 100644
index 000000000000..643611cbecc2
--- /dev/null
+++ b/net/gopher/files/patch-ba
@@ -0,0 +1,33 @@
+*** object/Makefile.in.orig	Thu Jan  4 13:27:35 1996
+--- object/Makefile.in	Mon Apr 14 16:13:06 1997
+***************
+*** 22,35 ****
+  # Make shared library directories
+  #
+  shared:
+! 	@-if [ -f /lib/ld.so -a "$(SHAREDLIB)" = "sun" ]; \
+  	then \
+  		mkdir shared-sun; \
+  	fi
+  	touch shared
+  
+  
+! .c.o: $(OBJS)
+  	@CC@ $(CCFLAGS) $(PIC) -c $<
+  	@-if [ -d shared-sun ]; then \
+  		echo "Building shared version of $@"; \
+--- 22,35 ----
+  # Make shared library directories
+  #
+  shared:
+! 	@-if [ -f /usr/libexec/ld.so -a "$(SHAREDLIB)" = "sun" ]; \
+  	then \
+  		mkdir shared-sun; \
+  	fi
+  	touch shared
+  
+  
+! .c.o:
+  	@CC@ $(CCFLAGS) $(PIC) -c $<
+  	@-if [ -d shared-sun ]; then \
+  		echo "Building shared version of $@"; \
diff --git a/net/gopher/files/patch-bb b/net/gopher/files/patch-bb
new file mode 100644
index 000000000000..8a3a96b3dc01
--- /dev/null
+++ b/net/gopher/files/patch-bb
@@ -0,0 +1,25 @@
+*** gopherd/gopherd.conf.orig	Sat Jul  4 13:33:49 1998
+--- gopherd/gopherd.conf	Sat Jul  4 13:34:43 1998
+***************
+*** 29,38 ****
+  # extension.
+  #
+  
+! decoder: .Z /usr/ucb/zcat
+! decoder: .gz /usr/gnu/bin/zcat
+  #decoder: .adpcm /usr/openwin/bin/adpcm_dec
+! #decoder: .z /usr/gnu/bin/zcat
+  
+  
+  #---------------------------------------------------------------------
+--- 29,38 ----
+  # extension.
+  #
+  
+! decoder: .Z /usr/bin/zcat
+! decoder: .gz /usr/bin/gzcat
+  #decoder: .adpcm /usr/openwin/bin/adpcm_dec
+! decoder: .z /usr/bin/gzcat
+  
+  
+  #---------------------------------------------------------------------
diff --git a/net/gopher/pkg-descr b/net/gopher/pkg-descr
index 25ca6b9151b2..11b64d996820 100644
--- a/net/gopher/pkg-descr
+++ b/net/gopher/pkg-descr
@@ -1,2 +1,9 @@
-Gopher - a system to connect and maintain a distributed document
-delivery service all over the world.
+The Internet Gopher is a distributed document delivery service. It 
+allows a neophyte user to access various types of data residing on 
+multiple hosts in a seamless fashion. This is accomplished by 
+presenting the user a hierarchical arrangement of documents and by
+using a client-server communications model. The Internet Gopher 
+Server accepts simple queries, and responds by sending the client 
+a document.
+
+	University of Minnesota
diff --git a/net/gopher/pkg-plist b/net/gopher/pkg-plist
index 374bb64ba2fd..9b43484f86e8 100644
--- a/net/gopher/pkg-plist
+++ b/net/gopher/pkg-plist
@@ -1,10 +1,68 @@
 bin/gopher
 bin/gophfilt
-etc/gopherd.conf
-etc/gopherd
 etc/gindexd
+etc/gopherd
+etc/gopherd.conf
 etc/gopherdlocal.conf
 etc/gopherls
-lib/gopher.rc
+gopher-data/bin/add-account
+gopher-data/bin/add-account.ask
+gopher-data/bin/gateways/.names
+gopher-data/bin/gateways/g2archie.abstract
+gopher-data/bin/gateways/g2archie.ask
+gopher-data/bin/gateways/g2archie.gd
+gopher-data/bin/gateways/g2archie.gpd
+gopher-data/bin/gateways/g2areacode
+gopher-data/bin/gateways/g2areacode.abstract
+gopher-data/bin/gateways/g2areacode.ask
+gopher-data/bin/gateways/g2finger.abstract
+gopher-data/bin/gateways/g2finger.ask
+gopher-data/bin/gateways/g2finger.gd
+gopher-data/bin/gateways/g2finger.gpd
+gopher-data/bin/gateways/g2ftphack.abstract
+gopher-data/bin/gateways/g2ftphack.ask
+gopher-data/bin/gateways/g2ftphack.gd
+gopher-data/bin/gateways/g2ftphack.gpd
+gopher-data/bin/gateways/g2geo.abstract
+gopher-data/bin/gateways/g2geo.ask
+gopher-data/bin/gateways/g2geo.gd
+gopher-data/bin/gateways/g2geo.gpd
+gopher-data/bin/gateways/g2netfind
+gopher-data/bin/gateways/g2netfind.abstract
+gopher-data/bin/gateways/g2netfind.ask
+gopher-data/bin/gateways/g2netfind.gd
+gopher-data/bin/gateways/g2netfind.gpd
+gopher-data/bin/gateways/g2nntp.abstract
+gopher-data/bin/gateways/g2nntp.gd
+gopher-data/bin/gateways/g2nntp.gpd
+gopher-data/bin/gateways/g2webster.abstract
+gopher-data/bin/gateways/g2webster.ask
+gopher-data/bin/gateways/g2webster.gd
+gopher-data/bin/gateways/g2webster.gpd
+gopher-data/bin/gateways/g2whois.abstract
+gopher-data/bin/gateways/g2whois.ask
+gopher-data/bin/gateways/g2whois.gd
+gopher-data/bin/gateways/g2whois.gpd
+gopher-data/lib/htmlicon.0
+gopher-data/lib/htmlicon.1
+gopher-data/lib/htmlicon.2
+gopher-data/lib/htmlicon.5
+gopher-data/lib/htmlicon.6
+gopher-data/lib/htmlicon.7
+gopher-data/lib/htmlicon.8
+gopher-data/lib/htmlicon.9
+gopher-data/lib/htmlicon.:
+gopher-data/lib/htmlicon.I
+gopher-data/lib/htmlicon.P
+gopher-data/lib/htmlicon.g
+gopher-data/lib/htmlicon.h
+gopher-data/lib/htmlicon.s
 lib/gopher.hlp
+lib/gopher.rc
 lib/gopherremote.rc
+man/man1/gopher.1.gz
+man/man1/gophfilt.1.gz
+man/man5/gopherd.conf.5.gz
+man/man5/gopherrc.5.gz
+man/man8/gopherd.8.gz
+man/man8/gopherindex.8.gz