6 files changed, 129 insertions, 88 deletions

diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 9c9b76579d6d..fbb6926bdff3 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,30 +1,46 @@
 # New ports collection makefile for:	ja-lynx
-# Version required:     2.8.1
+# Version required:     2.8.2 release 1
 # Date created:         10 August 1998
-# Whom:                 Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
+# Whom:                 Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1998/11/02 04:01:50 steve Exp $
+# $Id: Makefile,v 1.3 1999/02/28 08:22:24 shige Exp $
 #
 
-DISTNAME=       lynx2-8-1
-PKGNAME=        ja-lynx-2.8.1
+DISTNAME=       lynx2.8.2rel.1
+PKGNAME=        ja-lynx-2.8.2.rel1
 CATEGORIES=	japanese www
-MASTER_SITES=   http://sol.slcc.edu/lynx/release2-8-1/
+MASTER_SITES=   http://sol.slcc.edu/lynx/current/
 
 MAINTAINER=	shige@FreeBSD.ORG
 
-NO_LATEST_LINK=	YES
+WRKSRC=		${WRKDIR}/lynx2-8-2
+
+USE_BZIP2?=	YES
 GNU_CONFIGURE=  YES
-CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc"
+CONFIGURE_ARGS= --with-screen=ncurses --with-zlib \
+		--libdir="${PREFIX}/${L_ETCDIR}" \
+		--enable-nsl-fork --enable-defaults-colors --enable-prettysrc \
+		--enable-persistent-cookies --enable-gzip-help
 MAKEFILE=       makefile
+MAKE_ARGS=	DOCDIR=${PREFIX}/${L_DOCDIR} HELPDIR=${PREFIX}/${L_HELPDIR}
+PLIST_SUB=	DOCDIR=${L_DOCDIR} HELPDIR=${L_HELPDIR} \
+		HELPFILE_SUFFIX=${HELPFILE_SUFFIX}
 INSTALL_TARGET= install install-help
 MAN1=		lynx.1
 
+RUN_DEPENDS=	unzip:${PORTSDIR}/arhivers/unzip \
+		zip:${PORTSDIR}/arhivers/zip
+
+L_ETCDIR=	etc
+L_DOCDIR=	share/doc/lynx
+L_HELPDIR=	share/lynx_help
+HELPFILE_SUFFIX= .gz
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC} ; make install-doc)
-	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/lynx
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${L_DOCDIR}
 .endif
-	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
+	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${L_HELPDIR}
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx/distinfo b/japanese/lynx/distinfo
index e85567ea6aba..569440e255a2 100644
--- a/japanese/lynx/distinfo
+++ b/japanese/lynx/distinfo
@@ -1 +1 @@
-MD5 (lynx2-8-1.tar.gz) = 7cf5e545052fb24a9b449d02865c803a
+MD5 (lynx2.8.2rel.1.tar.bz2) = 73b27bfad2c37523c7b648b3a7135cfd
diff --git a/japanese/lynx/files/patch-aa b/japanese/lynx/files/patch-aa
index bd0df60043d9..dc95a3ad57f9 100644
--- a/japanese/lynx/files/patch-aa
+++ b/japanese/lynx/files/patch-aa
@@ -1,23 +1,37 @@
---- 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@
+--- makefile.in.orig	Fri May 28 23:04:01 1999
++++ makefile.in	Sun Jul  4 17:13:39 1999
+@@ -50,11 +50,11 @@
+ LIBDIR= $(DESTDIR)$(libdir)
  
  ## Where you want the doc-files installed
 -docdir= @libdir@/lynx_doc
-+docdir= $(prefix)/share/doc/lynx
++docdir= @datadir@/doc/lynx
+ DOCDIR= $(DESTDIR)$(docdir)
  
  ## Where you want the help-files installed
 -helpdir= @libdir@/lynx_help
-+helpdir= $(prefix)/lib/lynx_help
++helpdir= $(prefix)/share/lynx_help
+ HELPDIR= $(DESTDIR)$(helpdir)
  
  ##set the relative location of the WWW library Implementation directory,
