Upgrade to next snapshot

5 files changed, 42 insertions, 35 deletions

diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 564513c711ac..064718db8ca9 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2-4-fm.zip) = e09ac113c494b2599d5558699b9144cf
+MD5 (lynx2-4-fm.zip) = d748d84f784224aef474c214a546eb88
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index f77dfe9e98c7..c0047e915627 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -3,6 +3,6 @@
 @mode 755
 bin/lynx
 @mode 444
-lib/lynx.cfg
+etc/lynx.cfg
 @mode 644
 man/man1/lynx.1
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 564513c711ac..064718db8ca9 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2-4-fm.zip) = e09ac113c494b2599d5558699b9144cf
+MD5 (lynx2-4-fm.zip) = d748d84f784224aef474c214a546eb88
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 4ab4bdfe451f..b3cd4e27791d 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,7 +1,12 @@
-*** Makefile.orig	Wed Dec 13 23:21:13 1995
---- Makefile	Wed Dec 13 23:53:06 1995
+*** Makefile.old	Mon Feb 12 11:58:22 1996
+--- Makefile	Thu Feb 22 04:50:37 1996
 ***************
-*** 15,29 ****
+*** 10,29 ****
+  ##change the next line if you want lynx installed somewhere 
+  ##besides /usr/local/bin
+  
+! exec= /usr/local/bin
+  
   ##change the next line if you want the lynx man file installed somewhere
   ##besides /usr/man/man1
   
@@ -10,49 +15,51 @@
   ##change the next line if you want the lynx.cfg file installed somewhere
   ##besides /usr/local/lib
   
-  cfg= /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 ----
+--- 10,29 ----
+  ##change the next line if you want lynx installed somewhere 
+  ##besides /usr/local/bin
+  
+! exec= ${PREFIX}/bin
+  
   ##change the next line if you want the lynx man file installed somewhere
   ##besides /usr/man/man1
   
-! doc= /usr/local/man/man1
+! doc= ${PREFIX}/man/man1
   
   ##change the next line if you want the lynx.cfg file installed somewhere
   ##besides /usr/local/lib
   
-  cfg= /usr/local/lib
+! cfg= ${PREFIX}/etc
   
-! installbin= install -c -s -m 555 -o bin -g bin
-! installdoc= install -c -m 444 -o bin -g bin
+! installbin= ${INSTALL} -c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}
+! installdoc= ${INSTALL} -c -m 444 -o ${BINOWN} -g ${BINGRP}
   
   
   #set the relative location of the WWW library Implementation directory, 
 ***************
-*** 120,129 ****
-  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!!
---- 120,129 ----
-  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!!
+*** 644,650 ****
+  
+  install:
+  	-mv -f $(exec)/lynx $(exec)/lynx.old
+- 	-mv -f $(cfg)/lynx.cfg $(cfg)/lynx.oldcfg
+  	$(installbin) lynx $(exec)/lynx
+  	$(installdoc) lynx.man $(doc)/lynx.1
+! 	$(installdoc) lynx.cfg $(cfg)/lynx.cfg
+--- 644,653 ----
+  
+  install:
+  	-mv -f $(exec)/lynx $(exec)/lynx.old
+  	$(installbin) lynx $(exec)/lynx
+  	$(installdoc) lynx.man $(doc)/lynx.1
+! 	if [ -f $(cfg)/lynx.cfg ] ; then \
+! 		$(installdoc) lynx.cfg $(cfg)/lynx.cfg-dist; \
+! 	else \
+! 		$(installdoc) lynx.cfg $(cfg)/lynx.cfg; \
+! 	fi
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index f77dfe9e98c7..c0047e915627 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -3,6 +3,6 @@
 @mode 755
 bin/lynx
 @mode 444
-lib/lynx.cfg
+etc/lynx.cfg
 @mode 644
 man/man1/lynx.1