3 files changed, 137 insertions, 133 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 8a94f282d078..fd9b1dad7ebe 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.7.1
-PORTREVISION=	1
+PORTVERSION=	2.8.7.2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://lynx.isc.org/lynx${PORTVERSION}/patches/:patches
+MASTER_SITES=	http://lynx.isc.org/current/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}rel.${PORTVERSION:E}
 
 MAINTAINER=	jharris@widomaker.com
@@ -60,22 +59,32 @@ CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 CONFIGURE_ARGS+=--enable-default-colors
 .endif
 
+.if defined(NOPORTDOCS)
+CONFIGURE_ARGS+=--disable-local-docs
+INSTALL_TARGET=	install
+DOCSDIR=
+L_HELP=
+.else
+INSTALL_TARGET=	install-full
+L_HELP=		${PREFIX}/share/lynx_help
 MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
+.endif
+
 MAKEFILE=	makefile
-INSTALL_TARGET=	install-full
 MAN1=		lynx.1
 
 L_LIB=		${PREFIX}/etc
-L_HELP=		${PREFIX}/share/lynx_help
 
 SUB_FILES=	pkg-message
 
-post-patch:
-	@${RM} -f ${WRKSRC}/CHANGES.orig
-
 post-install:
+.if defined(NOPORTDOCS)
+	[ -f ${L_LIB}/lynx.cfg ] || ${INSTALL} ${L_LIB}/lynx.cfg.sample ${L_LIB}/lynx.cfg
+	[ -f ${L_LIB}/lynx.lss ] || ${INSTALL} ${L_LIB}/lynx.lss.sample ${L_LIB}/lynx.lss
+.else
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
+.endif
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
 
 .include <bsd.port.post.mk>
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 6a579f83c46b..69092301c782 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
-SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045
+SHA256 (lynx2.8.7rel.2.tar.bz2) = 301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
+SIZE (lynx2.8.7rel.2.tar.bz2) = 2436801
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index 00797b2f55d9..1c1a71fa6bf6 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -5,129 +5,124 @@ etc/lynx.cfg.sample
 @unexec if cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.sample; then rm -f %D/etc/lynx.lss; fi
 etc/lynx.lss.sample
 @exec if [ ! -f %B/lynx.lss ]; then cp -p %D/%F %B/lynx.lss; fi
-@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.gz
-%%DOCSDIR%%/docs/CHANGES2.4.gz
-%%DOCSDIR%%/docs/CHANGES2.5.gz
-%%DOCSDIR%%/docs/CHANGES2.6.gz
-%%DOCSDIR%%/docs/CHANGES2.7.gz
-%%DOCSDIR%%/docs/CHANGES2.8.gz
-%%DOCSDIR%%/docs/CRAWL.announce.gz
-%%DOCSDIR%%/docs/FM.announce.gz
-%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz
-%%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
-%%DOCSDIR%%/docs/SOCKETSHR.announce.gz
-%%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
-%%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
-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
-share/lynx_help/keystrokes/cookie_help.html.gz
-share/lynx_help/keystrokes/dired_help.html.gz
-share/lynx_help/keystrokes/edit_help.html.gz
-share/lynx_help/keystrokes/environments.html.gz
-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
-share/lynx_help/keystrokes/other_help.html.gz
-share/lynx_help/keystrokes/print_help.html.gz
-share/lynx_help/keystrokes/scrolling_help.html.gz
-share/lynx_help/keystrokes/test_display.html.gz
-share/lynx_help/keystrokes/visited_help.html.gz
-share/lynx_help/keystrokes/xterm_help.html.gz
-share/lynx_help/lynx-dev.html.gz
-share/lynx_help/lynx_help_main.html.gz
-share/lynx_help/lynx_url_support.html.gz
-@dirrm %%DOCSDIR%%/docs
-@dirrm %%DOCSDIR%%/samples
-@dirrm %%DOCSDIR%%/test
-@dirrm %%DOCSDIR%%
-@dirrm share/lynx_help/keystrokes
-@dirrm share/lynx_help
+@exec mkdir -p %D/%%PORTDOCS%%/share/lynx_help
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYHEADER
+%%PORTDOCS%%%%DOCSDIR%%/COPYHEADER.asc
+@exec ln -sf %D/%F %D/%%PORTDOCS%%/share/lynx_help
+@unexec rm -f %D/%%PORTDOCS%%/share/lynx_help/COPYHEADER.asc
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%PORTDOCS%%%%DOCSDIR%%/COPYING.asc
+@exec ln -sf %D/%F %D/%%PORTDOCS%%/share/lynx_help
+@unexec rm -f %D/%%PORTDOCS%%/share/lynx_help/COPYING.asc
+%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.3.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.4.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.6.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CHANGES2.8.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/CRAWL.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/FM.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/IBMPC-charsets.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.cookies
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.defines
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.options
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
+%%PORTDOCS%%%%DOCSDIR%%/docs/SOCKETSHR.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
+%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
+%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
+%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce.gz
+%%PORTDOCS%%%%DOCSDIR%%/samples/blue-background.lss
+%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
+%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
+%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
+%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
+%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
+%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
+%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsVMS.html
+%%PORTDOCS%%%%DOCSDIR%%/samples/keepviewer
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx-demo.cfg
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.ico
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss
+%%PORTDOCS%%%%DOCSDIR%%/samples/mailcap
+%%PORTDOCS%%%%DOCSDIR%%/samples/mailto-form.pl
+%%PORTDOCS%%%%DOCSDIR%%/samples/midnight.lss
+%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
+%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
+%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
+%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
+%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
+%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
+%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
+%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
+%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
+%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
+%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
+%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
+%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
+%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
+%%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
+%%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
+%%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
+%%PORTDOCS%%%%DOCSDIR%%/test/tags.html
+%%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
+%%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
+%%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
+%%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
+%%PORTDOCS%%share/lynx_help/COPYHEADER
+%%PORTDOCS%%share/lynx_help/COPYING
+%%PORTDOCS%%share/lynx_help/Lynx_users_guide.html.gz
+%%PORTDOCS%%share/lynx_help/about_lynx.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/alt_edit_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/bashlike_edit_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/bookmark_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/cookie_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/dired_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/edit_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/environments.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/follow_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/gopher_types_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/history_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/keystroke_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/movement_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/option_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/other_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/print_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/scrolling_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/test_display.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/visited_help.html.gz
+%%PORTDOCS%%share/lynx_help/keystrokes/xterm_help.html.gz
+%%PORTDOCS%%share/lynx_help/lynx-dev.html.gz
+%%PORTDOCS%%share/lynx_help/lynx_help_main.html.gz
+%%PORTDOCS%%share/lynx_help/lynx_url_support.html.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/test
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm share/lynx_help/keystrokes
+%%PORTDOCS%%@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