Clean patch now

1 files changed, 162 insertions, 164 deletions

diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index f6ede594256f..bd37acff926d 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,5 +1,37 @@
-*** ./WWW/Library/Implementation/HTFile.c.orig	Sat Apr  1 01:34:48 1995
---- ./WWW/Library/Implementation/HTFile.c	Sat Jun 17 02:04:19 1995
+*** ./WWW/Library/Implementation/HTTCP.c.orig	Wed Sep  6 17:07:03 1995
+--- ./WWW/Library/Implementation/HTTCP.c	Thu Sep 21 06:09:30 1995
+***************
+*** 97,104 ****
+--- 97,106 ----
+  #ifndef THINK_C
+  #ifndef __NetBSD__
+  #ifndef BSDI
++ #ifndef __FreeBSD__
+  extern char *sys_errlist[];		/* see man perror on cernvax */
+  extern int sys_nerr;
++ #endif  /* __FreeBSD__ */
+  #endif /* BSDI */
+  #endif	/* __NetBSD__ */
+  #endif  /* think c */
+***************
+*** 208,214 ****
+  #endif
+  #define ER_NO_TRANS_DONE
+  #endif
+! #ifdef NeXT
+  	    strerror(errno));
+  #define ER_NO_TRANS_DONE
+  #endif
+--- 210,216 ----
+  #endif
+  #define ER_NO_TRANS_DONE
+  #endif
+! #if defined(NeXT) || defined(__FreeBSD__)
+  	    strerror(errno));
+  #define ER_NO_TRANS_DONE
+  #endif
+*** ./WWW/Library/Implementation/HTFile.c.orig	Tue Jul 18 19:28:32 1995
+--- ./WWW/Library/Implementation/HTFile.c	Thu Sep 21 05:07:05 1995
 ***************
 *** 585,591 ****
 --- 585,595 ----
@@ -15,7 +47,7 @@
       int		ngroups;			/* The number of groups  */
       struct stat	fileStatus;
 *** ./WWW/Library/freebsd/Makefile.orig	Tue Jan 17 16:05:20 1995
---- ./WWW/Library/freebsd/Makefile	Sat Jun 17 02:26:28 1995
+--- ./WWW/Library/freebsd/Makefile	Thu Sep 21 05:07:05 1995
 ***************
 *** 8,16 ****
   ASIS_MACH = i386/FreeBSD
@@ -428,7 +460,7 @@
   
 ! include $(WWW)/Library/Implementation/CommonMakefile
 *** ./src/LYJump.c.orig	Sun Feb 12 04:42:24 1995
---- ./src/LYJump.c	Sat Jun 17 02:04:23 1995
+--- ./src/LYJump.c	Thu Sep 21 05:07:06 1995
 ***************
 *** 8,13 ****
 --- 8,16 ----
@@ -442,7 +474,7 @@
   #ifdef VMS
   #include <fab.h>
 *** ./src/LYShowInfo.c.orig	Sat Apr  8 17:13:02 1995
---- ./src/LYShowInfo.c	Sat Jun 17 02:04:24 1995
+--- ./src/LYShowInfo.c	Thu Sep 21 05:07:06 1995
 ***************
 *** 135,141 ****
   	      grp = getgrgid(dir_info.st_gid);
