Index: www/lynx/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.6.5
-PORTREVISION=	5
+PORTVERSION=	2.8.7.1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	http://lynx.isc.org/current/ \
-		ftp://lynx.isc.org/lynx${PORTVERSION}/patches/:patches
+MASTER_SITES=	ftp://lynx.isc.org/lynx${PORTVERSION}/patches/:patches
 DISTNAME=	${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E}
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	A non-graphical, text-based World-Wide Web client
 
-CONFLICTS=	lynx-2.8.[7-9]*
+CONFLICTS=	lynx-2.8.[8-9]*
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}2-8-6
+WRKSRC=		${WRKDIR}/${PORTNAME}2-8-7
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies \
@@ -62,7 +60,7 @@
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
 
-.if defined(WITH_DEFAULT_COLORS) || defined(ENABLE_DEFAULT_COLORS)
+.if defined(WITH_DEFAULT_COLORS)
 CONFIGURE_ARGS+=--enable-default-colors
 .endif
 
Index: www/lynx/distinfo
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.6rel.5.tar.bz2) = bd44c57d28fd3e4c9db1cd492d403600
-SHA256 (lynx2.8.6rel.5.tar.bz2) = dc98c1725cc8c081bddc4ae7a6f065ce9bce5a017d626f62fc0c061ec0eb764d
-SIZE (lynx2.8.6rel.5.tar.bz2) = 2290787
+MD5 (lynx2.8.7rel.1.tar.bz2) = 493af4c77ef6761e3f0157cd1be033a0
+SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
+SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045
Index: www/lynx/files/patch-aa
@@ -1,50 +0,0 @@
---- makefile.in.orig	Mon Sep  4 01:25:39 2006
-+++ makefile.in	Tue Jul 31 10:37:26 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.sample
-+	@cp $(srcdir)/lynx.cfg $(srcdir)/lynx.tmp
-+	@echo Updating $(srcdir)/lynx.cfg.sample to point to installed help-files
- 	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
- 		-e '/^#HELPFILE:file/s!#!!' \
- 		$(SYSCONFDIR)/lynx.tmp | \
-@@ -374,9 +376,11 @@
- 	$(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)!' \
--		>$(SYSCONFDIR)/lynx.cfg
--	chmod 644 $(SYSCONFDIR)/lynx.cfg
-+		>$(SYSCONFDIR)/lynx.cfg.sample
-+	chmod 644 $(SYSCONFDIR)/lynx.cfg.sample
- 	-rm -f $(SYSCONFDIR)/lynx.tmp
-+	-[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.sample $(SYSCONFDIR)/lynx.cfg
-+	-[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.sample $(SYSCONFDIR)/lynx.lss
- 
- LYHelp.h : help_files.sed LYHelp.hin
- 	@echo Creating $@
-@@ -398,18 +402,17 @@
- 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
- 
- 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.sample
- 
- install-lss : $(SYSCONFDIR)
--	-mv -f $(SYSCONFDIR)/lynx.lss $(SYSCONFDIR)/lynx.oldlss
--	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
-+	@$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample
- 
- uninstall ::
- @MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" uninstall
- 	-rm -f $(BINDIR)/lynx$x
- 	-rm -f $(MANDIR)/lynx.1
--	-rm -f $(SYSCONFDIR)/lynx.cfg
--	-rm -f $(SYSCONFDIR)/lynx.lss
-+	-rm -f $(SYSCONFDIR)/lynx.cfg.sample
-+	-rm -f $(SYSCONFDIR)/lynx.lss.sample
- 
- uninstall \
- uninstall-help ::
Index: www/lynx/files/patch-makefile.in
@@ -0,0 +1,48 @@
+Index: makefile.in
+@@ -388,7 +388,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.sample
++	@cp $(srcdir)/lynx.cfg $(srcdir)/lynx.tmp
++	@echo Updating $(srcdir)/lynx.cfg.sample to point to installed help-files
+ 	@ECHO_CC@sed	-e '/^HELPFILE:http/s!^!#!' \
+ 		-e '/^#HELPFILE:file/s!#!!' \
+ 		$(SYSCONFDIR)/lynx.tmp | \
+@@ -396,9 +398,11 @@
+ 	$(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)!' \
+-		>$(SYSCONFDIR)/lynx.cfg
+-	chmod 644 $(SYSCONFDIR)/lynx.cfg
++		>$(SYSCONFDIR)/lynx.cfg.sample
++	chmod 644 $(SYSCONFDIR)/lynx.cfg.sample
+ 	-rm -f $(SYSCONFDIR)/lynx.tmp
++	-[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.sample $(SYSCONFDIR)/lynx.cfg
++	-[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.sample $(SYSCONFDIR)/lynx.lss
+ 
+ LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
+ 	@echo Creating $@
+@@ -420,17 +424,17 @@
+ 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
+ 
+ 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.sample
+ 
+ install-lss : $(SYSCONFDIR)
+-	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
++	@$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.sample
+ 
+ uninstall ::
+ @MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) uninstall
+ 	-rm -f $(BINDIR)/lynx$x
+ 	-rm -f $(MANDIR)/lynx.1
+-	-rm -f $(SYSCONFDIR)/lynx.cfg
+-	-rm -f $(SYSCONFDIR)/lynx.lss
++	-rm -f $(SYSCONFDIR)/lynx.cfg.sample
++	-rm -f $(SYSCONFDIR)/lynx.lss.sample
+ 
+ uninstall \
+ uninstall-help ::
Index: www/lynx/pkg-descr
@@ -2,4 +2,4 @@
 and other information servers.  It uses only ascii representation so
 that it can be used from ascii-terminals and dial-in lines.
 
-WWW: http://lynx.isc.org/current/
+WWW: http://lynx.isc.org/
Index: www/lynx/pkg-plist
@@ -29,9 +29,11 @@
 %%DOCSDIR%%/docs/OS-390.announce.gz
 %%DOCSDIR%%/docs/README.TRST
 %%DOCSDIR%%/docs/README.chartrans
+%%DOCSDIR%%/docs/README.cookies
 %%DOCSDIR%%/docs/README.defines
 %%DOCSDIR%%/docs/README.jp
 %%DOCSDIR%%/docs/README.metrics
+%%DOCSDIR%%/docs/README.options
 %%DOCSDIR%%/docs/README.rootcerts
 %%DOCSDIR%%/docs/README.ssl
 %%DOCSDIR%%/docs/README.sslcerts
@@ -39,32 +41,48 @@
 %%DOCSDIR%%/docs/TCPWARE.announce.gz
 %%DOCSDIR%%/docs/VMSWAIS.announce.gz
 %%DOCSDIR%%/docs/djgpp.key
+%%DOCSDIR%%/docs/index.html
 %%DOCSDIR%%/docs/pdcurses.key
 %%DOCSDIR%%/docs/slang.key
 %%DOCSDIR%%/docs/win-386.announce.gz
 %%DOCSDIR%%/samples/blue-background.lss
 %%DOCSDIR%%/samples/bright-blue.lss
 %%DOCSDIR%%/samples/cernrules.txt
+%%DOCSDIR%%/samples/home.htm
+%%DOCSDIR%%/samples/index.html
 %%DOCSDIR%%/samples/installdirs.html
+%%DOCSDIR%%/samples/jumps.htm
 %%DOCSDIR%%/samples/jumpsUnix.html
 %%DOCSDIR%%/samples/jumpsVMS.html
 %%DOCSDIR%%/samples/keepviewer
 %%DOCSDIR%%/samples/lynxdump
+%%DOCSDIR%%/samples/lynx-demo.cfg
 %%DOCSDIR%%/samples/lynx-keymaps
+%%DOCSDIR%%/samples/lynx.bat
+%%DOCSDIR%%/samples/lynx_bookmarks.htm
 %%DOCSDIR%%/samples/lynx.com
+%%DOCSDIR%%/samples/lynx.ico
 %%DOCSDIR%%/samples/lynx.lss
 %%DOCSDIR%%/samples/mailcap
 %%DOCSDIR%%/samples/mailto-form.pl
+%%DOCSDIR%%/samples/midnight.lss
 %%DOCSDIR%%/samples/mild-colors.lss
 %%DOCSDIR%%/samples/mime.types
 %%DOCSDIR%%/samples/oldlynx
+%%DOCSDIR%%/samples/opaque.lss
 %%DOCSDIR%%/test/ALT88592.html
 %%DOCSDIR%%/test/ISO_LATIN1_test.html
 %%DOCSDIR%%/test/README.txt
 %%DOCSDIR%%/test/TestComment.html
+%%DOCSDIR%%/test/bad-html.html
 %%DOCSDIR%%/test/c1.html
+%%DOCSDIR%%/test/cp-1252.html
+%%DOCSDIR%%/test/cp-1252a.html
+%%DOCSDIR%%/test/index.html
 %%DOCSDIR%%/test/iso-8859-1.html
+%%DOCSDIR%%/test/iso-8859-1a.html
 %%DOCSDIR%%/test/iso-8859-2.html
+%%DOCSDIR%%/test/iso-8859-2a.html
 %%DOCSDIR%%/test/koi8-r.html
 %%DOCSDIR%%/test/quickbrown.html
 %%DOCSDIR%%/test/raw8bit.html
@@ -80,6 +98,7 @@
 share/lynx_help/COPYING
 share/lynx_help/Lynx_users_guide.html.gz
 share/lynx_help/about_lynx.html.gz
+share/lynx_help/index.html.gz
 share/lynx_help/keystrokes/alt_edit_help.html.gz
 share/lynx_help/keystrokes/bashlike_edit_help.html.gz
 share/lynx_help/keystrokes/bookmark_help.html.gz
@@ -90,6 +109,7 @@
 share/lynx_help/keystrokes/follow_help.html.gz
 share/lynx_help/keystrokes/gopher_types_help.html.gz
 share/lynx_help/keystrokes/history_help.html.gz
+share/lynx_help/keystrokes/index.html.gz
 share/lynx_help/keystrokes/keystroke_help.html.gz
 share/lynx_help/keystrokes/movement_help.html.gz
 share/lynx_help/keystrokes/option_help.html.gz
@@ -110,9 +130,12 @@
 @dirrm share/lynx_help
 %%NLS%%share/locale/da/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/de/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/en/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/et/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/lynx.mo
+%%NLS%%share/locale/id/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/it/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/lynx.mo
@@ -125,7 +148,6 @@
 %%NLS%%share/locale/cs/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/lynx.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/lynx.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/lynx.mo
 %%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES