svn commit: r430994 - in branches/2017Q1/www/w3m: . files

Mark Felder feld at FreeBSD.org
Mon Jan 9 18:06:00 UTC 2017 

Author: feld
Date: Mon Jan  9 18:05:58 2017
New Revision: 430994
URL: https://svnweb.freebsd.org/changeset/ports/430994

Log:
  MFH: r430919
  
  - Update to 0.5.3.20170102.
  - Switch to code maintained by the Debian Project.
  - This version fixes multiple vulnerabilities.
  - Add LICENSE.
  - Add NLS option.
  - Change default Japanese character encoding to UTF-8.
  
  PR:		215822
  Reported by:	Daniel <d.stoye at cms.hu-berlin.de>
  Security:	http://www.vuxml.org/freebsd/eafa3aec-211b-4dd4-9b8a-a664a3f0917a.html
  
  Approved by:	ports-secteam (with hat)

Deleted:
  branches/2017Q1/www/w3m/files/
Modified:
  branches/2017Q1/www/w3m/Makefile
  branches/2017Q1/www/w3m/distinfo
  branches/2017Q1/www/w3m/pkg-plist
Directory Properties:
  branches/2017Q1/   (props changed)

Modified: branches/2017Q1/www/w3m/Makefile
==============================================================================
--- branches/2017Q1/www/w3m/Makefile	Mon Jan  9 18:00:35 2017	(r430993)
+++ branches/2017Q1/www/w3m/Makefile	Mon Jan  9 18:05:58 2017	(r430994)
@@ -2,18 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	w3m
-PORTVERSION=	0.5.3
-PORTREVISION=	6
+PORTVERSION=	0.5.3.20170102
 CATEGORIES+=	www ipv6
-MASTER_SITES=	SF/w3m/w3m/w3m-${PORTVERSION}
 
 MAINTAINER?=	nobutaka at FreeBSD.org
 COMMENT?=	Pager/text-based WWW browser
 
-USES=		pkgconfig perl5
-USE_OPENSSL=	yes
+LICENSE=	w3m
+LICENSE_NAME=	w3m
+LICENSE_FILE=	${WRKSRC}/doc/README
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 LIB_DEPENDS=	libgc.so:devel/boehm-gc
 
+USES=		iconv pkgconfig perl5 ssl
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	tats
+GH_PROJECT=	w3m
+GH_TAGNAME=	1ac245b
+
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS?=	ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
@@ -22,28 +30,34 @@ CONFIGURE_ARGS=	--with-gc=${LOCALBASE} \
 		ac_cv_path_PERL=${PERL}
 CONFIGURE_ENV=	DEFS="-I${LOCALBASE}/include"
 
-DOCS=		FAQ.html HISTORY MANUAL.html README \
-		README.dict README.func README.img README.m17n STORY.html \
+DOCS_COMMON=	FAQ.html HISTORY MANUAL.html README README.cookie \
+		README.cygwin README.dict README.func README.img \
+		README.m17n README.mouse README.passwd README.pre_form \
+		README.siteconf README.tab STORY.html \
 		keymap.default keymap.lynx menu.default menu.submenu
-DOCS_JP=	${DOCS} README.SSL README.cookie README.keymap README.img \
+DOCS_DE=	FAQ.html MANUAL.html README.func
+DOCS_EN=	README.sixel
+DOCS_JP=	${DOCS_COMMON} README.SSL README.keymap \
 		README.mailcap README.menu README.migemo
 
-OPTIONS_DEFINE=	JAPANESE INLINE_IMAGE KEY_LYNX DOCS
-JAPANESE_DESC=		Japanese messages and migemo support
+OPTIONS_DEFINE=	INLINE_IMAGE JAPANESE KEY_LYNX DOCS NLS
 INLINE_IMAGE_DESC=	Inline image support
+JAPANESE_DESC=		Japanese messages and migemo support
 KEY_LYNX_DESC=		Keymap like lynx browser
 OPTIONS_SUB=	yes
 
-JAPANESE_USES=	gettext
-JAPANESE_CONFIGURE_ON=	--enable-japanese=E --with-migemo=yes gt_cv_func_gnugettext1_libintl=yes
-JAPANESE_CONFIGURE_ENABLE=	nls
-
-INLINE_IMAGE_USE=	gnome=gtk20
+INLINE_IMAGE_USE=	xorg=x11 gnome=gtk20,gdkpixbuf2
 INLINE_IMAGE_CONFIGURE_ON=	--with-imagelib=gtk2 --enable-image=fb,x11
 INLINE_IMAGE_CONFIGURE_OFF=	--enable-image=no
 
