Updated w3m to 0.5.3.0.20161031.

Switch from dead sourceforge original to debian-maintained github version.

* new features
 - support OSC 5379 remote imaging and sixel graphics
 - support SGR style mouse handler
 - support 32-bit color images
 - support FreeBSD framebuffer
 - support button element
 - support meta charset
 - add extbrowser4..9
 - add display_borders to display 0 pixel table borders
 - add siteconf feature
 - add German translation for options setting panel
 - add translations for de, zh_CN and zh_TW
* bug fixes
 - fix segfaults with malformed text
 - disable SSLv2 and SSLv3 by default [CVE-2014-3566]
 - set ssl_verify_server to 1 by default
 - disable RC4, export ciphers, and keys < 128 bits
 - use SSL_OP_NO_COMPRESSION due to "CRIME attack" [CVE-2012-4929]
 - use SSL_MODE_RELEASE_BUFFERS
 - disable USE_EGD for LibreSSL
 - appease gcc -Werror=format-security
 - option -s is now "squeeze multiple blank lines" to work as pager, and
   -j and -e are obsolete, so use -O{s|j|e} to specify display charset
 - accept single quoted meta refresh URL
 - assume "text" if a form input type is unknown
 - accept cookies by default
 - set use_dictcommand to 1 by default
 - set default_url to 1 by default
 - set argv_is_url to 1 by default
 - set alt_entity to 0 by default
 - fix build problems with Boehm GC 7.2, imlib2 1.4.6 and glibc 2.14
 - fix parallel make failure
 - fix incorrect ucs_ambwidth_map
 - and many fixes

6 files changed, 33 insertions, 42 deletions

diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index 4debcae7088..81e6a43c550 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2016/08/03 10:23:32 adam Exp $
+# $NetBSD: Makefile,v 1.78 2016/11/06 19:26:35 wiz Exp $
 
-PKGNAME=	w3m-${W3M_VERS}
-PKGREVISION=	18
+PKGNAME=	w3m-${W3M_PKGVERS}
 COMMENT=	Multilingualized version of a pager/text-based browser w3m
 
 CONFLICTS+=	w3m-img-[0-9]*
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index eac925d56ef..f8510527a91 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile.common,v 1.61 2014/10/09 14:07:12 wiz Exp $
+# $NetBSD: Makefile.common,v 1.62 2016/11/06 19:26:35 wiz Exp $
 #
 # used by www/w3m/Makefile
 # used by www/w3m-img/Makefile
 
 DISTNAME=	w3m-${W3M_VERS}
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=w3m/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=tats/}
+GITHUB_TAG=	v${W3M_VERS}
 
 MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://w3m.sourceforge.net/
+# or https://github.com/tats/w3m
+# or https://packages.qa.debian.org/w/w3m.html
 
-MAKE_JOBS_SAFE=		no
+WRKSRC=		${WRKDIR}/w3m-${W3M_VERS:S/+/-/}
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
@@ -18,7 +21,8 @@ USE_TOOLS+=	gmake	# Needed for some combinations of options...
 USE_TOOLS+=	msgfmt
 USE_PKGLOCALEDIR=	yes
 
-W3M_VERS=	0.5.3
+W3M_VERS=	0.5.3+git20161031
+W3M_PKGVERS=	${W3M_VERS:S/+git/.0./}
 
 # For w3mman, xface2xpm, cgi scripts.
 USE_TOOLS+=	perl:run pax
@@ -63,11 +67,6 @@ SUBST_STAGE.fh=		post-patch
 SUBST_FILES.fh=		istream.*
 SUBST_SED.fh=		-e 's/file_handle/file_handle_rofl/g'
 
-post-extract:
-	cd ${WRKSRC}/doc && ${RM} -fr CVS
-	cd ${WRKSRC}/doc-jp && ${RM} -fr CVS
-	cd ${WRKSRC} && ${RM} -fr gc
-
 INSTALLATION_DIRS+=	${DOCDIR}
 
 INSTALL_TARGET=		install install-helpfile
diff --git a/www/w3m/PLIST b/www/w3m/PLIST
index c456352852e..374f4b29784 100644
--- a/www/w3m/PLIST
+++ b/www/w3m/PLIST
@@ -1,16 +1,18 @@
-@comment $NetBSD: PLIST,v 1.16 2011/01/21 23:34:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/11/06 19:26:35 wiz Exp $
 bin/w3m
 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/w3mhelperpanel
-${PLIST.image}libexec/w3m/w3mimgdisplay
 libexec/w3m/cgi-bin/w3mmail.cgi
 libexec/w3m/cgi-bin/w3mman2html.cgi
 libexec/w3m/inflate
 libexec/w3m/xface2xpm
+man/de/man1/w3m.1
+man/de/man1/w3mman.1
 man/ja_JP.eucJP/man1/w3m.1
 man/man1/w3m.1
 man/man1/w3mman.1
@@ -32,6 +34,7 @@ share/doc/w3m/doc-jp/README.migemo
 share/doc/w3m/doc-jp/README.mouse
 share/doc/w3m/doc-jp/README.passwd
 share/doc/w3m/doc-jp/README.pre_form
+share/doc/w3m/doc-jp/README.siteconf
 share/doc/w3m/doc-jp/README.tab
 share/doc/w3m/doc-jp/STORY.html
 share/doc/w3m/doc-jp/keymap.default
@@ -51,13 +54,19 @@ share/doc/w3m/doc/README.m17n
 share/doc/w3m/doc/README.mouse
 share/doc/w3m/doc/README.passwd
 share/doc/w3m/doc/README.pre_form
+share/doc/w3m/doc/README.siteconf
+share/doc/w3m/doc/README.sixel
 share/doc/w3m/doc/README.tab
 share/doc/w3m/doc/STORY.html
 share/doc/w3m/doc/keymap.default
 share/doc/w3m/doc/keymap.lynx
 share/doc/w3m/doc/menu.default
 share/doc/w3m/doc/menu.submenu
+share/locale/de/LC_MESSAGES/w3m.mo
 share/locale/ja/LC_MESSAGES/w3m.mo
+share/locale/zh_CN/LC_MESSAGES/w3m.mo
+share/locale/zh_TW/LC_MESSAGES/w3m.mo
+share/w3m/w3mhelp-funcdesc.de.pl
 share/w3m/w3mhelp-funcdesc.en.pl
 share/w3m/w3mhelp-funcdesc.ja.pl
 share/w3m/w3mhelp-funcname.pl
diff --git a/www/w3m/distinfo b/www/w3m/distinfo
index 0e79f15b72e..62a5ae38076 100644
--- a/www/w3m/distinfo
+++ b/www/w3m/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.26 2015/11/04 02:47:41 agc Exp $
+$NetBSD: distinfo,v 1.27 2016/11/06 19:26:35 wiz Exp $
 
-SHA1 (w3m-0.5.3.tar.gz) = 444b6c8cf7094ee95f8e9de96b37f814b9d83237
-RMD160 (w3m-0.5.3.tar.gz) = 6a0153bc53f7c107c700404262ce1b4d02e6dd91
-SHA512 (w3m-0.5.3.tar.gz) = 43508c76d07b4d8f19c19f975c0b870aeb94abf0744b6128ee01c759d4e409a8b57bc866baeaf990f309ff73e9a7b02ca455d272b1dd0a93fafb8c72b1fe6d14
-Size (w3m-0.5.3.tar.gz) = 2202328 bytes
-SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932
-SHA1 (patch-ab) = e1264e0b5e0dc2a1aaf7cc1e6067afd556792dd4
-SHA1 (patch-ac) = 37c6c78a208c50876641aa90164cc46106403260
-SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa
-SHA1 (patch-al) = 8b393004eed249449151d1f2b9252fcb1b55922d
-SHA1 (patch-scripts_w3mman_w3mman2html.cgi.in) = 344f21307a6a439cfe25d80a7b31da7051522f31
+SHA1 (w3m-0.5.3+git20161031.tar.gz) = 99f0ac7f9172d4b6e0ba6808521158b5a2e662ff
+RMD160 (w3m-0.5.3+git20161031.tar.gz) = ec7c26dbc62b962317656e571eaa4ba4451b4f11
+SHA512 (w3m-0.5.3+git20161031.tar.gz) = 7291b5c0266f9928ecca5eb2ff92e40a5b10ef8e0718c0df513857206f89289f5c6d7a2b29b84013b0f5b215acb9c3c1cdaa04db391a9a771fb1549068ebc928
+Size (w3m-0.5.3+git20161031.tar.gz) = 2176157 bytes
+SHA1 (patch-ab) = f5b89ea9b204847a141c5248db8a0488ea457f51
diff --git a/www/w3m/options.mk b/www/w3m/options.mk
index 7747ffb7300..d240e6d60f2 100644
--- a/www/w3m/options.mk
+++ b/www/w3m/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2015/11/25 12:54:07 jperkin Exp $
+# $NetBSD: options.mk,v 1.15 2016/11/06 19:26:35 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.w3m
 PKG_SUPPORTED_OPTIONS=	inet6 migemo w3m-lynx-key
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=	inet6
 
 .if ${_W3M_USE_IMAGE} == "YES"
 PKG_OPTIONS_REQUIRED_GROUPS+=	imagelib
-PKG_SUGGESTED_OPTIONS+=		w3m-image-gdk-pixbuf
+PKG_SUGGESTED_OPTIONS+=		w3m-image-gtk2
 .else
 PKG_OPTIONS_OPTIONAL_GROUPS+=	imagelib
 .endif
diff --git a/www/w3m/patches/patch-ab b/www/w3m/patches/patch-ab
index 63885677c27..861517cab85 100644
--- a/www/w3m/patches/patch-ab
+++ b/www/w3m/patches/patch-ab
@@ -1,21 +1,10 @@
-$NetBSD: patch-ab,v 1.12 2012/05/30 06:42:34 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2016/11/06 19:26:35 wiz Exp $
 
-First chunk: adapt for gc-7.2 API change.
-Second chunk: suspend the job w3m belongs to, not w3m only.
+Suspend the job w3m belongs to, not w3m only.
 
---- main.c.orig	2011-01-04 09:42:19.000000000 +0000
+--- main.c.orig	2016-10-31 11:28:45.000000000 +0000
 +++ main.c
-@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp)
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
--    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+    orig_GC_warn_proc = GC_get_warn_proc();
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */
-@@ -2517,7 +2518,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Stop loa
+@@ -2619,7 +2620,17 @@ DEFUN(susp, INTERRUPT SUSPEND, "Suspend 
  	shell = "/bin/sh";
      system(shell);
  #else				/* SIGSTOP */