5 files changed, 28 insertions, 15 deletions

diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index c787b9c3b392..7842d543c4bb 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	2.8.3.1
+PORTVERSION=	2.8.4.1
 CATEGORIES=	www
 MASTER_SITES=	http://lynx.isc.org/current/
-DISTNAME=	${PORTNAME}2.8.3rel.1
+DISTNAME=	${PORTNAME}2.8.4rel.1
 
 MAINTAINER=	jseger@FreeBSD.org
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/lynx2-8-3
+WRKSRC=		${WRKDIR}/${PORTNAME}2-8-4
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-persistent-cookies
-MAKE_FLAGS=	helpdir=${L_HELP} docdir=${L_DOC} -f
+MAKE_ARGS=	helpdir=${L_HELP} docdir=${L_DOC}
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-full
 MAN1=		lynx.1
diff --git a/www/lynx/distinfo b/www/lynx/distinfo
index 0e1cb37b674b..d6e78dcabb0a 100644
--- a/www/lynx/distinfo
+++ b/www/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.3rel.1.tar.bz2) = 162c7479203d97758d3cb07f385062ac
+MD5 (lynx2.8.4rel.1.tar.bz2) = 6916c0127839f1e454052b683e4691c4
diff --git a/www/lynx/files/patch-aa b/www/lynx/files/patch-aa
index 5dce08c1160e..270ee222a0ca 100644
--- a/www/lynx/files/patch-aa
+++ b/www/lynx/files/patch-aa
@@ -1,6 +1,6 @@
---- makefile.in.orig	Sat Apr  1 04:33:40 2000
-+++ makefile.in	Sun Apr 16 06:57:08 2000
-@@ -379,22 +379,19 @@
+--- makefile.in.orig	Tue Feb 13 04:33:21 2001
++++ makefile.in	Sat Mar  3 05:21:01 2001
+@@ -387,22 +387,19 @@
  		fi ; \
  		)'
  	@-rm -f $(HELPDIR)/help_files.sed
@@ -14,12 +14,12 @@
 +	@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)@' \
+ 	@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
@@ -29,7 +29,7 @@
  
  LYHelp.h : help_files.sed LYHelp.hin
  	@echo Creating $@
-@@ -416,8 +413,7 @@
+@@ -424,8 +421,7 @@
  	$(SHELL) -c '$(srcdir)/cfg_defs.sh $(srcdir)'
  
  install-cfg : $(LIBDIR)
diff --git a/www/lynx/files/patch-ab b/www/lynx/files/patch-ab
new file mode 100644
index 000000000000..936670b8ea72
--- /dev/null
+++ b/www/lynx/files/patch-ab
@@ -0,0 +1,11 @@
+--- userdefs.h.bak	Fri Jun 23 19:15:08 2000
++++ userdefs.h	Mon Jan 15 22:30:35 2001
+@@ -361,7 +361,7 @@
+  * not necessarily try a different filename when they are called, making it
+  * impossible to rename the file.  Others make world-writable files.
+  */
+-/*#define USE_MKSTEMP */
++#define USE_MKSTEMP
+ 
+ /********************************
+  * Comment this line out to let the user enter his/her email address
diff --git a/www/lynx/pkg-plist b/www/lynx/pkg-plist
index 2ecc8bb601d5..c70849e0febb 100644
--- a/www/lynx/pkg-plist
+++ b/www/lynx/pkg-plist
@@ -11,6 +11,7 @@ share/doc/lynx/COPYING
 share/doc/lynx/PROBLEMS
 share/doc/lynx/README
 share/doc/lynx/samples/blue-background.lss
+share/doc/lynx/samples/bright-blue.lss
 share/doc/lynx/samples/cernrules.txt
 share/doc/lynx/samples/installdirs.html
 share/doc/lynx/samples/jumpsUnix.html
@@ -19,6 +20,7 @@ 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/mailto-form.pl
 share/doc/lynx/samples/mild-colors.lss
 share/doc/lynx/samples/mime.types
 share/doc/lynx/test/ALT88592.html