From owner-freebsd-ports-bugs@FreeBSD.ORG Sun May 30 15:40:06 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF2A9106567D for ; Sun, 30 May 2010 15:40:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (unknown [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BCD2C8FC1D for ; Sun, 30 May 2010 15:40:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o4UFe6Fq095922 for ; Sun, 30 May 2010 15:40:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o4UFe6c1095921; Sun, 30 May 2010 15:40:06 GMT (envelope-from gnats) Resent-Date: Sun, 30 May 2010 15:40:06 GMT Resent-Message-Id: <201005301540.o4UFe6c1095921@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, WATANABE Kazuhiro Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D04B11065676 for ; Sun, 30 May 2010 15:33:08 +0000 (UTC) (envelope-from CQG00620@nifty.ne.jp) Received: from mail1.asahi-net.or.jp (mail1.asahi-net.or.jp [202.224.39.197]) by mx1.freebsd.org (Postfix) with ESMTP id 92F9D8FC1A for ; Sun, 30 May 2010 15:33:08 +0000 (UTC) Received: from asahi-net.jp (i219073.dynamic.ppp.asahi-net.or.jp [61.125.219.73]) by mail1.asahi-net.or.jp (Postfix) with ESMTP id C348D9B7E2 for ; Mon, 31 May 2010 00:16:00 +0900 (JST) Message-Id: <20100530151600.C348D9B7E2@mail1.asahi-net.or.jp> Date: Mon, 31 May 2010 00:16:00 +0900 From: WATANABE Kazuhiro To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/147220: [patch] japanese/lynx-current: Update to the latest current release X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: WATANABE Kazuhiro List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2010 15:40:07 -0000 >Number: 147220 >Category: ports >Synopsis: [patch] japanese/lynx-current: Update to the latest current release >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun May 30 15:40:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Watanabe Kazuhiro >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: System: FreeBSD capricorn.sign.local 9.0-CURRENT FreeBSD 9.0-CURRENT #6: Sat May 29 19:12:06 JST 2010 nabe@capricorn:/FreeBSD/obj/i386/HEAD/FreeBSD/HEAD/src/sys/GENERIC i386 >Description: 1. Update to the latest current release. 2. Add a patch to correct the japanese character encoding of FORM input data. This patch was written by patakuti for Lynx for Win32 (http://lynx-win32-pata.sourceforge.jp/). Thanks! 3. Rename ENABLE_FOO tabs to WITH_FOO. 4. Change some CONFIGURE_ARGS variables. >How-To-Repeat: None. >Fix: I've tested the patch on 7.2-RELEASE-p8 and 9-CURRENT with the latest ports tree. diff -urN lynx-current.orig/Makefile lynx-current/Makefile --- lynx-current.orig/Makefile 2008-07-19 20:01:32.000000000 +0900 +++ lynx-current/Makefile 2010-05-29 22:18:03.000000000 +0900 @@ -15,10 +15,10 @@ 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 @@ 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 -urN lynx-current.orig/distinfo lynx-current/distinfo --- lynx-current.orig/distinfo 2008-07-19 20:01:32.000000000 +0900 +++ lynx-current/distinfo 2010-05-29 20:21:12.000000000 +0900 @@ -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 -urN lynx-current.orig/files/patch-src-GridText.c lynx-current/files/patch-src-GridText.c --- lynx-current.orig/files/patch-src-GridText.c 1970-01-01 09:00:00.000000000 +0900 +++ lynx-current/files/patch-src-GridText.c 2010-05-29 20:21:12.000000000 +0900 @@ -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 -urN lynx-current.orig/pkg-plist lynx-current/pkg-plist --- lynx-current.orig/pkg-plist 2008-07-19 20:01:32.000000000 +0900 +++ lynx-current/pkg-plist 2010-05-29 22:19:16.000000000 +0900 @@ -2,9 +2,9 @@ @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 @@ %%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 @@ %%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 @@ %%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 >Release-Note: >Audit-Trail: >Unformatted: