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

(-)lynx-current/Makefile (-21 / +22 lines)
Lines 3-26 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}
10
PKGNAMESUFFIX=	-current
9
PKGNAMESUFFIX=	-current
11
10
12
MAINTAINER=	CQG00620@nifty.ne.jp
11
MAINTAINER=	CQG00620@nifty.ne.jp
13
COMMENT=	Terminal WWW client with multi-byte modification (development version)
12
COMMENT=	Console WWW client (browser) with multi-byte encoding support (development release)
14
13
15
VERSION=	2.8.8
14
LICENSE=	GPLv2
16
MINOR_VERSION=	dev.3
17
15
18
CONFLICTS=	lynx-2.* ja-lynx-2.8.7.*
16
VERSION=	2.8.9
17
MINOR_VERSION=	dev.8
18
19
CONFLICTS=	lynx-2.* ja-lynx-2.8.8.*
19
20
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
MAKE_JOBS_UNSAFE=	yes
24
GNU_CONFIGURE=	yes
23
GNU_CONFIGURE=	yes
25
CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
24
CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
26
		--enable-nsl-fork --enable-ipv6 \
25
		--enable-nsl-fork --enable-ipv6 \
Lines 29-60 Link Here
29
MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
28
MAKE_ARGS=	helpdir=${L_HELP} docdir=${DOCSDIR}
30
MAKEFILE=	makefile
29
MAKEFILE=	makefile
31
INSTALL_TARGET=	install-full
30
INSTALL_TARGET=	install-full
31
CPE_VERSION=	${PORTVERSION:R}
32
CPE_UPDATE=	${PORTVERSION:E:S/p/pre./:S/d/dev./}
32
33
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
OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS EXPERIMENTAL_OPTS JAPANESE_UTF8
37
OPTIONS_DEFINE=	COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 EXPERIMENTAL_OPTS
37
OPTIONS_DEFAULT=EXPERIMENTAL_OPTS JAPANESE_UTF8
38
OPTIONS_DEFAULT=JAPANESE_UTF8 EXPERIMENTAL_OPTS
38
OPTIONS_SUB=	yes
39
OPTIONS_SUB=	yes
39
40
40
COLOR_STYLE_DESC=		Color style (ncurses/ncurses)
41
COLOR_STYLE_DESC=		Optional color style support
41
COLOR_STYLE_CONFIGURE_ENABLE=	color-style
42
COLOR_STYLE_CONFIGURE_ENABLE=	color-style
42
43
43
DEFAULT_COLORS_DESC=		Default colors (ncurses/slang)
44
DEFAULT_COLORS_DESC=		Default-color background support (ncurses)
44
DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
45
DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors
45
46
46
EXPERIMENTAL_OPTS_DESC=		Experimental options
47
EXPERIMENTAL_OPTS_DESC=		Use experimental options
47
EXPERIMENTAL_OPTS_CONFIGURE_ON=	--enable-addrlist-page \
48
EXPERIMENTAL_OPTS_CONFIGURE_ON=	--enable-charset-choice --enable-nested-tables
48
				--enable-charset-choice
49
49
50
JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic support
50
JAPANESE_UTF8_DESC=		Experimental Japanese UTF-8 logic
51
JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
51
JAPANESE_UTF8_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
52
JAPANESE_UTF8_CONFIGURE_ENABLE=	japanese-utf8
52
				--enable-japanese-utf8
53
JAPANESE_UTF8_CONFIGURE_OFF=	--disable-japanese-utf8
54
JAPANESE_UTF8_USES=		iconv
53
JAPANESE_UTF8_USES=		iconv
55
54
55
# Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak
56
# parallel builds
56
post-patch:
57
post-patch:
57
	@${REINPLACE_CMD} -e 's|-lssl -lcrypto|-L${OPENSSLLIB} &|g' \
58
	@${REINPLACE_CMD} -E 's|cd (.+) && (\$$\(MAKE_RECUR\))|\2 -C \1|' \
58
		${WRKSRC}/configure
59
		${WRKSRC}/${MAKEFILE}.in