@@ -460,122 +492,11 @@
   		 fprintf(fp0,"%s",temp);
   	      }
   /*
-*** ./Makefile.orig	Thu Jun  8 16:47:06 1995
---- ./Makefile	Sat Jun 17 02:22:01 1995
-***************
-*** 10,24 ****
-  ##change the next line if you want the lynx man file installed somewhere
-  ##besides /usr/man/man1
-  
-! doc= /usr/man/man1
-  
-  ##change the next line if you want the lynx.cfg file installed somewhere
-  ##besides /usr/local/lib
-  
-  cfg= /usr/local/lib
-  
-! installbin= install -c -s -m 555
-! installdoc= install -c -m 444
-  
-  
-  #set the relative location of the WWW library Implementation directory, 
---- 10,24 ----
-  ##change the next line if you want the lynx man file installed somewhere
-  ##besides /usr/man/man1
-  
-! doc= /usr/local/man/man1
-  
-  ##change the next line if you want the lynx.cfg file installed somewhere
-  ##besides /usr/local/lib
-  
-  cfg= /usr/local/lib
-  
-! installbin= install -c -s -m 555 -o bin -g bin
-! installdoc= install -c -m 444 -o bin -g bin
-  
-  
-  #set the relative location of the WWW library Implementation directory, 
-***************
-*** 101,110 ****
-  univell: unixware
-  
-  # Set SITE_LYDEFS to one or more of the defines for the WWW Library:
-! SITE_LYDEFS = # -DDIRED_SUPPORT
-  
-  # Set SITE_DEFS to one or more of the defines for lynx below:
-! SITE_DEFS = # -DDIRED_SUPPORT
-  
-  # if you are compiling on a previously unsupported system, modify
-  # this generic entry!!
---- 101,110 ----
-  univell: unixware
-  
-  # Set SITE_LYDEFS to one or more of the defines for the WWW Library:
-! SITE_LYDEFS = -DDIRED_SUPPORT
-  
-  # Set SITE_DEFS to one or more of the defines for lynx below:
-! SITE_DEFS = -DDIRED_SUPPORT -DOK_TAR -DOK_GZIP -DOK_ZIP -DOK_OVERRIDE
-  
-  # if you are compiling on a previously unsupported system, modify
-  # this generic entry!!
-***************
-*** 223,232 ****
-  # FreeBSD doesn't have or need ranlib. (ignore the error message about that :)
-  freebsd-ncurses:  
-  	cd WWW/Library/freebsd; make LYFLAGS="$(SITE_LYDEFS)"
-! 	cd src; make all CC="cc" MCFLAGS="-O -DFANCY_CURSES -DNCURSES -DUNIX \
-! 		-DNO_KEYPAD -DNO_CUSERID -I../$(WWWINC) $(SITE_DEFS) \
-! 		-I/usr/include/ncurses" LIBS="-lncurses -lcompat \
-! 		-ltermcap $(WAISLIB) $(SOCKSLIB)" \
-  		WWWLIB="../WWW/Library/freebsd/libwww.a"
-  
-  # NetBSD doesn't have or need ranlib. (ignore the error message about that :)
---- 223,231 ----
-  # FreeBSD doesn't have or need ranlib. (ignore the error message about that :)
-  freebsd-ncurses:  
-  	cd WWW/Library/freebsd; make LYFLAGS="$(SITE_LYDEFS)"
-! 	cd src; make all MCFLAGS="$(CFLAGS) -DFANCY_CURSES -DNCURSES -DUNIX \
-! 		-DNO_TTYTYPE -DNO_CUSERID -DLOCALE -I../$(WWWINC) $(SITE_DEFS)" \
-! 		LIBS="-lncurses -lmytinfo $(WAISLIB) $(SOCKSLIB)" \
-  		WWWLIB="../WWW/Library/freebsd/libwww.a"
-  
-  # NetBSD doesn't have or need ranlib. (ignore the error message about that :)
-*** ./userdefs.h.orig	Thu Jun 15 20:21:02 1995
---- ./userdefs.h	Sat Jun 17 02:07:39 1995
-***************
-*** 228,234 ****
---- 228,238 ----
-  #ifdef MMDF
-  #define SYSTEM_MAIL "/usr/mmdf/bin/submit" 
-  #else
-+ #ifdef __FreeBSD__
-+ #define SYSTEM_MAIL "/usr/sbin/sendmail"
-+ #else
-  #define SYSTEM_MAIL "/usr/lib/sendmail" 
-+ #endif
-  #endif /* MMDF */
-  
-  /**************************
-***************
-*** 668,674 ****
---- 672,683 ----
-  #define LYNX_NAME "Lynx"
-  #define LYNX_VERSION "2-4-1"
-  #ifndef MAXINT
-+ #ifdef __FreeBSD__
-+ #include <limits.h>
-+ #define MAXINT INT_MAX
-+ #else
-  #define MAXINT 2147483647
-+ #endif
-  #endif /* !MAXINT */
-  
-  /* text strings for certain actions */
-*** src/LYMain.c.bak	Mon Jun  5 06:13:14 1995
---- src/LYMain.c	Sat Jun 17 03:05:17 1995
+*** ./src/LYMain.c.orig	Thu Aug 10 01:37:35 1995
+--- ./src/LYMain.c	Thu Sep 21 05:07:07 1995
 ***************
-*** 24,29 ****
---- 24,30 ----
+*** 25,30 ****
+--- 25,31 ----
   #ifdef SYSLOG_REQUESTED_URLS
   #include <syslog.h>
   #endif /* SYSLOG_REQUESTED_URLS */
@@ -583,8 +504,8 @@
   #endif /* !VMS */
   
   #ifdef LOCALE
-*** src/LYStrings.c.bak	Sat Apr  1 01:51:18 1995
---- src/LYStrings.c	Sat Jun 17 03:29:19 1995
+*** ./src/LYStrings.c.orig	Sat Apr  1 01:51:18 1995
+--- ./src/LYStrings.c	Thu Sep 21 05:07:07 1995
 ***************
 *** 35,41 ****
   #ifdef VMS
