From 57906f47a683a75bd2d260c76a7298a642436471 Mon Sep 17 00:00:00 2001 From: rakuco Date: Thu, 3 Mar 2016 17:07:18 +0000 Subject: Update to 2.8.8rel.2. * Remove files/patch-src-GridText.c. It has been merged officially since 2.8.8dev.9. * Enable JAPANESE_UTF8 by default. * Correct the CPE information. * Make Makefile to have the same style as japanese/lynx-current. PR: 206570 Submitted by: WATANABE Kazuhiro (maintainer) --- japanese/lynx/Makefile | 31 ++++++++++++++++--------------- japanese/lynx/distinfo | 4 ++-- japanese/lynx/files/patch-makefile.in | 17 ++++------------- japanese/lynx/files/patch-src-GridText.c | 31 ------------------------------- japanese/lynx/pkg-plist | 13 ++++++++----- 5 files changed, 30 insertions(+), 66 deletions(-) delete mode 100644 japanese/lynx/files/patch-src-GridText.c (limited to 'japanese/lynx') diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile index 162d33b9ee61..f2fb4c6cb3e1 100644 --- a/japanese/lynx/Makefile +++ b/japanese/lynx/Makefile @@ -3,7 +3,6 @@ PORTNAME= lynx DISTVERSION= ${VERSION}.${MINOR_VERSION:S/.//} -PORTREVISION= 2 CATEGORIES= japanese www ipv6 MASTER_SITES= http://invisible-mirror.net/archives/lynx/tarballs/ DISTNAME= ${PORTNAME}${VERSION}${MINOR_VERSION} @@ -13,40 +12,42 @@ COMMENT= Console WWW client (browser) with multi-byte encoding support LICENSE= GPLv2 -VERSION= 2.8.7 -MINOR_VERSION= rel.1 +VERSION= 2.8.8 +MINOR_VERSION= rel.2 -CONFLICTS= lynx-2.* ja-lynx-2.8.8.* +CONFLICTS= lynx-2.* ja-lynx-2.8.9.* +WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g} USES= cpe ncurses shebangfix tar:bzip2 SHEBANG_FILES= samples/mailto-form.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-screen=ncurses --with-zlib --libdir="${L_LIB}" \ +CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \ --enable-nsl-fork --enable-ipv6 \ --enable-cjk --enable-internal-links \ --with-bzlib MAKE_ARGS= helpdir=${L_HELP} docdir=${DOCSDIR} MAKEFILE= makefile INSTALL_TARGET= install-full +CPE_VERSION= ${PORTVERSION:R} +CPE_UPDATE= ${PORTVERSION:E:S/r/rel./} -WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g} L_LIB= ${PREFIX}/etc L_HELP= ${PREFIX}/share/lynx_help -MAKE_JOBS_UNSAFE=yes - -OPTIONS_DEFINE= JAPANESE_UTF8 COLOR_STYLE DEFAULT_COLORS DOCS +OPTIONS_DEFINE= COLOR_STYLE DEFAULT_COLORS DOCS JAPANESE_UTF8 +OPTIONS_DEFAULT=JAPANESE_UTF8 OPTIONS_SUB= yes -JAPANESE_UTF8_DESC= Experimental Japanese UTF-8 logic -COLOR_STYLE_DESC= Color style (ncurses/curses) -DEFAULT_COLORS_DESC= Default colors (ncurses/slang) +COLOR_STYLE_DESC= Optional color style support +COLOR_STYLE_CONFIGURE_ENABLE= color-style -JAPANESE_UTF8_USES= iconv +DEFAULT_COLORS_DESC= Default-color background support (ncurses) +DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors + +JAPANESE_UTF8_DESC= Experimental Japanese UTF-8 logic support JAPANESE_UTF8_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} JAPANESE_UTF8_CONFIGURE_ENABLE= japanese-utf8 -COLOR_STYLE_CONFIGURE_ENABLE= color-style -DEFAULT_COLORS_CONFIGURE_ENABLE=default-colors +JAPANESE_UTF8_USES= iconv # Change "cd foo && $(MAKE_RECUR)" into "$(MAKE_RECUR) -C foo" to unbreak # parallel builds diff --git a/japanese/lynx/distinfo b/japanese/lynx/distinfo index 6a579f83c46b..3cc02e4c774b 100644 --- a/japanese/lynx/distinfo +++ b/japanese/lynx/distinfo @@ -1,2 +1,2 @@ -SHA256 (lynx2.8.7rel.1.tar.bz2) = 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad -SIZE (lynx2.8.7rel.1.tar.bz2) = 2432045 +SHA256 (lynx2.8.8rel.2.tar.bz2) = 6980e75cf0d677fd52c116e2e0dfd3884e360970c88c8356a114338500d5bee7 +SIZE (lynx2.8.8rel.2.tar.bz2) = 2587120 diff --git a/japanese/lynx/files/patch-makefile.in b/japanese/lynx/files/patch-makefile.in index 2bc4acc98340..711c498c83ef 100644 --- a/japanese/lynx/files/patch-makefile.in +++ b/japanese/lynx/files/patch-makefile.in @@ -1,15 +1,6 @@ ---- makefile.in.orig 2008-09-22 00:49:47.000000000 +0200 -+++ makefile.in 2014-05-18 13:31:04.012681258 +0200 -@@ -319,7 +319,7 @@ - fi' - $(SHELL) -c 'for name in COPYING COPYHEADER; do \ - cd $(HELPDIR) && rm -f $$name ;\ -- cd $(HELPDIR) && ( $(LN_S) $(DOCDIR)/$$name . || cp $(DOCDIR)/$$name . );\ -+ cd $(HELPDIR) && ( $(LN_S) $(docdir)/$$name . || cp $(DOCDIR)/$$name . );\ - done' - -$(SHELL) -c 'case `id|sed -e "s/(.*//"` in uid=0) chown -R root $(DOCDIR);; esac' - -@@ -396,8 +396,8 @@ +--- makefile.in.orig 2014-03-10 06:43:10.000000000 +0900 ++++ makefile.in 2015-11-28 14:46:42.000000000 +0900 +@@ -421,8 +421,8 @@ $(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)!' \ @@ -20,7 +11,7 @@ -rm -f $(SYSCONFDIR)/lynx.tmp LYHelp.h : help_files.sed $(srcdir)/LYHelp.hin -@@ -420,10 +420,9 @@ +@@ -445,10 +445,9 @@ $(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)' install-cfg : $(SYSCONFDIR) diff --git a/japanese/lynx/files/patch-src-GridText.c b/japanese/lynx/files/patch-src-GridText.c deleted file mode 100644 index c52a8430dab0..000000000000 --- a/japanese/lynx/files/patch-src-GridText.c +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 --git a/japanese/lynx/pkg-plist b/japanese/lynx/pkg-plist index 602f49ef4abb..0cc4cad60c42 100644 --- a/japanese/lynx/pkg-plist +++ b/japanese/lynx/pkg-plist @@ -26,6 +26,7 @@ man/man1/lynx.1.gz %%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 @@ -33,7 +34,6 @@ man/man1/lynx.1.gz %%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 @@ -41,7 +41,6 @@ man/man1/lynx.1.gz %%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 @@ -61,36 +60,41 @@ man/man1/lynx.1.gz %%PORTDOCS%%%%DOCSDIR%%/samples/mild-colors.lss %%PORTDOCS%%%%DOCSDIR%%/samples/mime.types %%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx +%%PORTDOCS%%%%DOCSDIR%%/samples/oldlynx.bat %%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/X %%PORTDOCS%%%%DOCSDIR%%/test/bad-html.html %%PORTDOCS%%%%DOCSDIR%%/test/c1.html +%%PORTDOCS%%%%DOCSDIR%%/test/circle.html %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252.html %%PORTDOCS%%%%DOCSDIR%%/test/cp-1252a.html -%%PORTDOCS%%%%DOCSDIR%%/test/index.html +%%PORTDOCS%%%%DOCSDIR%%/test/image.jpg %%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/nobody %%PORTDOCS%%%%DOCSDIR%%/test/quickbrown.html %%PORTDOCS%%%%DOCSDIR%%/test/raw8bit.html %%PORTDOCS%%%%DOCSDIR%%/test/sgml.html %%PORTDOCS%%%%DOCSDIR%%/test/spaces.html %%PORTDOCS%%%%DOCSDIR%%/test/special_urls.html +%%PORTDOCS%%%%DOCSDIR%%/test/square.html %%PORTDOCS%%%%DOCSDIR%%/test/tabtest.html %%PORTDOCS%%%%DOCSDIR%%/test/tags.html %%PORTDOCS%%%%DOCSDIR%%/test/test-styles.html +%%PORTDOCS%%%%DOCSDIR%%/test/triangle.html %%PORTDOCS%%%%DOCSDIR%%/test/unicode.html %%PORTDOCS%%%%DOCSDIR%%/test/utf-8-demo.html %%PORTDOCS%%share/lynx_help/COPYHEADER %%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 @@ -101,7 +105,6 @@ share/lynx_help/keystrokes/environments.html 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 -- cgit