upgrade to 2.8.3dev.8

4 files changed, 16 insertions, 28 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index be028e821b10..3c01fd708847 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=       lynx2.8.3dev.5
-PKGNAME=        lynx-2.8.3dev.5
+DISTNAME=       lynx2.8.3dev.8
+PKGNAME=        lynx-2.8.3dev.8
 CATEGORIES=	www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index 01fa1eae2760..1999f77745ee 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.3dev.5.tar.bz2) = db88a990110419d8f423bcb255092703
+MD5 (lynx2.8.3dev.8.tar.bz2) = 33dd4d6ee2d70134d8b501f668fd8dbc
diff --git a/www/lynx-current/files/patch-aa b/www/lynx-current/files/patch-aa
index 73ba775e6a39..9389c6d0b3e0 100644
--- a/www/lynx-current/files/patch-aa
+++ b/www/lynx-current/files/patch-aa
@@ -1,28 +1,18 @@
---- makefile.in.orig	Wed Jul 14 20:25:26 1999
-+++ makefile.in	Thu Aug  5 00:54:01 1999
-@@ -306,7 +306,7 @@
- 	@echo "Use $(MAKE) install-doc to install extra documentation files"
- 	@echo
- 
--install-full: install install-help install-doc
-+install-full: install install-doc install-help
- 	@echo Full installation complete.
- 
- install-bin: $(BINDIR)
-@@ -357,24 +357,25 @@
+--- makefile.in.orig	Thu Aug 26 15:31:19 1999
++++ makefile.in	Wed Sep  8 19:04:00 1999
+@@ -361,22 +361,19 @@
  		fi ; \
  		)'
  	-rm -f $(HELPDIR)/help_files.sed
 -	@echo Updating $(libdir)/lynx.cfg
 -	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
 -		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
-+	@echo Updating $(libdir)/lynx.cfg.default
-+	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg.default ; then \
-+		mv $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.tmp ; \
- 	else \
- 		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
- 	fi'
+-	else \
+-		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+-	fi'
 -	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
++	@echo Updating $(libdir)/lynx.cfg.default
++	cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp
 +	@echo Updating $(libdir)/lynx.cfg.default to point to installed help-files
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s@^@#@' \
  		-e '/^#HELPFILE:file/s@#@@' \
@@ -36,13 +26,10 @@
 +	chmod 644 $(LIBDIR)/lynx.cfg.default
  	-rm -f $(LIBDIR)/lynx.tmp
 +	-[ ! -f $(LIBDIR)/lynx.cfg ] && $(INSTALL_DATA) $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.cfg
- 	$(SHELL) -c 'for name in COPYING COPYHEADER; do \
--		cd $(DOCDIR) && ( $(LN_S) $$name $(HELPDIR)/ || cp $$name $(HELPDIR)/ );\
-+		cd $(DOCDIR) && cp $$name $(HELPDIR)/;\
- 		done'
  
  LYHelp.h : LYHelp.hin
-@@ -406,8 +407,7 @@
+ 	@echo Constructing sed-script
+@@ -407,8 +404,7 @@
  	PATH=$(srcdir):$$PATH; export PATH; $(SHELL) -c '$(srcdir)/cfg_defs.sh'
  
  install-cfg : $(LIBDIR)
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index a883f4980550..f23301ee3cfb 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -1,9 +1,12 @@
 bin/lynx
 etc/lynx.cfg.default
 @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
+@exec mkdir -p %D/share/lynx_help
 share/doc/lynx/CHANGES
 share/doc/lynx/COPYHEADER
+@exec ln -sf %D/%F %D/share/lynx_help
 share/doc/lynx/COPYING
+@exec ln -sf %D/%F %D/share/lynx_help
 share/doc/lynx/PROBLEMS
 share/doc/lynx/README
 share/doc/lynx/samples/blue-background.lss
@@ -29,8 +32,6 @@ share/doc/lynx/test/sgml.html
 share/doc/lynx/test/spaces.html
 share/doc/lynx/test/tabtest.html
 share/doc/lynx/test/unicode.html
-share/lynx_help/COPYHEADER
-share/lynx_help/COPYING
 share/lynx_help/Lynx_users_guide.html
 share/lynx_help/about_lynx.html
 share/lynx_help/keystrokes/alt_edit_help.html