Attachment #106601 for bug #147220

View | Details | Raw Unified | Return to bug 147220
Collapse All | Expand All




MAINTAINER=	ports@FreeBSD.org
COMMENT=	A terminal-based World-Wide Web Client with multi-byte modification (development version)

VERSION=	2.8.8
MINOR_VERSION=	dev.3

CONFLICTS=	lynx-2.* ja-lynx-2.8.7.*

WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
USE_BZIP2=	yes

GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
		--enable-nsl-fork --enable-ipv6 \
		--enable-cjk --enable-internal-links \
		--with-bzlib

.if !defined(WITHOUT_JAPANESE_UTF8)
# experimental optional configure args
USE_ICONV=	yes
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
		--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(WITH_COLOR_STYLE)
CONFIGURE_ARGS+=--enable-color-style
PLIST_SUB+=	WITH_COLOR_STYLE=""
.else
CONFIGURE_ARGS+=--disable-color-style
PLIST_SUB+=	WITH_COLOR_STYLE="@comment "
.endif

.if defined(WITH_DEFAULT_COLORS)
CONFIGURE_ARGS+=--enable-default-colors
.else
CONFIGURE_ARGS+=--disable-default-colors
.endif

MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}

Lines 1-3 Link Here

(-)lynx-current/distinfo (-3 / +3 lines)
1	MD5 (lynx2.8.7dev.9.tar.bz2) = 1dcde056817693b725e50ac593453b00	1	MD5 (lynx2.8.8dev.3.tar.bz2) = 16dd2be2d0b32c0683e55db8cc40b632
2	SHA256 (lynx2.8.7dev.9.tar.bz2) = 62ccad8e85b3ac3e0e5511ab10d0647d471b2fbc7f56e7348e0d8f07785b4eda	2	SHA256 (lynx2.8.8dev.3.tar.bz2) = 9f9f114f9732d90c8b7627e1a96a49bf335212cd89d8f559be9c3abd4bd305dd
3	SIZE (lynx2.8.7dev.9.tar.bz2) = 2360834	3	SIZE (lynx2.8.8dev.3.tar.bz2) = 2450931




--- 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,

Return to bug 147220

Lines 15-24 Link Here

(-)lynx-current/Makefile (-11 / +20 lines)
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A terminal-based World-Wide Web Client with multi-byte modification (development version)	16	COMMENT= A terminal-based World-Wide Web Client with multi-byte modification (development version)
17		17
18	VERSION= 2.8.7	18	VERSION= 2.8.8
19	MINOR_VERSION= dev.9	19	MINOR_VERSION= dev.3
20		20
21	CONFLICTS= lynx-2.* ja-lynx-2.8.6.*	21	CONFLICTS= lynx-2.* ja-lynx-2.8.7.*
22		22
23	WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}	23	WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
24	USE_BZIP2= yes	24	USE_BZIP2= yes
Lines 26-51 Link Here
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \	27	CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
28	--enable-nsl-fork --enable-ipv6 \	28	--enable-nsl-fork --enable-ipv6 \
29	--enable-cjk --enable-justify-elts --enable-internal-links \	29	--enable-cjk --enable-internal-links \
30	--with-bzlib	30	--with-bzlib
31		31
32	.ifndef (WITHOUT_LYNX_EXPERIMENTAL_OPTS)	32	.if !defined(WITHOUT_JAPANESE_UTF8)
33	# experimental optional configure args
34	USE_ICONV= yes	33	USE_ICONV= yes
35	CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \	34	CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
36	--enable-japanese-utf8 --enable-addrlist-page \	35	--enable-japanese-utf8
		36	.else
		37	CONFIGURE_ARGS+=--disable-japanese-utf8
		38	.endif
		39
		40	.if !defined(WITHOUT_EXPERIMENTAL_OPTS)
		41	# experimental optional configure args
		42	CONFIGURE_ARGS+=--enable-addrlist-page \
37	--enable-charset-choice	43	--enable-charset-choice
38	.endif	44	.endif
39		45
40	.if defined(ENABLE_COLOR_STYLE)	46	.if defined(WITH_COLOR_STYLE)
41	PLIST_SUB+= ENABLE_COLOR_STYLE=""	47	CONFIGURE_ARGS+=--enable-color-style
		48	PLIST_SUB+= WITH_COLOR_STYLE=""
42	.else	49	.else
43	CONFIGURE_ARGS+=--disable-color-style	50	CONFIGURE_ARGS+=--disable-color-style
44	PLIST_SUB+= ENABLE_COLOR_STYLE="@comment "	51	PLIST_SUB+= WITH_COLOR_STYLE="@comment "
45	.endif	52	.endif
46		53
47	.if defined(ENABLE_DEFAULT_COLORS)	54	.if defined(WITH_DEFAULT_COLORS)
48	CONFIGURE_ARGS+=--enable-default-colors	55	CONFIGURE_ARGS+=--enable-default-colors
		56	.else
		57	CONFIGURE_ARGS+=--disable-default-colors
