Upgrade www/lynx to 2.8.6rel.4

PR:		111530
Submitted by:	me
Reviewed by:	maintainer

5 files changed, 46 insertions, 93 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 3d66ce757a96..d315c2212054 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.5
-PORTREVISION=	2
+PORTVERSION=	2.8.6
+PORTREVISION=	4
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/ \
-		ftp://lynx.isc.org/lynx2.8.5/patches/:patches
-DISTNAME=	${PORTNAME}2.8.5rel.1
-
-PATCH_SITES=	ftp://lynx.isc.org/lynx2.8.5/patches/
-.for i in 2 3 4
-PATCHFILES+=	2.8.5rel.${i}.patch.gz
-.endfor
-PATCH_DIST_STRIP=	-p1
+		ftp://lynx.isc.org/lynx${PORTVERSION}/patches/:patches
+DISTNAME=	${PORTNAME}${PORTVERSION}rel.${PORTREVISION}
 
 MAINTAINER?=	jharris@widomaker.com
 COMMENT?=	A non-graphical, text-based World-Wide Web client
@@ -25,7 +19,7 @@ COMMENT?=	A non-graphical, text-based World-Wide Web client
 CONFLICTS?=	lynx-ssl* lynx-current*
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}2-8-5
+WRKSRC=		${WRKDIR}/${PORTNAME}2-8-6
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index a7c7185f8412..5d0f03ba082d 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,12 +1,3 @@
-MD5 (lynx2.8.5rel.1.tar.bz2) = d1e5134e5d175f913c16cb6768bc30eb
-SHA256 (lynx2.8.5rel.1.tar.bz2) = 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63
-SIZE (lynx2.8.5rel.1.tar.bz2) = 2177287
-MD5 (2.8.5rel.2.patch.gz) = 16840d095311814751684c99dc201740
-SHA256 (2.8.5rel.2.patch.gz) = 2b930b8ca4fb360056debf3177a022a3ec943227c7b50fdb18a42375c2683fec
-SIZE (2.8.5rel.2.patch.gz) = 2445
-MD5 (2.8.5rel.3.patch.gz) = 23fb5d3b3e052fd380ae1a694afc06eb
-SHA256 (2.8.5rel.3.patch.gz) = 9f1623d6d6a0f030ed08e081894da709d97798d830a58f507f6f2117d6b5ea0c
-SIZE (2.8.5rel.3.patch.gz) = 4376
-MD5 (2.8.5rel.4.patch.gz) = 8407996c12e28c43cfe39b5724436789
-SHA256 (2.8.5rel.4.patch.gz) = 3acdf9b480b1eb4a9638b51863b7b1e839ca72a604d600e5f25544e99fd1974a
-SIZE (2.8.5rel.4.patch.gz) = 2543
+MD5 (lynx2.8.6rel.4.tar.bz2) = dc80497b7dda6a28fd80404684d27548
+SHA256 (lynx2.8.6rel.4.tar.bz2) = c7d876d52d08e4e593e8f3a04ba6d6c86685570828d1b7a16723702c7643c2a3
+SIZE (lynx2.8.6rel.4.tar.bz2) = 2291156
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index b91c64f0090a..af908632ba11 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,43 +1,35 @@
-===================================================================
-RCS file: makefile.in,v
-retrieving revision 1.1
-diff -u -r1.1 makefile.in
---- makefile.in	2004/02/11 01:50:15	1.1
-+++ makefile.in	2004/02/11 01:53:41
-@@ -362,22 +362,18 @@
- 		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 ; \
--	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
+--- makefile.in.orig	Mon Sep  4 07:25:39 2006
++++ makefile.in	Fri Apr 13 16:35:28 2007
+@@ -366,7 +366,9 @@
+ 	else \
+ 		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
+ 	fi'
+-	@echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files
++	@echo Updating $(srcdir)/lynx.cfg.default
++	@cp $(srcdir)/lynx.cfg $(srcdir)/lynx.tmp
++	@echo Updating $(srcdir)/lynx.cfg.default to point to installed help-files
  	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
  		-e '/^#HELPFILE:file/s!#!!' \
