Update to version 2.3.

PR:		7166
Submitted by:	Pedro Giffuni <giffunip@asme.org>

5 files changed, 131 insertions, 81 deletions

diff --git a/net/gopher/files/patch-aa b/net/gopher/files/patch-aa
index b0681a1..4a691eb 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 49f0f69..502ff4b 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 62d0571..df44d27 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 0000000..643611c
--- /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 0000000..8a3a96b
--- /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
+  
+  
+  #---------------------------------------------------------------------