5 files changed, 54 insertions, 57 deletions

diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 1180b40260b9..a881138387c9 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -11,11 +11,16 @@ CATEGORIES=	japanese www
 MASTER_SITES=   http://lynx.isc.org/current/
 DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
+PATCHFILES=	${PORTNAME}${VERSION}${MINOR_VERSION}a.patch.gz \
+		${PORTNAME}${VERSION}${MINOR_VERSION}b.patch.gz
+
+PATCH_SITES=	http://lynx.isc.org/current/
+
 MAINTAINER=	shige@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
 
-VERSION=	2.8.3
+VERSION=	2.8.4
 MINOR_VERSION=	rel.1
 
 USE_BZIP2?=	YES
diff --git a/japanese/lynx/distinfo b/japanese/lynx/distinfo
index 0e1cb37b674b..103534c9f529 100644
--- a/japanese/lynx/distinfo
+++ b/japanese/lynx/distinfo
@@ -1 +1,3 @@
-MD5 (lynx2.8.3rel.1.tar.bz2) = 162c7479203d97758d3cb07f385062ac
+MD5 (lynx2.8.4rel.1.tar.bz2) = 6916c0127839f1e454052b683e4691c4
+MD5 (lynx2.8.4rel.1a.patch.gz) = 84a00365afe757edabdb55cb6d73e10d
+MD5 (lynx2.8.4rel.1b.patch.gz) = 34e2c40e93c412e792a7989f30619662
diff --git a/japanese/lynx/files/patch-ab b/japanese/lynx/files/patch-ab
new file mode 100644
index 000000000000..936670b8ea72
--- /dev/null
+++ b/japanese/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/japanese/lynx/files/patch-ai b/japanese/lynx/files/patch-ai
deleted file mode 100644
index 28a1ef640f21..000000000000
--- a/japanese/lynx/files/patch-ai
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/LYCurses.c.orig	Wed Nov 11 11:11:52 1998
-+++ src/LYCurses.c	Wed Nov 11 11:10:32 1998
-@@ -1679,6 +1679,13 @@
- 
- PUBLIC void lynx_force_repaint NOARGS
- {
-+/* 
-+ * This code is harmful to display bold links.
-+ * Already set COLOR attributes?
-+ * Therefore we do not need this code.
-+ *   --- by shige@FreeBSD.org
-+ */
-+#if 0  /* do not need */
- #if defined(COLOR_CURSES)
-     chtype a;
- #ifndef USE_COLOR_STYLE
-@@ -1693,6 +1700,7 @@
- #endif
-     attrset(a);
- #endif /* COLOR_CURSES */
-+#endif /* do not need */
-     clearok(curscr, TRUE);
- }
- 
diff --git a/japanese/lynx/pkg-plist b/japanese/lynx/pkg-plist
index ece697b80bde..e853bd976a6c 100644
--- a/japanese/lynx/pkg-plist
+++ b/japanese/lynx/pkg-plist
@@ -30,36 +30,39 @@ etc/lynx.cfg.sample
 %%HELPDIR%%/lynx-dev.html%%HELPFILE_SUFFIX%%
 %%HELPDIR%%/lynx_help_main.html%%HELPFILE_SUFFIX%%
 %%HELPDIR%%/lynx_url_support.html%%HELPFILE_SUFFIX%%
-%%DOCDIR%%/CHANGES
-%%DOCDIR%%/COPYHEADER
-%%DOCDIR%%/COPYING
-%%DOCDIR%%/PROBLEMS
-%%DOCDIR%%/README
-%%DOCDIR%%/samples/blue-background.lss
-%%DOCDIR%%/samples/cernrules.txt
-%%DOCDIR%%/samples/installdirs.html
-%%DOCDIR%%/samples/jumpsUnix.html
-%%DOCDIR%%/samples/jumpsVMS.html
-%%DOCDIR%%/samples/lynx-keymaps
-%%DOCDIR%%/samples/lynx.com
-%%DOCDIR%%/samples/lynx.lss
-%%DOCDIR%%/samples/mailcap
-%%DOCDIR%%/samples/mild-colors.lss
-%%DOCDIR%%/samples/mime.types
-%%DOCDIR%%/test/ALT88592.html
-%%DOCDIR%%/test/ISO_LATIN1_test.html
-%%DOCDIR%%/test/README.txt
-%%DOCDIR%%/test/TestComment.html
-%%DOCDIR%%/test/c1.html
-%%DOCDIR%%/test/iso8859-1.html
-%%DOCDIR%%/test/iso88592.html
-%%DOCDIR%%/test/raw8bit.html
-%%DOCDIR%%/test/sgml.html
-%%DOCDIR%%/test/spaces.html
-%%DOCDIR%%/test/tabtest.html
-%%DOCDIR%%/test/unicode.html
-@dirrm %%DOCDIR%%/test
-@dirrm %%DOCDIR%%/samples
-@dirrm %%DOCDIR%%
+%%PORTDOCS%%%%DOCDIR%%/CHANGES
+%%PORTDOCS%%%%DOCDIR%%/CHANGES.orig
+%%PORTDOCS%%%%DOCDIR%%/COPYHEADER
+%%PORTDOCS%%%%DOCDIR%%/COPYING
+%%PORTDOCS%%%%DOCDIR%%/PROBLEMS
+%%PORTDOCS%%%%DOCDIR%%/README
+%%PORTDOCS%%%%DOCDIR%%/samples/blue-background.lss
+%%PORTDOCS%%%%DOCDIR%%/samples/bright-blue.lss
+%%PORTDOCS%%%%DOCDIR%%/samples/cernrules.txt
+%%PORTDOCS%%%%DOCDIR%%/samples/installdirs.html
+%%PORTDOCS%%%%DOCDIR%%/samples/jumpsUnix.html
+%%PORTDOCS%%%%DOCDIR%%/samples/jumpsVMS.html
+%%PORTDOCS%%%%DOCDIR%%/samples/lynx-keymaps
+%%PORTDOCS%%%%DOCDIR%%/samples/lynx.com
+%%PORTDOCS%%%%DOCDIR%%/samples/lynx.lss
+%%PORTDOCS%%%%DOCDIR%%/samples/mailcap
+%%PORTDOCS%%%%DOCDIR%%/samples/mailto-form.pl
+%%PORTDOCS%%%%DOCDIR%%/samples/mild-colors.lss
+%%PORTDOCS%%%%DOCDIR%%/samples/mime.types
+%%PORTDOCS%%%%DOCDIR%%/test/ALT88592.html
+%%PORTDOCS%%%%DOCDIR%%/test/ISO_LATIN1_test.html
+%%PORTDOCS%%%%DOCDIR%%/test/README.txt
+%%PORTDOCS%%%%DOCDIR%%/test/TestComment.html
+%%PORTDOCS%%%%DOCDIR%%/test/c1.html
+%%PORTDOCS%%%%DOCDIR%%/test/iso8859-1.html
+%%PORTDOCS%%%%DOCDIR%%/test/iso88592.html
+%%PORTDOCS%%%%DOCDIR%%/test/raw8bit.html
+%%PORTDOCS%%%%DOCDIR%%/test/sgml.html
+%%PORTDOCS%%%%DOCDIR%%/test/spaces.html
+%%PORTDOCS%%%%DOCDIR%%/test/tabtest.html
+%%PORTDOCS%%%%DOCDIR%%/test/unicode.html
+%%PORTDOCS%%@dirrm %%DOCDIR%%/test
+%%PORTDOCS%%@dirrm %%DOCDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCDIR%%
 @dirrm %%HELPDIR%%/keystrokes
 @dirrm %%HELPDIR%%