Upgrade to version 2.3.1

1 files changed, 483 insertions, 93 deletions

diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 174829cd4fb5..bdcec5b8811e 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,8 +1,8 @@
-*** WWW/Library/Implementation/HTTCP.c.old	Fri May  6 04:58:38 1994
---- WWW/Library/Implementation/HTTCP.c	Sat Nov  5 20:41:18 1994
+*** WWW/Library/Implementation/HTTCP.c.orig	Thu Jul 28 02:36:45 1994
+--- WWW/Library/Implementation/HTTCP.c	Sun Nov  6 15:47:34 1994
 ***************
-*** 73,80 ****
---- 73,82 ----
+*** 82,89 ****
+--- 82,91 ----
   #ifndef VMS
   #ifndef NeXT
   #ifndef THINK_C
@@ -14,7 +14,7 @@
   #endif	/* NeXT */
   #endif  /* VMS */
 ***************
-*** 181,187 ****
+*** 190,196 ****
   #endif
   #define ER_NO_TRANS_DONE
   #endif
@@ -22,7 +22,7 @@
   	    strerror(errno));
   #define ER_NO_TRANS_DONE
   #endif
---- 183,189 ----
+--- 192,198 ----
   #endif
   #define ER_NO_TRANS_DONE
   #endif
@@ -30,8 +30,8 @@
   	    strerror(errno));
   #define ER_NO_TRANS_DONE
   #endif
-*** WWW/Library/Implementation/CommonMakefile.old	Sun Apr 17 01:55:00 1994
---- WWW/Library/Implementation/CommonMakefile	Sat Nov  5 19:51:27 1994
+*** WWW/Library/Implementation/CommonMakefile.orig	Sun May 29 06:11:42 1994
+--- WWW/Library/Implementation/CommonMakefile	Sun Nov  6 15:47:36 1994
 ***************
 *** 63,69 ****
   # in which this makefile is, not the pwd.  This screws up the 
@@ -49,39 +49,466 @@
   
   # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
   #
-*** src/LYUtils.c.old	Sat Apr 16 03:41:44 1994
---- src/LYUtils.c	Sun Nov  6 10:50:28 1994
+*** WWW/Library/Implementation/tcp.h.orig	Fri Jul 29 02:37:49 1994
+--- WWW/Library/Implementation/tcp.h	Sun Nov  6 16:21:29 1994
 ***************
-*** 16,22 ****
---- 16,26 ----
-  #endif
+*** 339,346 ****
+  #define INCLUDES_DONE
+  #endif  /* Normal includes */
+  
+  /* Interactive UNIX for i386 and i486 -- Thanks to jeffrey@itm.itm.org */
+! #ifdef i386
+  #include <net/errno.h>
+  #include <sys/types.h>
+  #include <sys/tty.h>
+--- 339,352 ----
+  #define INCLUDES_DONE
+  #endif  /* Normal includes */
   
-  #ifndef UTMP_FILE
-+ #ifdef _PATH_UTMP
-+ #define UTMP_FILE _PATH_UTMP
++ #ifdef __FreeBSD__
++ #include <unistd.h>
++ #include <limits.h>
++ #define USE_DIRENT	/* sys V style directory open */
++ #endif
++ 
+  /* Interactive UNIX for i386 and i486 -- Thanks to jeffrey@itm.itm.org */
+! #if defined(i386) && !defined(__FreeBSD__)
+  #include <net/errno.h>
+  #include <sys/types.h>
+  #include <sys/tty.h>
+*** WWW/Library/Implementation/HTFile.c.orig	Fri Jun 17 22:13:48 1994
+--- WWW/Library/Implementation/HTFile.c	Sun Nov  6 16:24:57 1994
+***************
+*** 541,547 ****
+--- 541,551 ----
+  #ifdef NO_GROUPS
+      return NO;		/* Safe answer till we find the correct algorithm */
+  #else
++ #ifdef __FreeBSD__
++     gid_t       groups[NGROUPS];
 + #else
-  #define UTMP_FILE "/etc/utmp"
+      int 	groups[NGROUPS];	
 + #endif
-  #endif
+      uid_t	myUid;
+      int		ngroups;			/* The number of groups  */
+      struct stat	fileStatus;
+*** WWW/Library/freebsd/Makefile.orig	Thu Jul 14 09:32:44 1994
+--- WWW/Library/freebsd/Makefile	Sun Nov  6 16:19:41 1994
+***************
+*** 8,14 ****
+  ASIS_MACH = i386/FreeBSD
+  
+  
+! CFLAGS = -O -DDEBUG -DUSE_DIRENT
+  LFLAGS =
+  CC = cc
+  
+--- 8,14 ----
+  ASIS_MACH = i386/FreeBSD
+  
+  
+! CFLAGS = -O -DDEBUG
+  LFLAGS =
+  CC = cc
   