@@ -602,8 +523,8 @@
   #define GetChar() wgetch(stdscr)
   #else /* everything but VMS and SNAKE */
   #define GetChar() getchar()  /* used to be "getc(stdin)" and "getch()" */
-*** src/LYStrings.h.bak	Thu Jun  9 16:02:14 1994
---- src/LYStrings.h	Sat Jul  8 09:39:28 1995
+*** ./src/LYStrings.h.orig	Thu Jun  9 16:02:14 1994
+--- ./src/LYStrings.h	Thu Sep 21 05:07:08 1995
 ***************
 *** 23,43 ****
   #define printable(c) (((c)>31 && (c)<=255) || (c)==9 || (c)==10 || (c)<0 )
@@ -649,8 +570,8 @@
   
   #define VISIBLE 0
   #define HIDDEN  1
-*** src/LYDownload.c.bak	Mon Jun  5 06:12:52 1995
---- src/LYDownload.c	Sat Jul  8 09:46:22 1995
+*** ./src/LYDownload.c.orig	Mon Jun  5 06:12:52 1995
+--- ./src/LYDownload.c	Thu Sep 21 05:07:08 1995
 ***************
 *** 35,41 ****
       char command[256];
@@ -668,8 +589,8 @@
       FILE *fp;
   #ifdef VMS
       extern BOOLEAN HadVMSInterrupt;
-*** src/LYForms.c.bak	Sat Apr  1 01:49:12 1995
---- src/LYForms.c	Sat Jul  8 09:46:22 1995
+*** ./src/LYForms.c.orig	Sat Apr  1 01:49:12 1995
+--- ./src/LYForms.c	Thu Sep 21 05:07:09 1995
 ***************
 *** 312,318 ****
   		    refresh();
