Attachment 106601 Details for Bug 147220 – file.diff

[patch] file.diff

file.diff (text/plain), 6.32 KB, created by WATANABE Kazuhiro on 2010-05-30 16:40:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: WATANABE Kazuhiro

Created: 2010-05-30 16:40:06 UTC

Size: 6.32 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 147220: 106601