-  /*
-*** src/LYCurses.c.old	Fri May  6 04:58:22 1994
---- src/LYCurses.c	Sun Nov  6 10:47:16 1994
 ***************
-*** 26,35 ****
-      if(first_time) {
-          initscr();	/* start curses */
-          first_time = FALSE;
-- #ifdef __FreeBSD__
--         /* disable clear to EOL feature -- FreeBSD curses misuses it */
--         CE = 0;
-- #endif
-      }
+*** 25,411 ****
+  #  Where should temporary (object) files go?
+  WTMP = ../..
   
-  #else
---- 26,31 ----
-*** src/LYMain.c.old	Fri May 20 21:28:41 1994
---- src/LYMain.c	Sun Nov  6 11:02:29 1994
+- #	Common Makefile for W3 Library Code
+- #	-----------------------------------
+- #
+- #	(c) CERN 1990, 1991 -- see Copyright.html for conditions
+- #
+- # This file should be invariant between systems.
+- #	DEPENDENCIES NOT COMPLETE @@
+- #
+- #	make		Compile and link the software (private version)
+- #	make install	Copy it into the system (implies make)
+- #	make update	Copy installed version into installed version
+- #	make uninstall	Unlink installed version from the system
+- #	make clean	Remove intermediate files
+- #	make cleanall	Remove intremediate files and products
+- #	
+- # Macros required to be defined already for make:
+- #
+- # CC		The C compiler
+- # CFLAGS	Flags for $(CC) -- except the -I which are below
+- # LFLAGS	Flags for ld
+- #
+- # WWW           The WWW source tree directory
+- #
+- # Macros needed for make install:
+- #
+- # LIBDIR	Directory for installed library
+- #______________________________________________________________________
+  
+! #  If this env var is set to something else Some makes will use that instead
+! SHELL = /bin/sh
+! 
+! #	.h files are distributed but originally are made from the
+! #	self-documenting hypertext files.
+! 
+! .SUFFIXES: .h .html
+! .html.h:
+! #	- chmod +w $*.h
+! 	www -w90 -na -to text/x-c $*.html > $*.h
+! #	chmod -w $*.h
+! 
+! # If this is actually run in a subdirectory,
+! #
+! # WWW = ../../..
+! # WWW = ../..	For [cernlib] build in this directory
+! 
+! WC = $(WWW)/Library
+! CMN = $(WWW)/Library/Implementation/
+! VMS = $(CMN)vms
+! # Where shall we put the objects and built library?
+! 
+! LOB = $(WTMP)/Library/$(WWW_MACH)
+! 
+! # Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include
+! #  uncomment these and fill in WAISINC for adding direct wais access
+! #  to Lynx.
+! #HTWAIS = $(LOB)/HTWAIS.o
+! #WAIS = YES
+! #WAISINC = -I../../../../freeWAIS-0.202/ir
+! #WAISCFLAGS = -DDIRECT_WAIS 
+! #
+! 
+! # This path, if relative, is taken relative to the directory
+! # in which this makefile is, not the pwd.  This screws up the 
+! # recursive invocation
+! # include $(CMN)Version.make
+! .include "$(ABS)$(WWW)/Library/Implementation/Version.make"
+! 
+! # XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
+! #
+! # add -DNEW_GATEWAY here for the new gateway config stuff
+! CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK \
+! -DACCESS_AUTH 
+! 
+! CERNLIBBIN = $(WWW)/bin
+! 
+! COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
+! 	$(LOB)/HTFile.o	$(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \
+! 	$(LOB)/SGML.o $(LOB)/HTML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
+! 	$(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \
+! 	$(LOB)/HTMLGen.o \
+! 	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
+! 	$(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \
+! 	$(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \
+! 	$(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \
+! 	$(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) \
+! 	$(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \
+! 	$(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o  \
+! 	$(LOB)/HTACL.o    $(LOB)/HTAuth.o   $(LOB)/HTAAProt.o \
+! 	$(LOB)/HTAssoc.o  $(LOB)/HTLex.o    $(LOB)/HTUU.o
+! 
+! CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
+!         $(CMN)HTBTree.c \
+! 	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c $(CMN)HTML.c	\
+! 	$(CMN)HTMLDTD.c \
+! 	$(CMN)HTPlain.c	$(CMN)HTWriter.c  $(CMN)HTFWriter.c \
+!         $(CMN)HTMLGen.c	\
+! 	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
+! 	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \
+! 	$(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
+! 	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
+! 	$(CMN)HTWAIS.c  $(CMN)HTWSRC.c \
+! 	$(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \
+! 	$(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c  \
+! 	$(CMN)HTACL.c    $(CMN)HTAuth.c   $(CMN)HTAAProt.c \
+! 	$(CMN)HTAssoc.c  $(CMN)HTLex.c    $(CMN)HTUU.c
+! 
+! HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \
+! 	$(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \
+! 	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
+! 	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
+! 	$(CMN)HTFWriter.h 	$(CMN)HTMLGen.h	\
+! 	$(CMN)HTStream.h \
+! 	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
+! 	$(CMN)HTList.h \
+! 	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
+! 	$(CMN)HTFormat.h $(CMN)HTInit.h \
+! 	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
+! 	$(CMN)HTGopher.h \
+! 	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \
+! 	$(CMN)HTTelnet.h \
+! 	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h \
+! 	$(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \
+! 	$(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h  \
+! 	$(CMN)HTACL.h    $(CMN)HTAuth.h   $(CMN)HTAAProt.h \
+! 	$(CMN)HTAssoc.h  $(CMN)HTLex.h    $(CMN)HTUU.h
+! 
+! SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \
+! 	$(CMN)CommonMakefile $(CMN)Makefile \
+! 	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile
+! SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \
+! 	$(VMS)/descrip.mms $(VMS)/build_multinet.com \
+! 	$(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \
+! 	$(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \
+! 	$(VMS)/crypt.c $(VMS)/crypt_util.c \
+! 	$(VMS)/getline.c $(VMS)/getpass.c \
+! 	$(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c
+! 
+! 
+! #	Library
+! #
+! #  On SGI, ranlib is unnecessary and does not exist so we ignore errors
+! # for that step
+! $(LOB)/libwww.a : $(COMMON)
+! 	ar r $(LOB)/libwww.a $(COMMON)
+! 	-ranlib $(LOB)/libwww.a
+! 
+! #	Clean up everything generatable except final products
+! clean :
+! 	rm $(LOB)/*.o $(LOB)/.created
+! 	-rmdir $(LOB)
+! 
+! #	Clean up everything generatable including final products
+! 
+! cleanall : clean
+! 	rm $(LOB)/libwww.a
+! 
+! #	Install W3 library into system space (not normally necessary)
+! 
+! install : libwww.a
+! 	if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
+! 	cp libwww.a $(LIBDIR)/libwww.a
+! 	
+! uninstall :
+! 	rm $(LIBDIR)/libwww.a
+! 
+! #		Distribution use only:
+! #		----------------------
+! 
+! #	Needs www version 2.4 or later to do this
+! inc : $(HFILES)
+! 	echo Include files generated from hypertext.
+! 
+! binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
+! 	echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date.
+! 
+! 
+! /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a
+! 	-mkdir /pub/www/bin/$(WWW_MACH)
+! 	cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
+! 
+! #	Source Distribution:
+! 
+! distribute :  /pub/www/README.txt /pub/www/Copyright.txt
+! 	(cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \
+! 		-f WWW/Library/Implementation/CommonMakefile \
+! 		/pub/www/src/WWWLibrary_$(VC).tar.Z)
+! 	(cd ../Implementation; cvs tag \
+! 	    `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` )
+! 	echo Distribution of Library version $(VC) up to date.
+! 
+! /pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES)
+! 	tar cf /pub/www/src/WWWLibrary_$(VC).tar \
+! 	    $(SOURCES)  $(SPECIFIC) $(WC)/*/Makefile
+! 	compress /pub/www/src/WWWLibrary_$(VC).tar
+! 
+! 
+! #	Hypertext supplied in text format
+! #	---------------------------------
+! 
+! $(WWW)/README.txt : $(WWW)/../README.html
+! 	www -n -p66 http://info.cern.ch/hypertext/README.html \
+! 		> $(WWW)/README.txt
+! /pub/www/README.txt : $(WWW)/README.txt
+! 	cp $(WWW)/README.txt /pub/www/README.txt
+! 
+! $(WWW)/Copyright.txt : $(WWW)/../Copyright.html
+! 	www -n -p66 http://info.cern.ch/hypertext/Copyright.html \
+! 		> $(WWW)/Copyright.txt
+! /pub/www/Copyright.txt : $(WWW)/Copyright.txt
+! 	cp $(WWW)/Copyright.txt /pub/www/Copyright.txt
+! 
+! # 			Common code
+! #			-----------
+! 
+! #	Directory for object files - .created checks it exists
+! 
+! OE = $(LOB)/.created
+! $(OE) :
+! 	if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
+! 	if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi
+! 	if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \
+! 		then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi
+! 	touch $@
+! 
+! $(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
+! 
+! $(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
+! 
+! $(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
+! 
+! $(LOB)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.c
+! 
+! $(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
+! 
+! $(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
+! 
+! $(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
+! 	 $(CMN)HTMLDTD.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
+! 
+! $(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
+! 	 $(CMN)HTMLDTD.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
+! 
+! $(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
+! 
+! $(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
+! 
+! $(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
+! 
+! $(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
+! 
+! $(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
+! 	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
+! 
+! $(LOB)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make
+! 	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c
+! 
+! $(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
+! 	 $(CMN)HTAAServ.h $(CMN)HTAAProt.h
+! 	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
+! 
+! $(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
+! 
+! $(LOB)/HTML.o : $(OE) $(CMN)HTML.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTML.c
+! 
+! $(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
+! 
+! $(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
+! 
+! $(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
+! 
+! $(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
+! 
+! $(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
+! 
+! $(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
+! 
+! $(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c
+! 
+! 
+! #	Access Authorization
+! 
+! $(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
+! 	 $(CMN)HTUtils.h $(CMN)HTString.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c
+! 
+! $(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c
+! 
+! $(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c
+! 
+! $(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
+! 	 $(CMN)HTAssoc.h $(CMN)HTLex.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c
+! 
+! $(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \
+! 	 $(CMN)HTAssoc.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c
+! 
+! $(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \
+! 	 $(CMN)HTAssoc.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c
+! 
+! $(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \
+! 	$(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \
+! 	 $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \
+! 	 $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \
+! 	 $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \
+! 	 $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c
+! 
+! $(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
+! 	 $(CMN)HTAAUtil.h $(CMN)HTUU.h \
+! 	 $(CMN)HTUtils.h $(CMN)HTString.h \
+! 	 $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \
+! 	 $(CMN)HTAssoc.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c
+! 
+! $(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
+! 	 $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
+! 	 $(CMN)HTAssoc.h $(CMN)HTLex.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c
+! 
+! $(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
+! 	$(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c
+! 
+! $(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c
+! 
+! $(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c
+! 
+! 
+! #	Communications & Files
+! 
+! $(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
+! 
+! $(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
+! 
+! $(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
+! 	 $(CMN)HTMLDTD.h $(CMN)HTAAServ.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
+! 
+! $(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c
+! 
+! $(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
+! 
+! $(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
+! 
+! $(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
+! 	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
+  
+--- 25,30 ----
+  #  Where should temporary (object) files go?
+  WTMP = ../..
+  
+  
+! .include "$(WWW)/Library/Implementation/CommonMakefile"
+  
+*** src/LYMain.c.orig	Sat Aug 13 00:22:45 1994
+--- src/LYMain.c	Sun Nov  6 15:47:39 1994
 ***************
 *** 13,19 ****
   #include "LYrcFile.h"
@@ -100,26 +527,26 @@
   #endif /* SUN */
   
 ***************
-*** 116,122 ****
-      BOOLEAN restrictions_set=FALSE;
-      BOOLEAN stack_dump=FALSE;
+*** 132,138 ****
+      atexit(LYLeaks);
+  #endif /* LY_FIND_LEAKS */
   
 ! #ifdef SUN
       /* SUN specific support for international characters. */
       setlocale(LC_ALL, "");
   #endif /* SUN */
---- 116,122 ----
-      BOOLEAN restrictions_set=FALSE;
-      BOOLEAN stack_dump=FALSE;
+--- 132,138 ----
+      atexit(LYLeaks);
+  #endif /* LY_FIND_LEAKS */
   
 ! #if defined(SUN) || defined(__FreeBSD__)
       /* SUN specific support for international characters. */
       setlocale(LC_ALL, "");
   #endif /* SUN */
-*** Makefile.old	Wed May 11 23:48:36 1994
---- Makefile	Sun Nov  6 12:34:35 1994
+*** Makefile.orig	Wed Aug 10 01:20:49 1994
+--- Makefile	Sun Nov  6 15:49:43 1994
 ***************
-*** 11,25 ****
+*** 10,24 ****
   ##change the next line if you want the lynx man file installed somewhere
   ##besides /usr/man/man1
   
@@ -135,7 +562,7 @@
   
   
   #set the relative location of the WWW library Implementation directory, 
---- 11,25 ----
+--- 10,24 ----
   ##change the next line if you want the lynx man file installed somewhere
   ##besides /usr/man/man1
   
@@ -152,7 +579,7 @@
   
   #set the relative location of the WWW library Implementation directory, 
 ***************
-*** 42,48 ****
+*** 41,47 ****
   # If you are not, then you should edit the generic: entry below.
   #
   
@@ -160,7 +587,7 @@
   	@echo
   	@echo "Please run make with one of the following arguments"
   	@echo "aix32      -- for RS/6000 running AIX 3.2"
---- 42,50 ----
+--- 41,49 ----
   # If you are not, then you should edit the generic: entry below.
   #
   
@@ -171,18 +598,17 @@
   	@echo "Please run make with one of the following arguments"
   	@echo "aix32      -- for RS/6000 running AIX 3.2"
 ***************
-*** 130,139 ****
+*** 141,149 ****
   		WWWLIB="../WWW/Library/mips/libwww.a"
   
   freebsd:
-! 	cd WWW/Library/Implementation; make -f freebsd_Makefile LYFLAGS=""
+! 	cd WWW/Library/freebsd; make LYFLAGS=""
 ! 	cd src; make all CC="cc" MCFLAGS="-O -DUNIX -DNO_KEYPAD -I../$(WWWINC)"\
 ! 		LIBS="-lcurses -ltermcap $(WAISLIB)" \
-! 		WWWLIB="../WWW/Library/svr4/libwww.a"
+  		WWWLIB="../WWW/Library/freebsd/libwww.a"
   
   # Tested on DN 3500 & 4500's running Domain O/S 10.4 BSD
-  # -Acpu,mathchip may have to be changed on other machines - see man cpuhep
---- 132,143 ----
+--- 143,153 ----
   		WWWLIB="../WWW/Library/mips/libwww.a"
   
   freebsd:
@@ -191,12 +617,11 @@
 ! 		-DFANCY_CURSES -DNO_CUSERID -DUNIX -I../$(WWWINC)\
 ! 		-DDIRED_SUPPORT -DOK_TAR -DOK_GZIP -DOK_OVERRIDE"\
 ! 		LIBS="-lncurses -lmytinfo -ltermcap $(WAISLIB)" \
-! 		WWWLIB="../WWW/Library/freebsd/libwww.a"
+  		WWWLIB="../WWW/Library/freebsd/libwww.a"
   
   # Tested on DN 3500 & 4500's running Domain O/S 10.4 BSD
-  # -Acpu,mathchip may have to be changed on other machines - see man cpuhep
-*** userdefs.h.old	Wed Apr 13 18:50:12 1994
---- userdefs.h	Sun Nov  6 11:47:13 1994
+*** userdefs.h.orig	Sat Aug 13 00:16:08 1994
+--- userdefs.h	Sun Nov  6 15:47:40 1994
 ***************
 *** 183,189 ****
 --- 183,193 ----
@@ -212,10 +637,10 @@
   
   /**************************
 ***************
-*** 474,480 ****
---- 478,488 ----
+*** 499,505 ****
+--- 503,513 ----
   #define LYNX_NAME "Lynx"
-  #define LYNX_VERSION "2.3 BETA"
+  #define LYNX_VERSION "2.3.1 BETA"
   #ifndef MAXINT
 + #ifdef __FreeBSD__
 + #include <values.h>
@@ -225,38 +650,3 @@
   #endif /*MAXINT*/
   
   /* text strings for certain actions */
-*** /dev/null	Sun Nov  6 12:49:42 1994
---- WWW/Library/freebsd/Makefile	Sat Nov  5 19:48:43 1994
-***************
-*** 0 ****
---- 1,30 ----
-+ #  Make WWW under FreeBSD
-+ #
-+ 
-+ # For W3 distribution, machine type for subdirectories
-+ WWW_MACH = freebsd
-+ 
-+ # The ASIS repository's name for the machine we are on
-+ ASIS_MACH = i386/FreeBSD
-+ 
-+ 
-+ CFLAGS = -O -DDEBUG -DUSE_DIRENT
-+ LFLAGS =
-+ CC = cc
-+ 
-+ # Directory for installed binary:
-+ BINDIR = /usr/local/bin
-+ 
-+ # Where is the W3 object library to be installed (not normally done)?
-+ LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
-+ 
-+ #_________________ OK if normal W3 distribution
-+ # Where is the WWW source root?
-+ WWW = ../..
-+ 
-+ #  Where should temporary (object) files go?
-+ WTMP = ../..
-+ 
-+ 
-+ .include "$(WWW)/Library/Implementation/CommonMakefile"
-+