5 files changed, 83 insertions, 20 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 49a866d37933..33615033fa32 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -5,30 +5,33 @@
 # $FreeBSD$
 #
 
+# NOTE: This port is tracking lynx-current until 2.8.3 is released.  Anything
+#       before 2.8.3pre.2 has unacceptable security holes.
+
 PORTNAME=	lynx
-PORTVERSION= 	2.8.2rel.1
+PORTVERSION=    2.8.3pre.5
 CATEGORIES=	www
-MASTER_SITES=   http://sol.slcc.edu/lynx/current/
+MASTER_SITES=   http://lynx.isc.org/current/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	jseger@FreeBSD.org
 
-FORBIDDEN=	"Riddled with buffer overflows exploitable by a malicious server to execute code as the local user."
-
 USE_BZIP2=      YES
-WRKSRC=         ${WRKDIR}/lynx2-8-2
+WRKSRC=         ${WRKDIR}/lynx2-8-3
 GNU_CONFIGURE=  YES
 CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies
-MAKE_FLAGS=     helpdir=${L_HELP} -f
+MAKE_FLAGS=     helpdir=${L_HELP} docdir=${L_DOC} -f
 MAKEFILE=       makefile
-INSTALL_TARGET= install install-help
+INSTALL_TARGET= install-full
 MAN1=		lynx.1
 
 L_LIB=          ${PREFIX}/etc
+L_DOC=          ${PREFIX}/share/doc/lynx
 L_HELP=         ${PREFIX}/share/lynx_help
 
 post-install:
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_DOC}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
 	${CHOWN} ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
 
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 569440e255a2..2791069ed910 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.2rel.1.tar.bz2) = 73b27bfad2c37523c7b648b3a7135cfd
+MD5 (lynx2.8.3pre.5.tar.bz2) = 07ab759900ff18482fd55b261271e4c0
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 6d54024372fb..5dce08c1160e 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,13 +1,41 @@
---- makefile.in.orig	Tue May 25 21:13:02 1999
-+++ makefile.in	Tue May 25 23:27:44 1999
-@@ -407,8 +407,8 @@
- 	PATH=$(srcdir):$$PATH; export PATH; $(SHELL) -c '$(srcdir)/cfg_defs.sh'
+--- makefile.in.orig	Sat Apr  1 04:33:40 2000
++++ makefile.in	Sun Apr 16 06:57:08 2000
+@@ -379,22 +379,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 ; \
+-	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@#@@' \
+ 		-e '/^HELPFILE:file/s@/PATH_TO/lynx_help@$(helpdir)@' \
+ 		-e '/^[A-Z_]*:/s@/PATH_TO/lynx_doc@$(docdir)@' \
+ 		-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
++	chmod 644 $(LIBDIR)/lynx.cfg.default
+ 	-rm -f $(LIBDIR)/lynx.tmp
++	-[ ! -f $(LIBDIR)/lynx.cfg ] && $(INSTALL_DATA) $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.cfg
+ 
+ LYHelp.h : help_files.sed LYHelp.hin
+ 	@echo Creating $@
+@@ -416,8 +413,7 @@
+ 	$(SHELL) -c '$(srcdir)/cfg_defs.sh $(srcdir)'
  
  install-cfg : $(LIBDIR)
 -	-mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg
 -	$(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg
 +	$(INSTALL_DATA) $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg.default
-+	-[ ! -f $(libdir)/lynx.cfg ] && $(INSTALL_DATA) $(srcdir)/lynx.cfg $(libdir)/lynx.cfg
  
  install-lss : $(LIBDIR)
  	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
diff --git a/www/lynx/pkg-descr b/www/lynx/pkg-descr
index 91091ea03e18..43da40068d05 100644
--- a/www/lynx/pkg-descr
+++ b/www/lynx/pkg-descr
@@ -1,5 +1,5 @@
-lynx is a program that allows a user to access World-Wide Web servers
+lynx is a program which allows a user to access World-Wide Web servers
 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.browser.org/
+WWW: http://lynx.isc.org/current/
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index fd7e72559e28..a99b77cf34c6 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -1,9 +1,43 @@
 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
+share/doc/lynx/samples/cernrules.txt
+share/doc/lynx/samples/installdirs.html
+share/doc/lynx/samples/jumpsUnix.html
+share/doc/lynx/samples/jumpsVMS.html
+share/doc/lynx/samples/lynx-keymaps
+share/doc/lynx/samples/lynx.com
+share/doc/lynx/samples/lynx.lss
+share/doc/lynx/samples/mailcap
+share/doc/lynx/samples/mild-colors.lss
+share/doc/lynx/samples/mime.types
+share/doc/lynx/test/ALT88592.html
+share/doc/lynx/test/ISO_LATIN1_test.html
+share/doc/lynx/test/README.txt
+share/doc/lynx/test/TestComment.html
+share/doc/lynx/test/c1.html
+share/doc/lynx/test/iso8859-1.html
+share/doc/lynx/test/iso88592.html
+share/doc/lynx/test/raw8bit.html
+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
+share/lynx_help/keystrokes/bashlike_edit_help.html
 share/lynx_help/keystrokes/bookmark_help.html
 share/lynx_help/keystrokes/cookie_help.html
 share/lynx_help/keystrokes/dired_help.html
@@ -24,10 +58,8 @@ share/lynx_help/keystrokes/xterm_help.html
 share/lynx_help/lynx-dev.html
 share/lynx_help/lynx_help_main.html
 share/lynx_help/lynx_url_support.html
-share/lynx_help/COPYING
-share/lynx_help/COPYHEADER
-etc/lynx_doc/COPYING
-etc/lynx_doc/COPYHEADER
+@dirrm share/doc/lynx/samples
+@dirrm share/doc/lynx/test
+@dirrm share/doc/lynx
 @dirrm share/lynx_help/keystrokes
 @dirrm share/lynx_help
-@dirrm etc/lynx_doc