@@ -687,8 +608,8 @@
   		   if(has_there_ever_been_data) {
   			_statusline("Do you want to go back to the previous document? [n]");
   			c=LYgetch();
-*** src/LYUpload.c.bak	Tue Mar  7 23:38:02 1995
---- src/LYUpload.c	Sat Jul  8 09:46:22 1995
+*** ./src/LYUpload.c.orig	Tue Mar  7 23:38:02 1995
+--- ./src/LYUpload.c	Thu Sep 21 05:07:09 1995
 ***************
 *** 36,42 ****
       char tmpbuf[256];
@@ -706,8 +627,8 @@
       char *cp;
       FILE *fp;
   #ifdef VMS
-*** src/LYKeymap.c.bak	Tue Mar  7 23:36:26 1995
---- src/LYKeymap.c	Sat Jul  8 10:11:26 1995
+*** ./src/LYKeymap.c.orig	Sat Jul  8 05:27:04 1995
+--- ./src/LYKeymap.c	Thu Sep 21 05:07:09 1995
 ***************
 *** 156,161 ****
 --- 156,194 ----
@@ -750,37 +671,114 @@
   LYK_PREV_LINK,    LYK_NEXT_LINK,    LYK_ACTIVATE,   LYK_PREV_DOC,
   /* UPARROW */     /* DNARROW */     /* RTARROW */   /* LTARROW */
   
-*** WWW/Library/Implementation/HTTCP.c.orig	Wed Sep  6 15:06:49 1995
---- WWW/Library/Implementation/HTTCP.c	Thu Sep 21 00:28:50 1995
+*** ./Makefile.orig	Wed Sep  6 22:07:00 1995
+--- ./Makefile	Thu Sep 21 05:07:06 1995
 ***************
-*** 96,105 ****
---- 96,107 ----
-  #ifndef NeXT
-  #ifndef THINK_C
-  #ifndef __NetBSD__
-+ #ifndef __FreeBSD__
-  #ifndef BSDI
-  extern char *sys_errlist[];		/* see man perror on cernvax */
-  extern int sys_nerr;
-  #endif /* BSDI */
-+ #endif	/* __FreeBSD */
-  #endif	/* __NetBSD__ */
-  #endif  /* think c */
-  #endif	/* NeXT */
+*** 15,29 ****
+  ##change the next line if you want the lynx man file installed somewhere
+  ##besides /usr/man/man1
+  
+! doc= /usr/man/man1
+  
+  ##change the next line if you want the lynx.cfg file installed somewhere
+  ##besides /usr/local/lib
+  
+  cfg= /usr/local/lib
+  
+! installbin= install -c -s -m 555
+! installdoc= install -c -m 444
+  
+  
+  #set the relative location of the WWW library Implementation directory, 
+--- 15,29 ----
+  ##change the next line if you want the lynx man file installed somewhere
+  ##besides /usr/man/man1
+  
+! doc= /usr/local/man/man1
+  
+  ##change the next line if you want the lynx.cfg file installed somewhere
+  ##besides /usr/local/lib
+  
+  cfg= /usr/local/lib
+  
+! installbin= install -c -s -m 555 -o bin -g bin
+! installdoc= install -c -m 444 -o bin -g bin
+  
+  
+  #set the relative location of the WWW library Implementation directory, 
 ***************
-*** 208,214 ****
-  #endif
-  #define ER_NO_TRANS_DONE
-  #endif
-! #ifdef NeXT
-  	    strerror(errno));
-  #define ER_NO_TRANS_DONE
-  #endif
---- 210,216 ----
-  #endif
-  #define ER_NO_TRANS_DONE
-  #endif
-! #if defined(NeXT) || defined(__FreeBSD__)
-  	    strerror(errno));
-  #define ER_NO_TRANS_DONE
-  #endif
+*** 108,117 ****
+  univell: unixware
+  
+  # Set SITE_LYDEFS to one or more of the defines for the WWW Library:
+! SITE_LYDEFS = # -DDIRED_SUPPORT
+  
+  # Set SITE_DEFS to one or more of the defines for lynx below:
+! SITE_DEFS = # -DDIRED_SUPPORT
+  
+  # if you are compiling on a previously unsupported system, modify
+  # this generic entry!!
+--- 108,117 ----
+  univell: unixware
+  
+  # Set SITE_LYDEFS to one or more of the defines for the WWW Library:
+! SITE_LYDEFS = -DDIRED_SUPPORT
+  
+  # Set SITE_DEFS to one or more of the defines for lynx below:
+! SITE_DEFS = -DDIRED_SUPPORT -DOK_TAR -DOK_GZIP -DOK_ZIP -DOK_OVERRIDE
+  
+  # if you are compiling on a previously unsupported system, modify
+  # this generic entry!!
+***************
+*** 239,248 ****
+  # FreeBSD doesn't have or need ranlib. (ignore the error message about that :)
+  freebsd-ncurses:  
+  	cd WWW/Library/freebsd; make LYFLAGS="$(SITE_LYDEFS)"
+! 	cd src; make all CC="cc" MCFLAGS="-O -DFANCY_CURSES -DNCURSES -DUNIX \
+! 		-DNO_KEYPAD -DNO_CUSERID -I../$(WWWINC) $(SITE_DEFS) \
+! 		-I/usr/include/ncurses" LIBS="-lncurses -lcompat \
+! 		-ltermcap $(WAISLIB) $(SOCKSLIB)" \
+  		WWWLIB="../WWW/Library/freebsd/libwww.a"
+  
+  # NetBSD doesn't have or need ranlib. (ignore the error message about that :)
+--- 239,247 ----
+  # FreeBSD doesn't have or need ranlib. (ignore the error message about that :)
+  freebsd-ncurses:  
+  	cd WWW/Library/freebsd; make LYFLAGS="$(SITE_LYDEFS)"
+! 	cd src; make all MCFLAGS="$(CFLAGS) -DFANCY_CURSES -DNCURSES -DUNIX \
+! 		-DNO_TTYTYPE -DNO_CUSERID -DLOCALE -I../$(WWWINC) $(SITE_DEFS)" \
+! 		LIBS="-lncurses -lmytinfo $(WAISLIB) $(SOCKSLIB)" \
+  		WWWLIB="../WWW/Library/freebsd/libwww.a"
+  
+  # NetBSD doesn't have or need ranlib. (ignore the error message about that :)
+*** ./userdefs.h.orig	Wed Aug  9 22:24:49 1995
+--- ./userdefs.h	Thu Sep 21 05:07:07 1995
+***************
+*** 228,234 ****
+--- 228,238 ----
+  #ifdef MMDF
+  #define SYSTEM_MAIL "/usr/mmdf/bin/submit" 
+  #else
++ #ifdef __FreeBSD__
++ #define SYSTEM_MAIL "/usr/sbin/sendmail"
++ #else
+  #define SYSTEM_MAIL "/usr/lib/sendmail" 
++ #endif
+  #endif /* MMDF */
+  
+  /**************************
+***************
+*** 690,696 ****
+--- 694,705 ----
+  #define LYNX_NAME "Lynx"
+  #define LYNX_VERSION "2-4-2"
+  #ifndef MAXINT
++ #ifdef __FreeBSD__
++ #include <limits.h>
++ #define MAXINT INT_MAX
++ #else
+  #define MAXINT 2147483647
++ #endif
+  #endif /* !MAXINT */
+  
+  /* text strings for certain actions */