49	.endif	58	.endif
50		59
51	MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR}	60	MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR}

Line 0 Link Here

(-)lynx-current/files/patch-src-GridText.c (+31 lines)
	1	--- src/GridText.c.orig 2010-04-26 08:44:30.000000000 +0900
	2	+++ src/GridText.c 2010-05-24 18:15:47.000000000 +0900
	3	@@ -11128,9 +11128,28 @@
	4	if (check_form_specialchars(val_used) != 0) {
	5	/* We should translate back. */
	6	StrAllocCopy(copied_val_used, val_used);
	7	+ if (HTCJK == JAPANESE) {
	8	+ if ((0 <= target_cs) &&
	9	+ (strcmp(LYCharSet_UC[target_cs].MIMEname, "euc-jp") == 0)) {
	10	+ TO_EUC(val_used, copied_val_used);
	11	+ success = YES;
	12	+ }
	13	+ else if ((0 <= target_cs) &&
	14	+ (strcmp(LYCharSet_UC[target_cs].MIMEname, "shift_jis") == 0)) {
	15	+ TO_SJIS(val_used, copied_val_used);
	16	+ success = YES;
	17	+ }
	18	+ else {
	19	success = LYUCTranslateBackFormData(&copied_val_used,
	20	form_ptr->value_cs,
	21	target_cs, PlainText);
	22	+ }
	23	+ }
	24	+ else {
	25	+ success = LYUCTranslateBackFormData(&copied_val_used,
	26	+ form_ptr->value_cs,
	27	+ target_cs, PlainText);
	28	+ }
	29	CTRACE((tfp, "field \"%s\" %d %s -> %d %s %s\n",
	30	NonNull(form_ptr->name),
	31	form_ptr->value_cs,

Lines 2-10 Link Here

(-)lynx-current/pkg-plist (-3 / +12 lines)
2	@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	2	@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
3	etc/lynx.cfg.default	3	etc/lynx.cfg.default
4	@exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi	4	@exec if [ ! -f %D/etc/lynx.cfg ] ; then cp -p %D/%F %B/lynx.cfg; fi
5	%%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	5	%%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
6	%%ENABLE_COLOR_STYLE%%etc/lynx.lss.default	6	%%WITH_COLOR_STYLE%%etc/lynx.lss.default
7	%%ENABLE_COLOR_STYLE%%@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi	7	%%WITH_COLOR_STYLE%%@exec if [ ! -f %D/etc/lynx.lss ] ; then cp -p %D/%F %B/lynx.lss; fi
8	@exec mkdir -p %D/share/lynx_help	8	@exec mkdir -p %D/share/lynx_help
9	%%PORTDOCS%%%%DOCSDIR%%/CHANGES	9	%%PORTDOCS%%%%DOCSDIR%%/CHANGES
10	%%PORTDOCS%%%%DOCSDIR%%/COPYHEADER	10	%%PORTDOCS%%%%DOCSDIR%%/COPYHEADER
Lines 27-35 Link Here
27	%%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce	27	%%PORTDOCS%%%%DOCSDIR%%/docs/OS-390.announce
28	%%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST	28	%%PORTDOCS%%%%DOCSDIR%%/docs/README.TRST
29	%%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans	29	%%PORTDOCS%%%%DOCSDIR%%/docs/README.chartrans
		30	%%PORTDOCS%%%%DOCSDIR%%/docs/README.cookies
30	%%PORTDOCS%%%%DOCSDIR%%/docs/README.defines	31	%%PORTDOCS%%%%DOCSDIR%%/docs/README.defines
31	%%PORTDOCS%%%%DOCSDIR%%/docs/README.jp	32	%%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
32	%%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics	33	%%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
		34	%%PORTDOCS%%%%DOCSDIR%%/docs/README.options
		35	%%PORTDOCS%%%%DOCSDIR%%/docs/README.release
33	%%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts	36	%%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
34	%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl	37	%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
35	%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts	38	%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
Lines 55-60 Link Here
55	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps	58	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx-keymaps
56	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat	59	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.bat
57	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com	60	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.com
		61	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.ico
58	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss	62	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx.lss
59	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm	63	%%PORTDOCS%%%%DOCSDIR%%/samples/lynx_bookmarks.htm
60	%%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump	64	%%PORTDOCS%%%%DOCSDIR%%/samples/lynxdump
Lines 69-78 Link Here
69	%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html	73	%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
70	%%PORTDOCS%%%%DOCSDIR%%/test/README.txt	74	%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
71	%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html	75	%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
		76	%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
72	%%PORTDOCS%%%%DOCSDIR%%/test/c1.html	77	%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
		78	%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
		79	%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
73	%%PORTDOCS%%%%DOCSDIR%%/test/index.html	80	%%PORTDOCS%%%%DOCSDIR%%/test/index.html
74	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html	81	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
		82	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
75	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html	83	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
		84	%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
76	%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html	85	%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
77	%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html	86	%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
78	%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html	87	%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html