From owner-svn-ports-head@freebsd.org Thu Mar 3 17:07:20 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C53ACA93DC9; Thu, 3 Mar 2016 17:07:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 75B6F10A; Thu, 3 Mar 2016 17:07:20 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u23H7JpF027878; Thu, 3 Mar 2016 17:07:19 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23H7JHq027874; Thu, 3 Mar 2016 17:07:19 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201603031707.u23H7JHq027874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 3 Mar 2016 17:07:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410062 - in head/japanese/lynx: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Mar 2016 17:07:21 -0000 Author: rakuco Date: Thu Mar 3 17:07:18 2016 New Revision: 410062 URL: https://svnweb.freebsd.org/changeset/ports/410062 Log: 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) Deleted: head/japanese/lynx/files/patch-src-GridText.c Modified: head/japanese/lynx/Makefile head/japanese/lynx/distinfo head/japanese/lynx/files/patch-makefile.in head/japanese/lynx/pkg-plist Modified: head/japanese/lynx/Makefile ============================================================================== --- head/japanese/lynx/Makefile Thu Mar 3 17:00:55 2016 (r410061) +++ head/japanese/lynx/Makefile Thu Mar 3 17:07:18 2016 (r410062) @@ -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) wi 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 Modified: head/japanese/lynx/distinfo ============================================================================== --- head/japanese/lynx/distinfo Thu Mar 3 17:00:55 2016 (r410061) +++ head/japanese/lynx/distinfo Thu Mar 3 17:07:18 2016 (r410062) @@ -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 Modified: head/japanese/lynx/files/patch-makefile.in ============================================================================== --- head/japanese/lynx/files/patch-makefile.in Thu Mar 3 17:00:55 2016 (r410061) +++ head/japanese/lynx/files/patch-makefile.in Thu Mar 3 17:07:18 2016 (r410062) @@ -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) Modified: head/japanese/lynx/pkg-plist ============================================================================== --- head/japanese/lynx/pkg-plist Thu Mar 3 17:00:55 2016 (r410061) +++ head/japanese/lynx/pkg-plist Thu Mar 3 17:07:18 2016 (r410062) @@ -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. 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