+JAPANESE_CONFIGURE_ON=	--enable-japanese=U --with-migemo=yes
+
 KEY_LYNX_CONFIGURE_ON=	--with-keymap=lynx
 
+NLS_USES=	gettext
+NLS_CONFIGURE_ON=	--enable-nls
+NLS_CONFIGURE_OFF=	--disable-nls
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MINLINE_IMAGE}
@@ -61,6 +75,16 @@ post-patch:
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \
 		-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
+	@${CP} ${WRKSRC}/doc-jp/README.func ${WRKSRC}/README.func.bak
+	@${ICONV_CMD} -f EUC-JP -t UTF-8 ${WRKSRC}/README.func.bak \
+		> ${WRKSRC}/doc-jp/README.func
+	@${CP} ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in \
+		${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in.bak
+	@${ICONV_CMD} -f EUC-JP -t UTF-8 \
+		${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in.bak \
+		> ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in
+	@${REINPLACE_CMD} -e 's|EUC-JP|UTF-8|g' \
+		${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/w3m
@@ -68,11 +92,16 @@ post-install:
 	for i in ${DOCS_JP} ; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/ja/w3m/ ; \
 	done
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/de/w3m
+	@cd ${WRKSRC}/doc-de; \
+	for i in ${DOCS_DE} ; do \
+		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/de/w3m/ ; \
+	done
 	@cd ${WRKSRC}/doc; \
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/w3m/; \
-	for i in ${DOCS} ; do \
+	for i in ${DOCS_COMMON} ${DOCS_EN} ; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/share/doc/w3m/ ; \
 	done
-	@${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1
+	${INSTALL_MAN} ${WRKSRC}/scripts/w3mman/w3mman.1 ${STAGEDIR}${PREFIX}/man/ja/man1
 
 .include <bsd.port.mk>

Modified: branches/2017Q1/www/w3m/distinfo
==============================================================================
--- branches/2017Q1/www/w3m/distinfo	Mon Jan  9 18:00:35 2017	(r430993)
+++ branches/2017Q1/www/w3m/distinfo	Mon Jan  9 18:05:58 2017	(r430994)
@@ -1,4 +1,3 @@
-SHA256 (w3m-0.5.3.tar.gz) = e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3
-SIZE (w3m-0.5.3.tar.gz) = 2202328
-SHA256 (w3m-0.5-version-xhtml.patch) = 3cc144a233f566a4b718eec480f3008bb67b8155ecf10663bb98b0aa47a33796
-SIZE (w3m-0.5-version-xhtml.patch) = 8965
+TIMESTAMP = 1483884967
+SHA256 (tats-w3m-0.5.3.20170102-1ac245b_GH0.tar.gz) = 77b1fc96baeea6ae713dd029cf86b5b4711b4fe1a93487a280ef5cf913b77a18
+SIZE (tats-w3m-0.5.3.20170102-1ac245b_GH0.tar.gz) = 2180133

Modified: branches/2017Q1/www/w3m/pkg-plist
==============================================================================
--- branches/2017Q1/www/w3m/pkg-plist	Mon Jan  9 18:00:35 2017	(r430993)
+++ branches/2017Q1/www/w3m/pkg-plist	Mon Jan  9 18:05:58 2017	(r430994)
@@ -3,6 +3,7 @@ bin/w3mman
 libexec/w3m/cgi-bin/dirlist.cgi
 libexec/w3m/cgi-bin/multipart.cgi
 libexec/w3m/cgi-bin/w3mbookmark
+libexec/w3m/cgi-bin/w3mdict.cgi
 libexec/w3m/cgi-bin/w3mhelp.cgi
 libexec/w3m/cgi-bin/w3mmail.cgi
 libexec/w3m/cgi-bin/w3mman2html.cgi
@@ -10,44 +11,67 @@ libexec/w3m/cgi-bin/w3mhelperpanel
 libexec/w3m/inflate
 libexec/w3m/xface2xpm
 %%INLINE_IMAGE%%libexec/w3m/w3mimgdisplay
-%%JAPANESE%%man/ja/man1/w3m.1.gz
-%%JAPANESE%%man/ja/man1/w3mman.1.gz
+man/ja/man1/w3m.1.gz
+man/ja/man1/w3mman.1.gz
+man/de/man1/w3m.1.gz
+man/de/man1/w3mman.1.gz
 man/man1/w3m.1.gz
 man/man1/w3mman.1.gz
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/FAQ.html
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/HISTORY
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/MANUAL.html
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.SSL
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.cookie
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.dict
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.func
-%%PORTDOCS%%%%JAPANESE%%%%INLINE_IMAGE%%share/doc/ja/w3m/README.img
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.keymap
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.m17n
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.mailcap
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.menu
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/README.migemo
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/STORY.html
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.default
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/keymap.lynx
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.default
-%%PORTDOCS%%%%JAPANESE%%share/doc/ja/w3m/menu.submenu
+%%PORTDOCS%%share/doc/de/w3m/FAQ.html
+%%PORTDOCS%%share/doc/de/w3m/MANUAL.html
+%%PORTDOCS%%share/doc/de/w3m/README.func
+%%PORTDOCS%%share/doc/ja/w3m/FAQ.html
+%%PORTDOCS%%share/doc/ja/w3m/HISTORY
+%%PORTDOCS%%share/doc/ja/w3m/MANUAL.html
+%%PORTDOCS%%share/doc/ja/w3m/README
+%%PORTDOCS%%share/doc/ja/w3m/README.SSL
+%%PORTDOCS%%share/doc/ja/w3m/README.cookie
+%%PORTDOCS%%share/doc/ja/w3m/README.cygwin
+%%PORTDOCS%%share/doc/ja/w3m/README.dict
+%%PORTDOCS%%share/doc/ja/w3m/README.func
+%%PORTDOCS%%share/doc/ja/w3m/README.img
+%%PORTDOCS%%share/doc/ja/w3m/README.keymap
+%%PORTDOCS%%share/doc/ja/w3m/README.m17n
+%%PORTDOCS%%share/doc/ja/w3m/README.mailcap
+%%PORTDOCS%%share/doc/ja/w3m/README.menu
+%%PORTDOCS%%share/doc/ja/w3m/README.migemo
+%%PORTDOCS%%share/doc/ja/w3m/README.mouse
+%%PORTDOCS%%share/doc/ja/w3m/README.passwd
+%%PORTDOCS%%share/doc/ja/w3m/README.pre_form
+%%PORTDOCS%%share/doc/ja/w3m/README.siteconf
+%%PORTDOCS%%share/doc/ja/w3m/README.tab
+%%PORTDOCS%%share/doc/ja/w3m/STORY.html
+%%PORTDOCS%%share/doc/ja/w3m/keymap.default
+%%PORTDOCS%%share/doc/ja/w3m/keymap.lynx
+%%PORTDOCS%%share/doc/ja/w3m/menu.default
+%%PORTDOCS%%share/doc/ja/w3m/menu.submenu
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/MANUAL.html
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.cookie
+%%PORTDOCS%%%%DOCSDIR%%/README.cygwin
 %%PORTDOCS%%%%DOCSDIR%%/README.dict
 %%PORTDOCS%%%%DOCSDIR%%/README.func
-%%PORTDOCS%%%%INLINE_IMAGE%%%%DOCSDIR%%/README.img
+%%PORTDOCS%%%%DOCSDIR%%/README.img
 %%PORTDOCS%%%%DOCSDIR%%/README.m17n
+%%PORTDOCS%%%%DOCSDIR%%/README.mouse
+%%PORTDOCS%%%%DOCSDIR%%/README.passwd
+%%PORTDOCS%%%%DOCSDIR%%/README.pre_form
+%%PORTDOCS%%%%DOCSDIR%%/README.siteconf
+%%PORTDOCS%%%%DOCSDIR%%/README.sixel
+%%PORTDOCS%%%%DOCSDIR%%/README.tab
 %%PORTDOCS%%%%DOCSDIR%%/STORY.html
 %%PORTDOCS%%%%DOCSDIR%%/keymap.default
 %%PORTDOCS%%%%DOCSDIR%%/keymap.lynx
 %%PORTDOCS%%%%DOCSDIR%%/menu.default
 %%PORTDOCS%%%%DOCSDIR%%/menu.submenu
-%%JAPANESE%%share/locale/ja/LC_MESSAGES/w3m.mo
-share/w3m/w3mhelp-funcdesc.en.pl
-share/w3m/w3mhelp-funcdesc.ja.pl
-share/w3m/w3mhelp-funcname.pl
-share/w3m/w3mhelp.html
+%%NLS%%share/locale/de/LC_MESSAGES/w3m.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/w3m.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/w3m.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/w3m.mo
+%%DATADIR%%/w3mhelp-funcdesc.de.pl
+%%DATADIR%%/w3mhelp-funcdesc.en.pl
+%%DATADIR%%/w3mhelp-funcdesc.ja.pl
+%%DATADIR%%/w3mhelp-funcname.pl
+%%DATADIR%%/w3mhelp.html

More information about the svn-ports-branches mailing list