4 files changed, 30 insertions, 27 deletions

diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index e7fe1c660c00..f41173c843e9 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.6d18
+PORTVERSION=	2.8.6p5
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/
-DISTNAME=	${PORTNAME}2.8.6dev.18
+DISTNAME=	${PORTNAME}2.8.6pre.5
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	A non-graphical, text-based World-Wide Web client
diff --git a/www/lynx-current/distinfo b/www/lynx-current/distinfo
index ea37aad249a2..3125d993644a 100644
--- a/www/lynx-current/distinfo
+++ b/www/lynx-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.6dev.18.tar.bz2) = 7555c6acf9d8c9bcb2c72e635e0c28f3
-SHA256 (lynx2.8.6dev.18.tar.bz2) = 9f1677505aac929e226e2e77f0347c0fb8534a270b64d0b4e7773d878552094a
-SIZE (lynx2.8.6dev.18.tar.bz2) = 2272236
+MD5 (lynx2.8.6pre.5.tar.bz2) = e4bca9cd958bf39d22abd57ce069fb0f
+SHA256 (lynx2.8.6pre.5.tar.bz2) = 703fe288440f3d4fff55183d2ad4bb5c9776ebf5a4257898e1509baab112933b
+SIZE (lynx2.8.6pre.5.tar.bz2) = 2287359
diff --git a/www/lynx-current/files/patch-aa b/www/lynx-current/files/patch-aa
index 6fd85dd8cef3..e53ee9ebdb39 100644
--- a/www/lynx-current/files/patch-aa
+++ b/www/lynx-current/files/patch-aa
@@ -1,41 +1,41 @@
---- makefile.in.orig	Tue May 30 02:44:54 2006
-+++ makefile.in	Wed Jun 14 05:12:44 2006
+--- makefile.in.orig	Mon Sep  4 03:25:39 2006
++++ makefile.in	Wed Oct  4 03:19:56 2006
 @@ -360,13 +360,9 @@
  		if test "$(COMPRESS_PROG)" != "" ; then \
  			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
  		fi'
--	@echo Updating $(libdir)/lynx.cfg
--	@ECHO_CC@$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
--		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+-	@echo Updating $(sysconfdir)/lynx.cfg
+-	@ECHO_CC@$(SHELL) -c 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
+-		mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 -	else \
--		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+-		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/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 Updating $(sysconfdir)/lynx.cfg to point to installed help-files
++	@echo Updating $(sysconfdir)/lynx.cfg.default
++	cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp
++	@echo Updating $(sysconfdir)/lynx.cfg.default to point to installed help-files
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
  		-e '/^#HELPFILE:file/s!#!!' \
- 		$(LIBDIR)/lynx.tmp | \
+ 		$(SYSCONFDIR)/lynx.tmp | \
 @@ -374,9 +370,10 @@
  	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
  	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
  		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
--		>$(LIBDIR)/lynx.cfg
--	chmod 644 $(LIBDIR)/lynx.cfg
-+		>$(LIBDIR)/lynx.cfg.default
-+	chmod 644 $(LIBDIR)/lynx.cfg.default
- 	-rm -f $(LIBDIR)/lynx.tmp
-+	-[ ! -f $(LIBDIR)/lynx.cfg ] && $(INSTALL_DATA) $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.cfg
+-		>$(SYSCONFDIR)/lynx.cfg
+-	chmod 644 $(SYSCONFDIR)/lynx.cfg
++		>$(SYSCONFDIR)/lynx.cfg.default
++	chmod 644 $(SYSCONFDIR)/lynx.cfg.default
+ 	-rm -f $(SYSCONFDIR)/lynx.tmp
++	-[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg
  
  LYHelp.h : help_files.sed LYHelp.hin
  	@echo Creating $@
 @@ -398,7 +395,7 @@
  	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
  
- install-cfg : $(LIBDIR)
--	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg
-+	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg.default
+ install-cfg : $(SYSCONFDIR)
+-	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg
++	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default
  
- install-lss : $(LIBDIR)
- 	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
+ install-lss : $(SYSCONFDIR)
+ 	-mv -f $(SYSCONFDIR)/lynx.lss $(SYSCONFDIR)/lynx.oldlss
diff --git a/www/lynx-current/pkg-plist b/www/lynx-current/pkg-plist
index 8ccf221239bb..8e7756252873 100644
--- a/www/lynx-current/pkg-plist
+++ b/www/lynx-current/pkg-plist
@@ -26,6 +26,7 @@ etc/lynx.cfg.default
 %%DOCSDIR%%/docs/README.chartrans
 %%DOCSDIR%%/docs/README.defines
 %%DOCSDIR%%/docs/README.jp
+%%DOCSDIR%%/docs/README.metrics
 %%DOCSDIR%%/docs/README.rootcerts
 %%DOCSDIR%%/docs/README.ssl
 %%DOCSDIR%%/docs/README.sslcerts
@@ -51,6 +52,7 @@ etc/lynx.cfg.default
 %%DOCSDIR%%/samples/mailto-form.pl
 %%DOCSDIR%%/samples/mild-colors.lss
 %%DOCSDIR%%/samples/mime.types
+%%DOCSDIR%%/samples/oldlynx
 %%DOCSDIR%%/test/ALT88592.html
 %%DOCSDIR%%/test/ISO_LATIN1_test.html
 %%DOCSDIR%%/test/README.txt
@@ -66,6 +68,7 @@ etc/lynx.cfg.default
 %%DOCSDIR%%/test/special_urls.html
 %%DOCSDIR%%/test/tabtest.html
 %%DOCSDIR%%/test/tags.html
+%%DOCSDIR%%/test/test-styles.html
 %%DOCSDIR%%/test/unicode.html
 %%DOCSDIR%%/test/utf-8-demo.html
 %%NLS%%share/locale/ca/LC_MESSAGES/lynx.mo