ports/147221: [patch] japanese/lynx: Update to the latest stable release
WATANABE Kazuhiro
CQG00620 at nifty.ne.jp
Sun May 30 15:40:07 UTC 2010
>Number: 147221
>Category: ports
>Synopsis: [patch] japanese/lynx: Update to the latest stable 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 at capricorn:/FreeBSD/obj/i386/HEAD/FreeBSD/HEAD/src/sys/GENERIC i386
>Description:
1. Update to the latest stable 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.orig/Makefile lynx/Makefile
--- lynx.orig/Makefile 2008-07-19 20:00:18.000000000 +0900
+++ lynx/Makefile 2010-05-29 21:33:08.000000000 +0900
@@ -15,28 +15,39 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= A terminal-based World-Wide Web Client with multi-byte modification
-VERSION= 2.8.6
-MINOR_VERSION= rel.5
+VERSION= 2.8.7
+MINOR_VERSION= rel.1
-CONFLICTS= lynx-2.* ja-lynx-2.8.7.*
+CONFLICTS= lynx-2.* ja-lynx-2.8.8.*
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-justify-elts --enable-internal-links \
+ --enable-cjk --enable-internal-links \
--with-bzlib
-.if defined(ENABLE_COLOR_STYLE)
-PLIST_SUB+= ENABLE_COLOR_STYLE=""
+.if !defined(WITHOUT_JAPANESE_UTF8)
+USE_ICONV= yes
+CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
+ --enable-japanese-utf8
+.else
+CONFIGURE_ARGS+=--disable-japanese-utf8
+.endif
+
+.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.orig/distinfo lynx/distinfo
--- lynx.orig/distinfo 2008-07-19 20:00:18.000000000 +0900
+++ lynx/distinfo 2010-05-29 20:21:06.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (lynx2.8.6rel.5.tar.bz2) = bd44c57d28fd3e4c9db1cd492d403600
-SHA256 (lynx2.8.6rel.5.tar.bz2) = dc98c1725cc8c081bddc4ae7a6f065ce9bce5a017d626f62fc0c061ec0eb764d
-SIZE (lynx2.8.6rel.5.tar.bz2) = 2290787
+MD5 (lynx2.8.7rel.1.tar.bz2) = 493af4c77ef6761e3f0157cd1be033a0
+SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
+SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045
diff -urN lynx.orig/files/patch-aa lynx/files/patch-aa
--- lynx.orig/files/patch-aa 2008-06-19 07:46:24.000000000 +0900
+++ lynx/files/patch-aa 2010-05-29 20:21:06.000000000 +0900
@@ -1,11 +1,12 @@
---- makefile.in.orig Mon Sep 4 08:25:39 2006
-+++ makefile.in Thu Apr 5 17:42:33 2007
-@@ -360,13 +360,9 @@
+--- makefile.in.orig 2008-09-22 07:49:47.000000000 +0900
++++ makefile.in 2010-05-01 11:16:06.000000000 +0900
+@@ -381,14 +381,9 @@
if test "$(COMPRESS_PROG)" != "" ; then \
(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
fi'
- @echo Updating $(sysconfdir)/lynx.cfg
-- @ECHO_CC@$(SHELL) -c 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
+- @ECHO_CC@$(SHELL) -c \
+- 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
- mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
- else \
- cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
@@ -17,7 +18,7 @@
@ECHO_CC at sed -e '/^HELPFILE:http/s!^!#!' \
-e '/^#HELPFILE:file/s!#!!' \
$(SYSCONFDIR)/lynx.tmp | \
-@@ -374,9 +370,9 @@
+@@ -396,9 +391,9 @@
$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc $(helpdir) | \
sed -e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
@@ -27,9 +28,9 @@
-rm -f $(SYSCONFDIR)/lynx.tmp
+ -[ ! -f $(SYSCONFDIR)/lynx.cfg ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.cfg.default $(SYSCONFDIR)/lynx.cfg
- LYHelp.h : help_files.sed LYHelp.hin
+ LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin
@echo Creating $@
-@@ -398,11 +394,11 @@
+@@ -420,10 +415,11 @@
$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
install-cfg : $(SYSCONFDIR)
@@ -37,10 +38,9 @@
+ @$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg.default
install-lss : $(SYSCONFDIR)
-- -mv -f $(SYSCONFDIR)/lynx.lss $(SYSCONFDIR)/lynx.oldlss
-- $(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
-+ $(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default
+- @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
++ @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss.default
+ -[ ! -f $(SYSCONFDIR)/lynx.lss ] && $(INSTALL_DATA) $(SYSCONFDIR)/lynx.lss.default $(SYSCONFDIR)/lynx.lss
uninstall ::
- @MSG_DIR_MAKE@ cd po && $(MAKE) CC="$(CC)" uninstall
+ @MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall
diff -urN lynx.orig/files/patch-src-GridText.c lynx/files/patch-src-GridText.c
--- lynx.orig/files/patch-src-GridText.c 1970-01-01 09:00:00.000000000 +0900
+++ lynx/files/patch-src-GridText.c 2010-05-29 20:21:06.000000000 +0900
@@ -0,0 +1,31 @@
+--- src/GridText.c.orig 2009-06-07 09:30:35.000000000 +0900
++++ src/GridText.c 2010-05-01 22:10:44.000000000 +0900
+@@ -10943,9 +10943,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.orig/pkg-plist lynx/pkg-plist
--- lynx.orig/pkg-plist 2008-06-19 07:46:24.000000000 +0900
+++ lynx/pkg-plist 2010-05-29 21:34:56.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,11 @@
%%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.rootcerts
%%PORTDOCS%%%%DOCSDIR%%/docs/README.ssl
%%PORTDOCS%%%%DOCSDIR%%/docs/README.sslcerts
@@ -37,32 +39,48 @@
%%PORTDOCS%%%%DOCSDIR%%/docs/TCPWARE.announce
%%PORTDOCS%%%%DOCSDIR%%/docs/VMSWAIS.announce
%%PORTDOCS%%%%DOCSDIR%%/docs/djgpp.key
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
%%PORTDOCS%%%%DOCSDIR%%/docs/pdcurses.key
%%PORTDOCS%%%%DOCSDIR%%/docs/slang.key
%%PORTDOCS%%%%DOCSDIR%%/docs/win-386.announce
%%PORTDOCS%%%%DOCSDIR%%/samples/blue-background.lss
%%PORTDOCS%%%%DOCSDIR%%/samples/bright-blue.lss
%%PORTDOCS%%%%DOCSDIR%%/samples/cernrules.txt
+%%PORTDOCS%%%%DOCSDIR%%/samples/home.htm
+%%PORTDOCS%%%%DOCSDIR%%/samples/index.html
%%PORTDOCS%%%%DOCSDIR%%/samples/installdirs.html
+%%PORTDOCS%%%%DOCSDIR%%/samples/jumps.htm
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsUnix.html
%%PORTDOCS%%%%DOCSDIR%%/samples/jumpsVMS.html
%%PORTDOCS%%%%DOCSDIR%%/samples/keepviewer
+%%PORTDOCS%%%%DOCSDIR%%/samples/lynx-demo.cfg
%%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
%%PORTDOCS%%%%DOCSDIR%%/samples/mailcap
%%PORTDOCS%%%%DOCSDIR%%/samples/mailto-form.pl
+%%PORTDOCS%%%%DOCSDIR%%/samples/midnight.lss
%%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss
%%PORTDOCS%%%%DOCSDIR%%/samples/mime.types
%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx
+%%PORTDOCS%%%%DOCSDIR%%/samples/opaque.lss
%%PORTDOCS%%%%DOCSDIR%%/test/ALT88592.html
%%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
@@ -78,6 +96,7 @@
%%PORTDOCS%%share/lynx_help/COPYING
share/lynx_help/Lynx_users_guide.html
share/lynx_help/about_lynx.html
+share/lynx_help/index.html
share/lynx_help/keystrokes/alt_edit_help.html
share/lynx_help/keystrokes/bashlike_edit_help.html
share/lynx_help/keystrokes/bookmark_help.html
@@ -88,6 +107,7 @@
share/lynx_help/keystrokes/follow_help.html
share/lynx_help/keystrokes/gopher_types_help.html
share/lynx_help/keystrokes/history_help.html
+share/lynx_help/keystrokes/index.html
share/lynx_help/keystrokes/keystroke_help.html
share/lynx_help/keystrokes/movement_help.html
share/lynx_help/keystrokes/option_help.html
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list