- Update to 2.8.8.dev3

- Add a patch to correct the japanese character encoding of FORM input data.
- Rename ENABLE_FOO tabs to WITH_FOO

PR:		ports/147220
Submitted by:	WATANABE Kazuhiro <CQG00620 AT nifty.ne.jp>

4 files changed, 67 insertions, 18 deletions

diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index bffb63689775..c03b675b8b73 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lynx
-PORTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
+DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
 CATEGORIES=	japanese www ipv6
 MASTER_SITES=	http://lynx.isc.org/current/ \
 		http://ftp2.uk.freebsd.org/sites/lynx.isc.org/current/
@@ -15,10 +15,10 @@ DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A terminal-based World-Wide Web Client with multi-byte modification (development version)
 
-VERSION=	2.8.7
-MINOR_VERSION=	dev.9
+VERSION=	2.8.8
+MINOR_VERSION=	dev.3
 
-CONFLICTS=	lynx-2.* ja-lynx-2.8.6.*
+CONFLICTS=	lynx-2.* ja-lynx-2.8.7.*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
 USE_BZIP2=	yes
@@ -26,26 +26,35 @@ NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
 		--enable-nsl-fork --enable-ipv6 \
-		--enable-cjk --enable-justify-elts --enable-internal-links \
+		--enable-cjk --enable-internal-links \
 		--with-bzlib
 
-.ifndef (WITHOUT_LYNX_EXPERIMENTAL_OPTS)
-# experimental optional configure args
+.if !defined(WITHOUT_JAPANESE_UTF8)
 USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
-		--enable-japanese-utf8 --enable-addrlist-page \
+		--enable-japanese-utf8
+.else
+CONFIGURE_ARGS+=--disable-japanese-utf8
+.endif
+
+.if !defined(WITHOUT_EXPERIMENTAL_OPTS)
+# experimental optional configure args
+CONFIGURE_ARGS+=--enable-addrlist-page \
 		--enable-charset-choice
 .endif
 
-.if defined(ENABLE_COLOR_STYLE)
-PLIST_SUB+=	ENABLE_COLOR_STYLE=""
+.if defined(WITH_COLOR_STYLE)
+CONFIGURE_ARGS+=--enable-color-style
+PLIST_SUB+=	WITH_COLOR_STYLE=""
 .else
 CONFIGURE_ARGS+=--disable-color-style
-PLIST_SUB+=	ENABLE_COLOR_STYLE="@comment "
+PLIST_SUB+=	WITH_COLOR_STYLE="@comment "
 .endif
 
-.if defined(ENABLE_DEFAULT_COLORS)
+.if defined(WITH_DEFAULT_COLORS)
 CONFIGURE_ARGS+=--enable-default-colors
+.else
+CONFIGURE_ARGS+=--disable-default-colors
 .endif
 
 MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
diff --git a/japanese/lynx-current/distinfo b/japanese/lynx-current/distinfo
index d7c4405fcf70..b4b9b700f627 100644
--- a/japanese/lynx-current/distinfo
+++ b/japanese/lynx-current/distinfo
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.7dev.9.tar.bz2) = 1dcde056817693b725e50ac593453b00
-SHA256 (lynx2.8.7dev.9.tar.bz2) = 62ccad8e85b3ac3e0e5511ab10d0647d471b2fbc7f56e7348e0d8f07785b4eda
-SIZE (lynx2.8.7dev.9.tar.bz2) = 2360834
+MD5 (lynx2.8.8dev.3.tar.bz2) = 16dd2be2d0b32c0683e55db8cc40b632
+SHA256 (lynx2.8.8dev.3.tar.bz2) = 9f9f114f9732d90c8b7627e1a96a49bf335212cd89d8f559be9c3abd4bd305dd
+SIZE (lynx2.8.8dev.3.tar.bz2) = 2450931
diff --git a/japanese/lynx-current/files/patch-src-GridText.c b/japanese/lynx-current/files/patch-src-GridText.c
new file mode 100644
index 000000000000..b2d72a4a7bc9
--- /dev/null
+++ b/japanese/lynx-current/files/patch-src-GridText.c
@@ -0,0 +1,31 @@
+--- src/GridText.c.orig	2010-04-26 08:44:30.000000000 +0900
++++ src/GridText.c	2010-05-24 18:15:47.000000000 +0900
+@@ -11128,9 +11128,28 @@
+ 		if (check_form_specialchars(val_used) != 0) {
+ 		    /*  We should translate back. */
+ 		    StrAllocCopy(copied_val_used, val_used);
++		    if (HTCJK == JAPANESE) {
++			if ((0 <= target_cs) &&
++			    (strcmp(LYCharSet_UC[target_cs].MIMEname, "euc-jp") == 0)) {
++			    TO_EUC(val_used, copied_val_used);
++			    success = YES;
++			}
++			else if ((0 <= target_cs) &&
++			    (strcmp(LYCharSet_UC[target_cs].MIMEname, "shift_jis") == 0)) {
++			    TO_SJIS(val_used, copied_val_used);
++			    success = YES;
++			}
++			else {
+ 		    success = LYUCTranslateBackFormData(&copied_val_used,
+ 							form_ptr->value_cs,
+ 							target_cs, PlainText);
++			}
++		    }
++		    else {
++			success = LYUCTranslateBackFormData(&copied_val_used,
++							    form_ptr->value_cs,
++							    target_cs, PlainText);
++		    }
+ 		    CTRACE((tfp, "field \"%s\" %d %s -> %d %s %s\n",
+ 			    NonNull(form_ptr->name),
+ 			    form_ptr->value_cs,
diff --git a/japanese/lynx-current/pkg-plist b/japanese/lynx-current/pkg-plist
index a5944647cd81..1827c9a61e38 100644
--- a/japanese/lynx-current/pkg-plist
+++ b/japanese/lynx-current/pkg-plist
@@ -2,9 +2,9 @@ bin/lynx
 @unexec if [ -f %D/etc/lynx.cfg ] && cmp -s %D/etc/lynx.cfg %D/etc/lynx.cfg.default; then rm -f %D/etc/lynx.cfg; fi
 etc/lynx.cfg.default
 @exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
-%%ENABLE_COLOR_STYLE%%@unexec if [ -f %D/etc/lynx.lss ] && cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.default; then rm -f %D/etc/lynx.lss; fi
-%%ENABLE_COLOR_STYLE%%etc/lynx.lss.default
-%%ENABLE_COLOR_STYLE%%@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi
+%%WITH_COLOR_STYLE%%@unexec if [ -f %D/etc/lynx.lss ] && cmp -s %D/etc/lynx.lss %D/etc/lynx.lss.default; then rm -f %D/etc/lynx.lss; fi
+%%WITH_COLOR_STYLE%%etc/lynx.lss.default
+%%WITH_COLOR_STYLE%%@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi
 @exec mkdir -p %D/share/lynx_help
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYHEADER
@@ -27,9 +27,12 @@ etc/lynx.cfg.default
 %%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.cookies
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.defines
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.options
+%%PORTDOCS%%%%DOCSDIR%%/docs/README.release
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
 %%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
@@ -55,6 +58,7 @@ etc/lynx.cfg.default
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.ico
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm
 %%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump
@@ -69,10 +73,15 @@ etc/lynx.cfg.default
 %%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
 %%PORTDOCS%%%%DOCSDIR%%/test/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
+%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
 %%PORTDOCS%%%%DOCSDIR%%/test/c1.html
+%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
+%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/index.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
+%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
 %%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
 %%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
 %%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html