4 files changed, 84 insertions, 29 deletions

diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index 2c0af472058b..a0963082babb 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -1,35 +1,44 @@
 # New ports collection makefile for:	ja-lynx-current
-# Version required:     2.8.2pre.5
+# Version required:     2.8.3dev.8
 # Date created:         10 August 1998
 # Whom:                 Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lynx2.8.2pre.5
-PKGNAME=	ja-lynx-2.8.2.pre5
+DISTNAME=	lynx2.8.3dev.8
+PKGNAME=	ja-lynx-2.8.3dev.8
 CATEGORIES=	japanese www
 MASTER_SITES=	http://sol.slcc.edu/lynx/current/
 
 MAINTAINER=	shige@FreeBSD.org
 
+USE_BZIP2=	YES
 NO_LATEST_LINK=	YES
-WRKSRC=		${WRKDIR}/lynx2-8-2
+WRKSRC=		${WRKDIR}/lynx2-8-3
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${PREFIX}/etc" \
+CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib \
+		--libdir="${PREFIX}/${LYNX_LIB}" \
 		--disable-nls --enable-default-colors \
-		--enable-nsl-fork --enable-persistent-cookies
+		--enable-nsl-fork --enable-persistent-cookies \
+		--enable-cjk --enable-file-upload --enable-justify-elts \
+		--enable-libjs --enable-read-eta --enable-source-cache
+#--enable-prettysrc \
+#--enable-color-style
 MAKEFILE=	makefile
-INSTALL_TARGET=	install install-help
+MAKE_ARGS=	helpdir=${PREFIX}/${LYNX_HELP} docdir=${PREFIX}/${LYNX_DOC} \
+PLIST_SUB=	LYNX_LIB=${LYNX_LIB} LYNX_DOC=${LYNX_DOC} LYNX_HELP=${LYNX_HELP}
+
+INSTALL_TARGET=	install-full
 MAN1=		lynx.1
 
+LYNX_LIB=	etc
+LYNX_DOC=	share/doc/lynx
+LYNX_HELP=	share/lynx_help
+
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/lynx.cfg ${PREFIX}/etc/lynx.cfg.sample
-.if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC} ; make install-doc)
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/lynx
-	@${INSTALL_DATA} ${WRKSRC}/lynx.cfg ${PREFIX}/share/doc/lynx/samples/
-.endif
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/lynx_help
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_DOC}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_HELP}
+	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${LYNX_LIB}/lynx.cfg
 
 .include <bsd.port.mk>
diff --git a/japanese/lynx-current/distinfo b/japanese/lynx-current/distinfo
index 7fdfc372ee86..1999f77745ee 100644
--- a/japanese/lynx-current/distinfo
+++ b/japanese/lynx-current/distinfo
@@ -1 +1 @@
-MD5 (lynx2.8.2pre.5.tar.gz) = 6a3bcdef214d393ea105c5c428f9d6e5
+MD5 (lynx2.8.3dev.8.tar.bz2) = 33dd4d6ee2d70134d8b501f668fd8dbc
diff --git a/japanese/lynx-current/files/patch-aa b/japanese/lynx-current/files/patch-aa
index 31b7321a28d5..880289076776 100644
--- a/japanese/lynx-current/files/patch-aa
+++ b/japanese/lynx-current/files/patch-aa
@@ -1,15 +1,61 @@
---- makefile.in.orig	Wed Feb 17 23:29:33 1999
-+++ makefile.in	Mon Feb 22 15:42:17 1999
-@@ -43,10 +43,10 @@
- libdir= @libdir@
+--- makefile.in.orig	Thu Aug 26 20:31:19 1999
++++ makefile.in	Tue Sep  7 17:27:56 1999
+@@ -307,7 +307,7 @@
+ 	@echo "Use $(MAKE) install-doc to install extra documentation files"
+ 	@echo
  
- ## Where you want the doc-files installed
--docdir= @libdir@/lynx_doc
-+docdir= @datadir@/doc/lynx
+-install-full: install install-help install-doc
++install-full: install install-doc install-help
+ 	@echo Full installation complete.
  
- ## Where you want the help-files installed
--helpdir= @libdir@/lynx_help
-+helpdir= $(prefix)/lib/lynx_help
+ install-bin: $(BINDIR) lynx$x
+@@ -323,7 +323,7 @@
+ 	(cd $(srcdir) && tar cf - C[HO]* PROBLEMS README samples test ) | \
+ 			       ( cd $(DOCDIR) && tar xf - )
+ 	$(SHELL) -c 'for name in COPYING COPYHEADER; do \
+-		cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\
++		cd $(HELPDIR) && cp $(DOCDIR)/$$name . ;\
+ 		done'
  
- ## Where your locale data is
- # datadir = @datadir@
+ # HPUX 'sed' does not seem to like '=' as pattern delimiter.
+@@ -361,22 +361,24 @@
+ 		fi ; \
+ 		)'
+ 	-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 ; \
++	@echo Updating $(libdir)/lynx.cfg.default
++	$(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg.default ; then \
++		mv $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.tmp ; \
+ 	else \
+ 		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+ 	fi'
+-	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
++	@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)@' \
+-		$(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg
+-	chmod 644 $(LIBDIR)/lynx.cfg
++		$(LIBDIR)/lynx.tmp >$(LIBDIR)/lynx.cfg.default
++	chmod 644 $(LIBDIR)/lynx.cfg.default
+ 	-rm -f $(LIBDIR)/lynx.tmp
++	-[ ! -f $(LIBDIR)/lynx.cfg ] && $(INSTALL_DATA) $(LIBDIR)/lynx.cfg.default $(LIBDIR)/lynx.cfg
++
+ 
+ LYHelp.h : LYHelp.hin
+ 	@echo Constructing sed-script
+@@ -407,8 +409,7 @@
+ 	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
+ 
+ install-lss : $(LIBDIR)
+ 	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
diff --git a/japanese/lynx-current/files/patch-ai b/japanese/lynx-current/files/patch-ai
index 30d33f5030be..ea260ad471a2 100644
--- a/japanese/lynx-current/files/patch-ai
+++ b/japanese/lynx-current/files/patch-ai
@@ -7,8 +7,8 @@
 +/* 
 + * This code is harmful to display bold links.
 + * Already set COLOR attributes?
-+ * Therefore we do not need this code.
-+ *   --- by shige@kuis.kyoto-u.ac.jp
++ * Therefore I think that we do not need this code.
++ *   --- by shige@FreeBSD.org
 + */
 +#if 0  /* do not need */
  #if defined(COLOR_CURSES)