(www/emacs-w3m-snapshot) Updated from 1.4.625+0.20180518 to 1.4.632+0.20190920.1116

(upstream)
  ChangeLog has too many lines, sorry to omit
(pkgsrc)
  - Some VARIABLES introduced to ease further version update
  - following two patches dropped
    (patch-w3mhack.el)
       Compile mew-shimbun.el and mew-w3m.el when
       emacs-w3m-mew option is set.
    (patch-aclocal.m4)
       Don't quote ${EGREP}, it may be set to "grep -E".
   - (pkglint) LOCALBASE -> PREFIX

5 files changed, 26 insertions, 24 deletions

diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile
index e7403ee8e24..3be86c9619e 100644
--- a/www/emacs-w3m-snapshot/Makefile
+++ b/www/emacs-w3m-snapshot/Makefile
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.14 2018/06/25 13:39:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/10/21 23:47:07 mef Exp $
 
-DISTNAME=	w3m-el-snapshot_1.4.625+0.20180518.orig
-PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.orig//}
+VERSION=	1.4.632
+DATE_TIME=	20190920.1116
+HASH=		c9cdb7e
+DISTNAME=	w3m-el-snapshot_${VERSION}+0.${DATE_TIME}.${HASH}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
+EXTRACT_SUFX=	.orig.tar.gz
 
 MAINTAINER=	makoto@ki.nu
 HOMEPAGE=	http://emacs-w3m.namazu.org/
@@ -20,13 +24,13 @@ CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ENV+=		GAMEOWN=${GAMES_USER}
 BUILD_TARGET=
-WRKSRC=			${WRKDIR}/${DISTNAME:S/_/-/}
+WRKSRC=			${WRKDIR}/${PKGBASE}-${PKGBASE}-${HASH}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	w3m.el
-SUBST_SED.paths=	-e 's|@W3M@|${LOCALBASE}/bin/w3m|g'
+SUBST_SED.paths=	-e 's|@W3M@|${PREFIX}/bin/w3m|g'
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
diff --git a/www/emacs-w3m-snapshot/PLIST b/www/emacs-w3m-snapshot/PLIST
index eddc82b3c31..9e021b29a01 100644
--- a/www/emacs-w3m-snapshot/PLIST
+++ b/www/emacs-w3m-snapshot/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.9 2018/06/25 13:39:14 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/10/21 23:47:07 mef Exp $
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
+${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/.dir-locals.el
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/bookmark-w3m.el
@@ -289,8 +290,8 @@ ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-bookmark.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-bug.elc
-${EMACS_LISPPREFIX}/w3m/w3m-ccl.el.gz
-${EMACS_LISPPREFIX}/w3m/w3m-ccl.elc
+${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ccl.el.gz
+${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ccl.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-cookie.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-dtree.el.gz
@@ -331,7 +332,6 @@ ${EMACS_LISPPREFIX}/w3m/w3m-symbol.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-symbol.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.el.gz
 ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.elc
-${NOTFOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.el.gz
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-util.el.gz
diff --git a/www/emacs-w3m-snapshot/buildlink3.mk b/www/emacs-w3m-snapshot/buildlink3.mk
index beb74979640..66f6049c35e 100644
--- a/www/emacs-w3m-snapshot/buildlink3.mk
+++ b/www/emacs-w3m-snapshot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/08/05 22:17:58 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/10/21 23:47:07 mef Exp $
 #
 
 BUILDLINK_TREE+=	emacs-w3m
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	emacs-w3m
 .if !defined(EMACS_W3M_BUILDLINK3_MK)
 EMACS_W3M_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.emacs-w3m+=	${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4.364
+BUILDLINK_API_DEPENDS.emacs-w3m+=	${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4.50
 BUILDLINK_PKGSRCDIR.emacs-w3m?=		../../www/emacs-w3m-snapshot
 
 BUILDLINK_CONTENTS_FILTER.emacs-w3m=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/www/emacs-w3m-snapshot/distinfo b/www/emacs-w3m-snapshot/distinfo
index d22e1d5e1c7..4a9cea0c659 100644
--- a/www/emacs-w3m-snapshot/distinfo
+++ b/www/emacs-w3m-snapshot/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.11 2018/10/31 14:56:40 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2019/10/21 23:47:07 mef Exp $
 
-SHA1 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 0480c9ed27d5a7868620e974e0ad45aed2ce5f70
-RMD160 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 1e1b5e432363cdb0936a5e5bdc9be3f469c2d3b4
-SHA512 (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 096af0ba934759cf45ab6003c23efc6e94965c445de15315bdaa83850c62f1a2073dfa81d63f6c313d945350e9451a11002b19d20686f34502bac81526b9dd1f
-Size (w3m-el-snapshot_1.4.625+0.20180518.orig.tar.gz) = 1090189 bytes
-SHA1 (patch-Makefile.in) = 32cb48754433fc10ad598352c697b3df31d7d11c
-SHA1 (patch-aclocal.m4) = b89d7c2457a0190f4e4439b3dc2fe8832dfde21b
+SHA1 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 30b6373819a34000d96d3a81c0260ecf523d2827
+RMD160 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 986ad61041e8f66519a8a72c5664743dd365acf0
+SHA512 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 34dbf0d838fb460cfe9442b140b7083511ba804d4d629ba0417acffca972c108c3a1c40c7fbc9db1b1a669c1a974c6e82bdefe97adf9f3c3ce538102e0648d75
+Size (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 1061974 bytes
+SHA1 (patch-Makefile.in) = 5e3c1d6335c72c2644f3b6136dace3358a6ba347
 SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83
-SHA1 (patch-w3mhack.el) = ecb7448d7f79b37e2b3229e11f9079062728ebf7
diff --git a/www/emacs-w3m-snapshot/patches/patch-Makefile.in b/www/emacs-w3m-snapshot/patches/patch-Makefile.in
index 608551d2dd2..3b42ac72864 100644
--- a/www/emacs-w3m-snapshot/patches/patch-Makefile.in
+++ b/www/emacs-w3m-snapshot/patches/patch-Makefile.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.2 2018/06/25 13:39:14 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2019/10/21 23:47:07 mef Exp $
 
 Compile mew-shimbun.el and mew-w3m.el when
 emacs-w3m-mew option is set.
 
---- Makefile.in.orig	2018-01-18 15:17:17.000000000 +0000
-+++ Makefile.in
-@@ -42,7 +42,7 @@ all-ja: lisp info-ja
+--- Makefile.in.orig	2019-10-22 08:10:29.179504546 +0900
++++ Makefile.in	2019-10-22 08:10:55.347577083 +0900
+@@ -35,7 +35,7 @@ all-ja: lisp info-ja
  lisp: Makefile
  	env test ! -f w3m-util.elc -o w3m-util.elc -nt w3m-util.el || $(MAKE) clean
  	env test ! -f w3m-proc.elc -o w3m-proc.elc -nt w3m-proc.el || $(MAKE) clean
--	$(XEMACSDEBUG) '$(EMACS)' $(FLAGS) -f w3mhack-compile
+-	'$(EMACS)' $(FLAGS) -f w3mhack-compile
 +	$(MAKE_ENV) '$(EMACS)' $(FLAGS) -f w3mhack-compile
  
  # `w3mhack-what-where' respects DESTDIR