7 files changed, 83 insertions, 67 deletions

diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index c0bdd12f8421..86540607929a 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,19 +1,19 @@
-# New ports collection makefile for:    ja-lynx
-# Version required:     2.8rel.3
-# Date created:         25 April 1998
+# New ports collection makefile for:	ja-lynx
+# Version required:     2.8.1
+# Date created:         10 August 1998
 # Whom:                 Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/08/10 16:03:26 kuriyama Exp $
 #
 
-DISTNAME=       lynx2.8rel.3
-PKGNAME=        ja-lynx-2.8.0.3
+DISTNAME=       lynx2-8-1
+PKGNAME=        ja-lynx-2.8.1
 CATEGORIES=	japanese www
-MASTER_SITES=   ftp://sol.slcc.edu/pub/lynx/current/
+MASTER_SITES=   ftp://sol.slcc.edu/pub/lynx/release2-8-1/
 
 MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
-WRKSRC=         ${WRKDIR}/lynx2-8
+NO_LATEST_LINK=	YES
 GNU_CONFIGURE=  YES
 CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc"
 MAKEFILE=       makefile
@@ -21,6 +21,10 @@ INSTALL_TARGET= install install-help
 MAN1=		lynx.1
 
 post-install:
-	chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC} ; make install-doc)
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/lynx
+.endif
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx/distinfo b/japanese/lynx/distinfo
index ff1b7d9d94e4..e85567ea6aba 100644
--- a/japanese/lynx/distinfo
+++ b/japanese/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8rel.3.tar.gz) = bedd556e0c1048d8754e258eca5450a6
+MD5 (lynx2-8-1.tar.gz) = 7cf5e545052fb24a9b449d02865c803a
diff --git a/japanese/lynx/files/patch-aa b/japanese/lynx/files/patch-aa
index 5a9ece363aa4..bd0df60043d9 100644
--- a/japanese/lynx/files/patch-aa
+++ b/japanese/lynx/files/patch-aa
@@ -1,19 +1,23 @@
---- makefile.in.orig	Fri Jul 31 18:34:41 1998
-+++ makefile.in	Mon Aug 10 02:12:53 1998
-@@ -37,7 +37,7 @@
+--- makefile.in.orig	Sun Sep 13 23:35:55 1998
++++ makefile.in	Tue Sep 15 08:08:01 1998
+@@ -41,10 +41,10 @@
  libdir= @libdir@
  
+ ## Where you want the doc-files installed
+-docdir= @libdir@/lynx_doc
++docdir= $(prefix)/share/doc/lynx
+ 
  ## Where you want the help-files installed
 -helpdir= @libdir@/lynx_help
 +helpdir= $(prefix)/lib/lynx_help
  
  ##set the relative location of the WWW library Implementation directory,
  ##from this directory
-@@ -257,6 +257,7 @@
- 	(cd $(srcdir)/lynx_help && tar cf - . ) | ( cd $(helpdir) && tar xf - )
+@@ -260,6 +260,7 @@
+ 	@echo Copying sample files
  	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
- 			       ( cd $(helpdir) && tar xf - )
-+	cp $(srcdir)/lynx.cfg $(helpdir)/samples/lynx.cfg
+ 			       ( cd $(docdir) && tar xf - )
++	cp $(srcdir)/lynx.cfg $(docdir)/samples/lynx.cfg
  	-rm -f $(libdir)/lynx.tmp
- 	sh -c 'if test -f $(libdir)/lynx.cfg ; then \
- 		mv $(libdir)/lynx.cfg $(libdir)/lynx.tmp ; \
+ 
+ install-help : $(helpdir)
diff --git a/japanese/lynx/files/patch-ad b/japanese/lynx/files/patch-ad
index b61e1b1ec678..e74262d99eab 100644
--- a/japanese/lynx/files/patch-ad
+++ b/japanese/lynx/files/patch-ad
@@ -1,17 +1,17 @@
---- src/LYHistory.c.orig	Thu Apr 23 21:35:21 1998
-+++ src/LYHistory.c	Sun Apr 26 00:13:01 1998
+--- src/LYHistory.c.orig	Thu Aug  6 21:28:22 1998
++++ src/LYHistory.c	Mon Aug 10 01:44:44 1998
 @@ -22,6 +22,10 @@
+ #include <LYexit.h>
+ #include <LYLeaks.h>
  
- #include "LYexit.h"
- #include "LYLeaks.h"
-+
-+#include "HTCJK.h"
++#include <HTCJK.h>
 +extern HTCJKlang   HTCJK;
 +extern HTkcode     kanji_code;
-  
- #define FREE(x) if (x) {free(x); x = NULL;}
++
+ PUBLIC HTList * Visited_Links = NULL;	/* List of safe popped docs. */
  