- ##from this directory
-@@ -260,6 +260,7 @@
- 	@echo Copying sample files
- 	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
- 			       ( cd $(docdir) && tar xf - )
-+	cp $(srcdir)/lynx.cfg $(docdir)/samples/lynx.cfg
- 	-rm -f $(libdir)/lynx.tmp
- 
- install-help : $(helpdir)
+@@ -358,10 +358,9 @@
+ 	-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 ; \
++		mv -f $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.oldcfg ; \
+ 	fi'
++	cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp
+ 	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
+ 	@ECHO_CC@sed	-e '/^HELPFILE:http/s@^@#@' \
+ 		-e '/^#HELPFILE:file/s@#@@' \
+@@ -371,6 +370,7 @@
+ 		-e '/^HELPFILE:file/s@$(COMPRESS_EXT)$(COMPRESS_EXT)$$@$(COMPRESS_EXT)@' \
+ 		$(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg
+ 	chmod 644 $(LIBDIR)/lynx.cfg
++	cp -p $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.cfg.sample
+ 	-rm -f $(LIBDIR)/lynx.tmp
+ 	$(INSTALL_DATA) $(srcdir)/COPYHEADER $(DOCDIR)/COPYHEADER
+ 	$(INSTALL_DATA) $(srcdir)/COPYING    $(DOCDIR)/COPYING
diff --git a/japanese/lynx/files/patch-ad b/japanese/lynx/files/patch-ad
index e74262d99eab..16d65f0d2a03 100644
--- a/japanese/lynx/files/patch-ad
+++ b/japanese/lynx/files/patch-ad
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/LYHistory.c.orig	Thu Dec 24 20:27:23 1998
++++ src/LYHistory.c	Mon Feb 22 15:01:18 1999
+@@ -23,6 +23,10 @@
  #include <LYexit.h>
  #include <LYLeaks.h>
  
@@ -11,9 +11,9 @@
  PUBLIC HTList * Visited_Links = NULL;	/* List of safe popped docs. */
  
  /*
-@@ -415,6 +419,20 @@
+@@ -401,6 +405,20 @@
  	} else {
- 	    StrAllocCopy(Title, "(no title)");
+ 	    StrAllocCopy(Title, NO_TITLE);
  	}
 +	if (HTCJK == JAPANESE) {
 +	    char *tmp;
@@ -32,16 +32,16 @@
  	fprintf(fp0,
  		"%s<em>%d</em>. <tab id=t%d><a href=\"LYNXHIST:%d\">%s</a>\n",
  		(x > 99 ? "" : x < 10 ? "  " : " "),
-@@ -568,6 +586,20 @@
- 	    LYEntify(&Title, TRUE);
+@@ -552,6 +570,20 @@
+ 		StrAllocCopy(Title , NO_TITLE);
  	} else {
- 	    StrAllocCopy(Title , "(no title)");
+ 	    StrAllocCopy(Title , NO_TITLE);
 +	}
 +	if (HTCJK == JAPANESE) {
 +	    char *tmp;
 +
 +	    if ((tmp = (char *)calloc(strlen(Title)*2, sizeof(char *))) == NULL)
-+    		outofmem(__FILE__, "LYShowVisitedLinks");
++		outofmem(__FILE__, "LYShowVisitedLinks");
 +	    *tmp = '\0';
 +	    if (kanji_code == EUC) {
 +		TO_EUC(Title, tmp);
@@ -49,7 +49,7 @@
 +		TO_SJIS(Title, tmp);
 +	    }
 +	    if (*tmp) StrAllocCopy(Title, tmp);
-+	    FREE(tmp);
++		FREE(tmp);
  	}
  	if (vl->address != NULL && *vl->address != '\0') {
  	    StrAllocCopy(Address, vl->address);
diff --git a/japanese/lynx/pkg-descr b/japanese/lynx/pkg-descr
index 0d0f27db401f..b88931f8f8e7 100644
--- a/japanese/lynx/pkg-descr
+++ b/japanese/lynx/pkg-descr
@@ -8,4 +8,4 @@ Modified point is following:
   . Editing to FORM TEXTFIELD and TEXTAREA
   . Bookmark
 
---- Porting by shige@kuis.kyoto-u.ac.jp.
+--- Porting by shige@FreeBSD.ORG
diff --git a/japanese/lynx/pkg-plist b/japanese/lynx/pkg-plist
index 521856d442b4..099455ec36ed 100644
--- a/japanese/lynx/pkg-plist
+++ b/japanese/lynx/pkg-plist
@@ -1,52 +1,63 @@
 bin/lynx
-etc/lynx.cfg
-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
-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
+etc/lynx.cfg.sample
+@exec test -f %B/lynx.cfg && mv -f %B/lynx.cfg %B/lynx.oldcfg
+@exec cp -f %D/%F %B/lynx.cfg
+@unexec rm -f %B/lynx.cfg
+@unexec test -f %B/lynx.oldcfg && mv -f %B/lynx.oldcfg %B/lynx.cfg
+%%HELPDIR%%/COPYHEADER
+%%HELPDIR%%/COPYING
+%%HELPDIR%%/Lynx_users_guide.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/about_lynx.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/alt_edit_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/bookmark_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/cookie_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/dired_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/edit_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/environments.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/follow_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/gopher_types_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/history_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/keystroke_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/movement_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/option_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/other_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/print_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/scrolling_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/test_display.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/visited_help.html%%HELPFILE_SUFFIX%%
+%%HELPDIR%%/keystrokes/xterm_help.html%%HELPFILE_SUFFIX%%
+%%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/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%%
+@dirrm %%HELPDIR%%/keystrokes
+@dirrm %%HELPDIR%%