6 files changed, 13 insertions, 166 deletions

diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index d950f8da5821..415a4f609594 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -6,35 +6,21 @@
 #
 
 PORTNAME=	gopher
-PORTVERSION=	2.3.1
+PORTVERSION=	3.0.2
 CATEGORIES=	net
-MASTER_SITES=	ftp://boombox.micro.umn.edu/pub/gopher/Unix/
-DISTNAME=	gopher2_3.1
+MASTER_SITES=	http://www.quux.org/give-me-gopher/
 
 MAINTAINER=	ports@FreeBSD.org
 
-FORBIDDEN=	"Remote exploits"
-
-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 --enable-locale
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	all
 
 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)
+pre-patch:
+	@${FIND} ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,'
 
 .include <bsd.port.mk>
diff --git a/net/gopher/distinfo b/net/gopher/distinfo
index a83424f9b476..c4cf6b3e070a 100644
--- a/net/gopher/distinfo
+++ b/net/gopher/distinfo
@@ -1 +1 @@
-MD5 (gopher2_3.1.tar.gz) = 7437adbdac502b5dade77b0a88dcb373
+MD5 (gopher-3.0.2.tar.gz) = dfbe1c87ee248b24e5e2d16e3e60b639
diff --git a/net/gopher/files/patch-aa b/net/gopher/files/patch-aa
deleted file mode 100644
index 4a691eb70fe7..000000000000
--- a/net/gopher/files/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-*** gopherd/error.c.orig	Fri Dec 27 17:13:12 1996
---- gopherd/error.c	Fri Dec 27 17:26:28 1996
-***************
-*** 255,261 ****
-  
-  extern int errno;		/* UNIX error number */
-  extern int sys_nerr;		/* # of error message strings in sys 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 ----
-  
-  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
-***************
-*** 129,135 ****
-  
-  #ifndef VMS
-  extern char **environ;                  /* User environment array */
-! #ifdef __NetBSD__
-  extern const char *const sys_errlist[];
-  #else
-  extern char *sys_errlist[];
---- 129,135 ----
-  
-  #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
deleted file mode 100644
index 502ff4b74df6..000000000000
--- a/net/gopher/files/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-*** 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
deleted file mode 100644
index df44d27f0a29..000000000000
--- a/net/gopher/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-*** gopher/gopher.c.orig	Wed Jan 22 21:10:11 1997
---- gopher/gopher.c	Wed Jan 22 21:11:29 1997
-***************
-*** 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/pkg-plist b/net/gopher/pkg-plist
index f6664072503a..276192f6505f 100644
--- a/net/gopher/pkg-plist
+++ b/net/gopher/pkg-plist
@@ -1,62 +1,8 @@
 bin/gopher
 bin/gophfilt
-etc/gindexd
-etc/gopherd
-etc/gopherd.conf
-etc/gopherdlocal.conf
-etc/gopherls
-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
+etc/gopher/gopher.rc
+etc/gopher/gopherremote.rc
+etc/gopher/gopher.hlp
+etc/gopherd/gopherd.conf
+etc/gopherd/gopherdlocal.conf
+sbin/gopherd