4 files changed, 58 insertions, 52 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 8295fa04076c..1fc422357a5d 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,30 +1,34 @@
 # New ports collection makefile for:    lynx
-# Version required:     2.8.1 release 2
+# Version required:     2.8.2 release 1
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.82 1999/04/14 19:35:43 mharo Exp $
+# $Id: Makefile,v 1.83 1999/04/19 19:51:11 jseger Exp $
 #
 
-DISTNAME=       lynx2.8.1rel.2
-PKGNAME=        lynx-2.8.1.2
+DISTNAME=       lynx2.8.2rel.1
+PKGNAME=        lynx-2.8.2rel.1
 CATEGORIES=	www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
 MAINTAINER=	jseger@FreeBSD.ORG
 
+USE_BZIP2=      YES
+NO_LATEST_LINK=	YES
+WRKSRC=         ${WRKDIR}/lynx2-8-2
 GNU_CONFIGURE=  YES
-CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" \
-		--enable-nsl-fork
+CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
+		--enable-nsl-fork --enable-persistent-cookies
+MAKE_FLAGS=     helpdir=${L_HELP} -f
 MAKEFILE=       makefile
 INSTALL_TARGET= install install-help
 MAN1=		lynx.1
 
-WRKSRC=		${WRKDIR}/lynx2-8-1
+L_LIB=          ${PREFIX}/etc
+L_HELP=         ${PREFIX}/share/lynx_help
 
 post-install:
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
-	chown ${SHAREOWN}:${SHAREGRP} ${PREFIX}/etc/lynx.cfg
-	${INSTALL_DATA} ${WRKSRC}/lynx.cfg ${PREFIX}/etc/lynx.cfg.default
+	chown -R ${SHAREOWN}:${SHAREGRP} ${L_HELP}
+	chown ${SHAREOWN}:${SHAREGRP} ${L_LIB}/lynx.cfg
 
 .include <bsd.port.mk>
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index a905480280a2..569440e255a2 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.1rel.2.tar.gz) = 7cf5e545052fb24a9b449d02865c803a
+MD5 (lynx2.8.2rel.1.tar.bz2) = 73b27bfad2c37523c7b648b3a7135cfd
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index d1df17696a47..6d54024372fb 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,19 +1,13 @@
-*** makefile.in.bak	Sun Dec 14 02:30:40 1997
---- makefile.in	Mon Dec 15 17:48:54 1997
-***************
-*** 37,43 ****
-  libdir= @libdir@
-  
-  ## Where you want the help-files installed
-! helpdir= @libdir@/lynx_help
-  
-  installbin= @INSTALL_PROGRAM@ -s -m 755
-  installdoc= @INSTALL_DATA@
---- 37,43 ----
-  libdir= @libdir@
-  
-  ## Where you want the help-files installed
-! helpdir= $(prefix)/lib/lynx_help
-  
-  installbin= @INSTALL_PROGRAM@ -s -m 755
-  installdoc= @INSTALL_DATA@
+--- 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'
+ 
+ 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-plist b/www/lynx/pkg-plist
index caa47443f780..fd7e72559e28 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -1,25 +1,33 @@
 bin/lynx
 etc/lynx.cfg.default
 @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
-lib/lynx_help/Lynx_users_guide.html
-lib/lynx_help/about_lynx.html
-lib/lynx_help/keystrokes/bookmark_help.html
-lib/lynx_help/keystrokes/cookie_help.html
-lib/lynx_help/keystrokes/dired_help.html
-lib/lynx_help/keystrokes/edit_help.html
-lib/lynx_help/keystrokes/follow_help.html
-lib/lynx_help/keystrokes/gopher_types_help.html
-lib/lynx_help/keystrokes/history_help.html
-lib/lynx_help/keystrokes/keystroke_help.html
-lib/lynx_help/keystrokes/movement_help.html
-lib/lynx_help/keystrokes/option_help.html
-lib/lynx_help/keystrokes/other_help.html
-lib/lynx_help/keystrokes/print_help.html
-lib/lynx_help/keystrokes/scrolling_help.html
-lib/lynx_help/keystrokes/visited_help.html
-lib/lynx_help/keystrokes/xterm_help.html
-lib/lynx_help/lynx-dev.html
-lib/lynx_help/lynx_help_main.html
-lib/lynx_help/lynx_url_support.html
-@dirrm lib/lynx_help/keystrokes
-@dirrm lib/lynx_help
+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/bookmark_help.html
+share/lynx_help/keystrokes/cookie_help.html
+share/lynx_help/keystrokes/dired_help.html
+share/lynx_help/keystrokes/edit_help.html
+share/lynx_help/keystrokes/environments.html
+share/lynx_help/keystrokes/follow_help.html
+share/lynx_help/keystrokes/gopher_types_help.html
+share/lynx_help/keystrokes/history_help.html
+share/lynx_help/keystrokes/keystroke_help.html
+share/lynx_help/keystrokes/movement_help.html
+share/lynx_help/keystrokes/option_help.html
+share/lynx_help/keystrokes/other_help.html
+share/lynx_help/keystrokes/print_help.html
+share/lynx_help/keystrokes/scrolling_help.html
+share/lynx_help/keystrokes/test_display.html
+share/lynx_help/keystrokes/visited_help.html
+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/lynx_help/keystrokes
+@dirrm share/lynx_help
+@dirrm etc/lynx_doc