-@@ -433,6 +437,20 @@
+ /*
+@@ -415,6 +419,20 @@
  	} else {
  	    StrAllocCopy(Title, "(no title)");
  	}
@@ -32,7 +32,7 @@
  	fprintf(fp0,
  		"%s<em>%d</em>. <tab id=t%d><a href=\"LYNXHIST:%d\">%s</a>\n",
  		(x > 99 ? "" : x < 10 ? "  " : " "),
-@@ -601,6 +619,20 @@
+@@ -568,6 +586,20 @@
  	    LYEntify(&Title, TRUE);
  	} else {
  	    StrAllocCopy(Title , "(no title)");
diff --git a/japanese/lynx/pkg-comment b/japanese/lynx/pkg-comment
index 45e92f29f12e..ced40c222df0 100644
--- a/japanese/lynx/pkg-comment
+++ b/japanese/lynx/pkg-comment
@@ -1 +1 @@
-A terminal-based World-Wide Web Client with multi-byte modifications.
+A terminal-based World-Wide Web Client with multi-byte modification.
diff --git a/japanese/lynx/pkg-descr b/japanese/lynx/pkg-descr
index 82611de18cad..0d0f27db401f 100644
--- a/japanese/lynx/pkg-descr
+++ b/japanese/lynx/pkg-descr
@@ -7,3 +7,5 @@ Modified point is following:
   . History and VisitedLinks
   . Editing to FORM TEXTFIELD and TEXTAREA
   . Bookmark
+
+--- Porting by shige@kuis.kyoto-u.ac.jp.
diff --git a/japanese/lynx/pkg-plist b/japanese/lynx/pkg-plist
index b04a717e1238..521856d442b4 100644
--- a/japanese/lynx/pkg-plist
+++ b/japanese/lynx/pkg-plist
@@ -1,46 +1,52 @@
 bin/lynx
 etc/lynx.cfg
-lib/lynx_help/about_lynx.html
-lib/lynx_help/lynx_url_support.html
 lib/lynx_help/Lynx_users_guide.html
-lib/lynx_help/lynx_help_main.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/visited_help.html
-lib/lynx_help/keystrokes/edit_help.html
 lib/lynx_help/keystrokes/dired_help.html
-lib/lynx_help/keystrokes/xterm_help.html
-lib/lynx_help/keystrokes/scrolling_help.html
-lib/lynx_help/keystrokes/print_help.html
-lib/lynx_help/keystrokes/other_help.html
-lib/lynx_help/keystrokes/option_help.html
-lib/lynx_help/keystrokes/movement_help.html
-lib/lynx_help/keystrokes/history_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/bookmark_help.html
+lib/lynx_help/keystrokes/history_help.html
 lib/lynx_help/keystrokes/keystroke_help.html
-lib/lynx_help/keystrokes/follow_help.html
-@dirrm lib/lynx_help/keystrokes
+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/COPYHEADER
-lib/lynx_help/COPYING
-lib/lynx_help/PROBLEMS
-lib/lynx_help/README
-lib/lynx_help/samples/jumpsVMS.html
-lib/lynx_help/samples/jumpsUnix.html
-lib/lynx_help/samples/mime.types
-lib/lynx_help/samples/lynx.com
-lib/lynx_help/samples/mailcap
-lib/lynx_help/samples/lynx.cfg
-lib/lynx_help/samples/lynx.lss
-@dirrm lib/lynx_help/samples
-lib/lynx_help/test/tabtest.html
-lib/lynx_help/test/iso8859-1.html
-lib/lynx_help/test/TestComment.html
-lib/lynx_help/test/ISO_LATIN1_test.html
-lib/lynx_help/test/README.txt
-lib/lynx_help/test/iso88592.html
-lib/lynx_help/test/ALT88592.html
-lib/lynx_help/test/sgml.html
-lib/lynx_help/test/unicode.html
-@dirrm lib/lynx_help/test
+lib/lynx_help/lynx_help_main.html
+lib/lynx_help/lynx_url_support.html
+share/doc/lynx/COPYHEADER
+share/doc/lynx/COPYING
+share/doc/lynx/CHANGES
+share/doc/lynx/PROBLEMS
+share/doc/lynx/README
+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.cfg
+share/doc/lynx/samples/lynx.lss
+share/doc/lynx/samples/mailcap
+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/spaces.html
+share/doc/lynx/test/sgml.html
+share/doc/lynx/test/tabtest.html
+share/doc/lynx/test/unicode.html
+@dirrm lib/lynx_help/keystrokes
 @dirrm lib/lynx_help
+@dirrm share/doc/lynx/test
+@dirrm share/doc/lynx/samples
+@dirrm share/doc/lynx