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

(-)lynx/Makefile (-15 / +16 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	lynx
4
PORTNAME=	lynx
5
DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
5
DISTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
6
PORTREVISION=	2
7
CATEGORIES=	japanese www ipv6
6
CATEGORIES=	japanese www ipv6
8
MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/
7
MASTER_SITES=	http://invisible-mirror.net/archives/lynx/tarballs/
9
DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
8
DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
Lines 13-52 Link Here
13
12
14
LICENSE=	GPLv2
13
LICENSE=	GPLv2
15
14
16
VERSION=	2.8.7
15
VERSION=	2.8.8
17
MINOR_VERSION=	rel.1
16
MINOR_VERSION=	rel.2
18
17
19
CONFLICTS=	lynx-2.* ja-lynx-2.8.8.*
18
CONFLICTS=	lynx-2.* ja-lynx-2.8.9.*
20
19
20
WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
21
USES=		cpe shebangfix tar:bzip2
21
USES=		cpe shebangfix tar:bzip2
22
SHEBANG_FILES=	samples/mailto-form.pl
22
SHEBANG_FILES=	samples/mailto-form.pl
23
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
24
CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
25
		--enable-nsl-fork --enable-ipv6 \
25
		--enable-nsl-fork --enable-ipv6 \
26
		--enable-cjk --enable-internal-links \
26
		--enable-cjk --enable-internal-links \
27
		--with-bzlib
27
		--with-bzlib
28
MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
28
MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
29
MAKEFILE=	makefile
29
MAKEFILE=	makefile
30
INSTALL_TARGET=	install-full
30
INSTALL_TARGET=	install-full
31
CPE_VERSION=	${PORTVERSION:R}
32
CPE_UPDATE=	${PORTVERSION:E:S/r/rel./}
31
33
32
WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
33
L_LIB=		${PREFIX}/etc
34
L_LIB=		${PREFIX}/etc
34
L_HELP=		${PREFIX}/share/lynx_help
35
L_HELP=		${PREFIX}/share/lynx_help
35
36
36
MAKE_JOBS_UNSAFE=yes
37
OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 
37
38
OPTIONS_DEFAULT=JAPANESE_UTF8
38
OPTIONS_DEFINE=	JAPANESE_UTF8 COLOR_STYLE DEFAULT_COLORS DOCS
39
OPTIONS_SUB=	yes
39
OPTIONS_SUB=	yes
40
40
41
JAPANESE_UTF8_DESC=	Experimental Japanese UTF-8 logic
41
COLOR_STYLE_DESC=		Optional color style support
42
COLOR_STYLE_DESC=	Color style (ncurses/curses)
42
COLOR_STYLE_CONFIGURE_ENABLE=	color-style
43
DEFAULT_COLORS_DESC=	Default colors (ncurses/slang)
44
43
45
JAPANESE_UTF8_USES=		iconv
44
DEFAULT_COLORS_DESC=		Default-color background support (ncurses)
45
DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
46
47
JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic support
46
JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
48
JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
47
JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
49
JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
48
COLOR_STYLE_CONFIGURE_ENABLE=	color-style
50
JAPANESE_UTF8_USES=		iconv
49
DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
50
51
51
# Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
52
# Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
52
# parallel builds
53
# parallel builds
(-)lynx/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
1
SHA256 (lynx2.8.8rel.2.tar.bz2) = 6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7
2
SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045
2
SIZE (lynx2.8.8rel.2.tar.bz2) = 2587120
(-)lynx/files/patch-makefile.in (-13 / +4 lines)
Lines 1-15 Link Here
1
--- makefile.in.orig	2008-09-22 00:49:47.000000000 +0200
1
--- makefile.in.orig	2014-03-10 06:43:10.000000000 +0900
2
+++ makefile.in	2014-05-18 13:31:04.012681258 +0200
2
+++ makefile.in	2015-11-28 14:46:42.000000000 +0900
3
@@ -319,7 +319,7 @@
3
@@ -421,8 +421,8 @@
4
 	fi'
5
 	$(SHELL) -c 'for name in COPYING COPYHEADER; do \
6
 		cd $(HELPDIR) && rm -f $$name ;\
7
-		cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\
8
+		cd $(HELPDIR) && ( $(LN_S) $(docdir)/$$name . || cp $(DOCDIR)/$$name . );\
9
 		done'
10
 	-$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac'
11
 
12
@@ -396,8 +396,8 @@
13
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
4
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
14
 	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
5
 	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
15
 		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
6
 		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
Lines 20-26 Link Here
20
 	-rm -f $(SYSCONFDIR)/lynx.tmp
11
 	-rm -f $(SYSCONFDIR)/lynx.tmp
21
 
12
 
22
 LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
13
 LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
23
@@ -420,10 +420,9 @@
14
@@ -445,10 +445,9 @@
24
 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
15
 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
25
 
16
 
26
 install-cfg : $(SYSCONFDIR)
17
 install-cfg : $(SYSCONFDIR)
(-)lynx/files/patch-src-GridText.c (-31 lines)
Lines 1-31 Link Here
1
--- src/GridText.c.orig	2009-06-07 09:30:35.000000000 +0900
2
+++ src/GridText.c	2010-05-01 22:10:44.000000000 +0900
3
@@ -10943,9 +10943,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,
(-)lynx/pkg-plist (-5 / +8 lines)
Lines 26-31 Link Here
26
%%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
26
%%PORTDOCS%%%%DOCSDIR%%/docs/README.jp
27
%%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
27
%%PORTDOCS%%%%DOCSDIR%%/docs/README.metrics
28
%%PORTDOCS%%%%DOCSDIR%%/docs/README.options
28
%%PORTDOCS%%%%DOCSDIR%%/docs/README.options
29
%%PORTDOCS%%%%DOCSDIR%%/docs/README.release
29
%%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
30
%%PORTDOCS%%%%DOCSDIR%%/docs/README.rootcerts
30
%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
31
%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
31
%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
32
%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
Lines 33-39 Link Here
33
%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
34
%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
34
%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
35
%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
35
%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
36
%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
36
%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
37
%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
37
%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
38
%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
38
%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
39
%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
39
%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
Lines 41-47 Link Here
41
%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
41
%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
42
%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
42
%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
43
%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
43
%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
44
%%PORTDOCS%%%%DOCSDIR%%/samples/index.html
45
%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
44
%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
46
%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
45
%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
47
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
46
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
Lines 61-96 Link Here
61
%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
60
%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
62
%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
61
%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
63
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
62
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
63
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat
64
%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
64
%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
65
%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
65
%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
66
%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
66
%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
67
%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
67
%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
68
%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
68
%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
69
%%PORTDOCS%%%%DOCSDIR%%/test/X
69
%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
70
%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
70
%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
71
%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
72
%%PORTDOCS%%%%DOCSDIR%%/test/circle.html
71
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
73
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
72
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
74
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
73
%%PORTDOCS%%%%DOCSDIR%%/test/index.html
75
%%PORTDOCS%%%%DOCSDIR%%/test/image.jpg
74
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
76
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
75
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
77
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
76
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
78
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
77
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
79
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
78
%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
80
%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
81
%%PORTDOCS%%%%DOCSDIR%%/test/nobody
79
%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
82
%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
80
%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
83
%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
81
%%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
84
%%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
82
%%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
85
%%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
83
%%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
86
%%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
87
%%PORTDOCS%%%%DOCSDIR%%/test/square.html
84
%%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
88
%%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
85
%%PORTDOCS%%%%DOCSDIR%%/test/tags.html
89
%%PORTDOCS%%%%DOCSDIR%%/test/tags.html
86
%%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
90
%%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
91
%%PORTDOCS%%%%DOCSDIR%%/test/triangle.html
87
%%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
92
%%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
88
%%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
93
%%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
89
%%PORTDOCS%%share/lynx_help/COPYHEADER
94
%%PORTDOCS%%share/lynx_help/COPYHEADER
90
%%PORTDOCS%%share/lynx_help/COPYING
95
%%PORTDOCS%%share/lynx_help/COPYING
91
share/lynx_help/Lynx_users_guide.html
96
share/lynx_help/Lynx_users_guide.html
92
share/lynx_help/about_lynx.html
97
share/lynx_help/about_lynx.html
93
share/lynx_help/index.html
94
share/lynx_help/keystrokes/alt_edit_help.html
98
share/lynx_help/keystrokes/alt_edit_help.html
95
share/lynx_help/keystrokes/bashlike_edit_help.html
99
share/lynx_help/keystrokes/bashlike_edit_help.html
96
share/lynx_help/keystrokes/bookmark_help.html
100
share/lynx_help/keystrokes/bookmark_help.html
Lines 101-107 Link Here
101
share/lynx_help/keystrokes/follow_help.html
105
share/lynx_help/keystrokes/follow_help.html
102
share/lynx_help/keystrokes/gopher_types_help.html
106
share/lynx_help/keystrokes/gopher_types_help.html
103
share/lynx_help/keystrokes/history_help.html
107
share/lynx_help/keystrokes/history_help.html
104
share/lynx_help/keystrokes/index.html
105
share/lynx_help/keystrokes/keystroke_help.html
108
share/lynx_help/keystrokes/keystroke_help.html
106
share/lynx_help/keystrokes/movement_help.html
109
share/lynx_help/keystrokes/movement_help.html
107
share/lynx_help/keystrokes/option_help.html
110
share/lynx_help/keystrokes/option_help.html

Return to bug 206570