1 files changed, 27 insertions, 37 deletions
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[];