59
60
60
.include <bsd.port.mk>
61
.include <bsd.port.mk>
(-)lynx-current/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (lynx2.8.8dev.3.tar.bz2) = 9f9f114f9732d90c8b7627e1a96a49bf335212cd89d8f559be9c3abd4bd305dd
1
SHA256 (lynx2.8.9dev.8.tar.bz2) = c6223b885378d77cbc7cf7137273f1e9c142ec846d4d78477d319d10c4316d31
2
SIZE (lynx2.8.8dev.3.tar.bz2) = 2450931
2
SIZE (lynx2.8.9dev.8.tar.bz2) = 2657804
(-)lynx-current/files/patch-makefile.in (-13 / +4 lines)
Lines 1-15 Link Here
1
--- makefile.in.orig	2014-05-18 17:40:49.321601176 +0200
1
--- makefile.in.orig	2014-03-10 06:43:10.000000000 +0900
2
+++ makefile.in	2014-05-18 17:42:33.446626842 +0200
2
+++ makefile.in	2015-11-28 14:46:42.000000000 +0900
3
@@ -320,7 +320,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
@@ -399,8 +399,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
@@ -423,10 +423,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-current/files/patch-src-GridText.c (-31 lines)
Lines 1-31 Link Here
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,
(-)lynx-current/pkg-plist (-5 / +7 lines)
Lines 34-40 Link Here
34
%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
34
%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
35
%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
35
%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
36
%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
36
%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
37
%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
38
%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
37
%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
39
%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
38
%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
40
%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
39
%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
Lines 42-48 Link Here
42
%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
41
%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
43
%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
42
%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
44
%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
43
%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
45
%%PORTDOCS%%%%DOCSDIR%%/samples/index.html
46
%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
44
%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
47
%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
45
%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
48
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
46
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
Lines 62-97 Link Here
62
%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
60
%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
63
%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
61
%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
64
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
62
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
63
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat
65
%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
64
%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
66
%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
65
%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
67
%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
66
%%PORTDOCS%%%%DOCSDIR%%/test/ISO_LATIN1_test.html
68
%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
67
%%PORTDOCS%%%%DOCSDIR%%/test/README.txt
69
%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
68
%%PORTDOCS%%%%DOCSDIR%%/test/TestComment.html
69
%%PORTDOCS%%%%DOCSDIR%%/test/X
70
%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
70
%%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html
71
%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
71
%%PORTDOCS%%%%DOCSDIR%%/test/c1.html
72
%%PORTDOCS%%%%DOCSDIR%%/test/circle.html
72
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
73
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html
73
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
74
%%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html
74
%%PORTDOCS%%%%DOCSDIR%%/test/index.html
75
%%PORTDOCS%%%%DOCSDIR%%/test/image.jpg
75
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
76
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1.html
76
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
77
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-1a.html
77
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
78
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2.html
78
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
79
%%PORTDOCS%%%%DOCSDIR%%/test/iso-8859-2a.html
79
%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
80
%%PORTDOCS%%%%DOCSDIR%%/test/koi8-r.html
81
%%PORTDOCS%%%%DOCSDIR%%/test/nobody
80
%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
82
%%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html
81
%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
83
%%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html
82
%%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
84
%%PORTDOCS%%%%DOCSDIR%%/test/sgml.html
83
%%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
85
%%PORTDOCS%%%%DOCSDIR%%/test/spaces.html
84
%%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
86
%%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html
87
%%PORTDOCS%%%%DOCSDIR%%/test/square.html
85
%%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
88
%%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html
86
%%PORTDOCS%%%%DOCSDIR%%/test/tags.html
89
%%PORTDOCS%%%%DOCSDIR%%/test/tags.html
87
%%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
90
%%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html
91
%%PORTDOCS%%%%DOCSDIR%%/test/triangle.html
88
%%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
92
%%PORTDOCS%%%%DOCSDIR%%/test/unicode.html
89
%%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
93
%%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html
90
%%PORTDOCS%%share/lynx_help/COPYHEADER
94
%%PORTDOCS%%share/lynx_help/COPYHEADER
91
%%PORTDOCS%%share/lynx_help/COPYING
95
%%PORTDOCS%%share/lynx_help/COPYING
92
share/lynx_help/Lynx_users_guide.html
96
share/lynx_help/Lynx_users_guide.html
93
share/lynx_help/about_lynx.html
97
share/lynx_help/about_lynx.html
94
share/lynx_help/index.html
95
share/lynx_help/keystrokes/alt_edit_help.html
98
share/lynx_help/keystrokes/alt_edit_help.html
96
share/lynx_help/keystrokes/bashlike_edit_help.html
99
share/lynx_help/keystrokes/bashlike_edit_help.html
97
share/lynx_help/keystrokes/bookmark_help.html
100
share/lynx_help/keystrokes/bookmark_help.html
Lines 102-108 Link Here
102
share/lynx_help/keystrokes/follow_help.html
105
share/lynx_help/keystrokes/follow_help.html
103
share/lynx_help/keystrokes/gopher_types_help.html
106
share/lynx_help/keystrokes/gopher_types_help.html
104
share/lynx_help/keystrokes/history_help.html
107
share/lynx_help/keystrokes/history_help.html
105
share/lynx_help/keystrokes/index.html
106
share/lynx_help/keystrokes/keystroke_help.html
108
share/lynx_help/keystrokes/keystroke_help.html
107
share/lynx_help/keystrokes/movement_help.html
109
share/lynx_help/keystrokes/movement_help.html
108
share/lynx_help/keystrokes/option_help.html
110
share/lynx_help/keystrokes/option_help.html

Return to bug 206571