- 		-e '/^HELPFILE:file/s!/PATH_TO/lynx_help!$(helpdir)!' \
- 		-e '/^[A-Z_]*:/s!/PATH_TO/lynx_doc!$(docdir)!' \
- 		-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
+ 		$(SYSCONFDIR)/lynx.tmp | \
+@@ -374,9 +376,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.tmp >$(LIBDIR)/lynx.cfg
--	chmod 644 $(LIBDIR)/lynx.cfg
-+		$(LIBDIR)/lynx.tmp >$(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 $@
-@@ -399,7 +395,7 @@
- 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(srcdir)/cfg_defs.sh $(srcdir)'
+@@ -398,7 +401,7 @@
+ 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
  
- install-cfg : $(LIBDIR)
--	@$(SHELL) -c '$(srcdir)/scripts/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg'
-+	@$(SHELL) -c '$(srcdir)/scripts/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/files/patch-src__HTInit.c b/www/lynx/files/patch-src__HTInit.c
deleted file mode 100644
index e9f112dbb12d..000000000000
--- a/www/lynx/files/patch-src__HTInit.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/HTInit.c.orig	Thu Jan  8 00:03:09 2004
-+++ src/HTInit.c	Tue Nov  8 17:55:15 2005
-@@ -149,6 +149,11 @@
-  HTSetConversion("text/html", "text/plain",  HTMLToPlain,    0.5, 0.0, 0.0, 0);
-  HTSetConversion("text/html", "www/present", HTMLPresent,    1.0, 0.0, 0.0, 0);
- 
-+ HTSetConversion("application/xhtml+xml", "www/source",  HTPlainPresent, 1.0, 0.0, 0.0, 0);
-+ HTSetConversion("application/xhtml+xml", "text/x-c",    HTMLToC,        0.5, 0.0, 0.0, 0);
-+ HTSetConversion("application/xhtml+xml", "text/plain",  HTMLToPlain,    0.5, 0.0, 0.0, 0);
-+ HTSetConversion("application/xhtml+xml", "www/present", HTMLPresent,    1.0, 0.0, 0.0, 0);
-+
-  /*
-   *  These should override the default types as necessary.
-   */
-@@ -1021,6 +1026,8 @@
-     HTSetSuffix(".htmlx",	"text/html", "8bit", 1.0);
-     HTSetSuffix(".htm",		"text/html", "8bit", 1.0);
-     HTSetSuffix(".html",	"text/html", "8bit", 1.0);
-+    HTSetSuffix(".xht",		"application/xhtml+xml", "8bit", 1.0);
-+    HTSetSuffix(".xhtml",	"application/xhtml+xml", "8bit", 1.0);
- 
-     } else { /* LYSuffixRules */
-     /*
-@@ -1044,6 +1051,8 @@
-      */
-     HTSetSuffix(".htm",		"text/html", "8bit", 1.0);
-     HTSetSuffix(".html",	"text/html", "8bit", 1.0);
-+    HTSetSuffix(".xht",		"application/xhtml+xml", "8bit", 1.0);
-+    HTSetSuffix(".xhtml",	"application/xhtml+xml", "8bit", 1.0);
- #endif /* BUILTIN_SUFFIX_MAPS */
- 
- 
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index 811a5a5a6583..8688fc978519 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -5,9 +5,13 @@ etc/lynx.cfg.default
 @exec mkdir -p %D/share/lynx_help
 %%DOCSDIR%%/CHANGES
 %%DOCSDIR%%/COPYHEADER
+%%DOCSDIR%%/COPYHEADER.asc
 @exec ln -sf %D/%F %D/share/lynx_help
+@unexec rm -f %D/share/lynx_help/COPYHEADER.asc
 %%DOCSDIR%%/COPYING
+%%DOCSDIR%%/COPYING.asc
 @exec ln -sf %D/%F %D/share/lynx_help
+@unexec rm -f %D/share/lynx_help/COPYING.asc
 %%DOCSDIR%%/PROBLEMS
 %%DOCSDIR%%/README
 %%DOCSDIR%%/docs/CHANGES2.3
@@ -16,7 +20,6 @@ etc/lynx.cfg.default
 %%DOCSDIR%%/docs/CHANGES2.6
 %%DOCSDIR%%/docs/CHANGES2.7
 %%DOCSDIR%%/docs/CHANGES2.8
-%%DOCSDIR%%/docs/CMU.announce
 %%DOCSDIR%%/docs/CRAWL.announce
 %%DOCSDIR%%/docs/FM.announce
 %%DOCSDIR%%/docs/IBMPC-charsets.announce
@@ -25,6 +28,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
@@ -50,19 +54,23 @@ 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
 %%DOCSDIR%%/test/TestComment.html
 %%DOCSDIR%%/test/c1.html
-%%DOCSDIR%%/test/iso8859-1.html
-%%DOCSDIR%%/test/iso88592.html
+%%DOCSDIR%%/test/iso-8859-1.html
+%%DOCSDIR%%/test/iso-8859-2.html
 %%DOCSDIR%%/test/koi8-r.html
 %%DOCSDIR%%/test/quickbrown.html
 %%DOCSDIR%%/test/raw8bit.html
 %%DOCSDIR%%/test/sgml.html
 %%DOCSDIR%%/test/spaces.html
+%%DOCSDIR%%/test/special_urls.html
+%%DOCSDIR%%/test/tags.html
 %%DOCSDIR%%/test/tabtest.html
+%%DOCSDIR%%/test/test-styles.html
 %%DOCSDIR%%/test/unicode.html
 %%DOCSDIR%%/test/utf-8-demo.html
 share/lynx_help/COPYHEADER