Thu Oct 31 22:41:44 2019 UTC ()
(www/emacs-w3m-snapshot)  Fix build, add buildlink3 of semi, and new patch for load-path


(mef)
diff -r1.15 -r1.16 pkgsrc/www/emacs-w3m-snapshot/Makefile
diff -r1.12 -r1.13 pkgsrc/www/emacs-w3m-snapshot/distinfo
diff -r0 -r1.3 pkgsrc/www/emacs-w3m-snapshot/patches/patch-w3mhack.el
cvs diff -r1.15 -r1.16 pkgsrc/www/emacs-w3m-snapshot/Makefile (expand / switch to unified diff)

--- pkgsrc/www/emacs-w3m-snapshot/Makefile 2019/10/21 23:47:07 1.15
+++ pkgsrc/www/emacs-w3m-snapshot/Makefile 2019/10/31 22:41:44 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2019/10/21 23:47:07 mef Exp $ 1# $NetBSD: Makefile,v 1.16 2019/10/31 22:41:44 mef Exp $
2 2
3VERSION= 1.4.632 3VERSION= 1.4.632
4DATE_TIME= 20190920.1116 4DATE_TIME= 20190920.1116
5HASH= c9cdb7e 5HASH= c9cdb7e
6DISTNAME= w3m-el-snapshot_${VERSION}+0.${DATE_TIME}.${HASH} 6DISTNAME= w3m-el-snapshot_${VERSION}+0.${DATE_TIME}.${HASH}
7PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//} 7PKGNAME= ${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME:S/-el-snapshot_/-/:S/+0//:S/.${HASH}//}
8CATEGORIES= www 8CATEGORIES= www
9MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/} 9MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
10EXTRACT_SUFX= .orig.tar.gz 10EXTRACT_SUFX= .orig.tar.gz
11 11
12MAINTAINER= makoto@ki.nu 12MAINTAINER= makoto@ki.nu
13HOMEPAGE= http://emacs-w3m.namazu.org/ 13HOMEPAGE= http://emacs-w3m.namazu.org/
14COMMENT= Emacs frontend for w3m browser 14COMMENT= Emacs frontend for w3m browser
@@ -29,19 +29,20 @@ WRKSRC= ${WRKDIR}/${PKGBASE}-${PKGBASE @@ -29,19 +29,20 @@ WRKSRC= ${WRKDIR}/${PKGBASE}-${PKGBASE
29SUBST_CLASSES+= paths 29SUBST_CLASSES+= paths
30SUBST_MESSAGE.paths= Fixing paths. 30SUBST_MESSAGE.paths= Fixing paths.
31SUBST_STAGE.paths= pre-configure 31SUBST_STAGE.paths= pre-configure
32SUBST_FILES.paths= w3m.el 32SUBST_FILES.paths= w3m.el
33SUBST_SED.paths= -e 's|@W3M@|${PREFIX}/bin/w3m|g' 33SUBST_SED.paths= -e 's|@W3M@|${PREFIX}/bin/w3m|g'
34 34
35BUILD_DEFS+= VARBASE 35BUILD_DEFS+= VARBASE
36BUILD_DEFS+= GAMEDATAMODE 36BUILD_DEFS+= GAMEDATAMODE
37 37
38.include "options.mk" 38.include "options.mk"
39 39
40.include "../../devel/apel/buildlink3.mk" 40.include "../../devel/apel/buildlink3.mk"
41.include "../../devel/flim/buildlink3.mk" 41.include "../../devel/flim/buildlink3.mk"
 42.include "../../devel/semi/buildlink3.mk"
42.include "../../editors/mule-ucs/buildlink3.mk" 43.include "../../editors/mule-ucs/buildlink3.mk"
43 44
44pre-configure: 45pre-configure:
45 cd ${WRKSRC} && autoconf 46 cd ${WRKSRC} && autoconf
46 47
47.include "../../mk/bsd.pkg.mk" 48.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/www/emacs-w3m-snapshot/distinfo (expand / switch to unified diff)

--- pkgsrc/www/emacs-w3m-snapshot/distinfo 2019/10/21 23:47:07 1.12
+++ pkgsrc/www/emacs-w3m-snapshot/distinfo 2019/10/31 22:41:44 1.13
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.12 2019/10/21 23:47:07 mef Exp $ 1$NetBSD: distinfo,v 1.13 2019/10/31 22:41:44 mef Exp $
2 2
3SHA1 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 30b6373819a34000d96d3a81c0260ecf523d2827 3SHA1 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 30b6373819a34000d96d3a81c0260ecf523d2827
4RMD160 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 986ad61041e8f66519a8a72c5664743dd365acf0 4RMD160 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 986ad61041e8f66519a8a72c5664743dd365acf0
5SHA512 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 34dbf0d838fb460cfe9442b140b7083511ba804d4d629ba0417acffca972c108c3a1c40c7fbc9db1b1a669c1a974c6e82bdefe97adf9f3c3ce538102e0648d75 5SHA512 (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 34dbf0d838fb460cfe9442b140b7083511ba804d4d629ba0417acffca972c108c3a1c40c7fbc9db1b1a669c1a974c6e82bdefe97adf9f3c3ce538102e0648d75
6Size (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 1061974 bytes 6Size (w3m-el-snapshot_1.4.632+0.20190920.1116.c9cdb7e.orig.tar.gz) = 1061974 bytes
7SHA1 (patch-Makefile.in) = 5e3c1d6335c72c2644f3b6136dace3358a6ba347 7SHA1 (patch-Makefile.in) = 5e3c1d6335c72c2644f3b6136dace3358a6ba347
8SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83 8SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83
 9SHA1 (patch-w3mhack.el) = 074487089804e8685d53f7cf5918843945990710
File Added: pkgsrc/www/emacs-w3m-snapshot/patches/patch-w3mhack.el
$NetBSD: patch-w3mhack.el,v 1.3 2019/10/31 22:41:44 mef Exp $

CF-SX2# cd /tmp/www/emacs-w3m-snapshot/work/emacs-w3m-emacs-w3m-c9cdb7e/

CF-SX2# emacs -batch -f batch-byte-compile  mime-w3m.el
In toplevel form:
mime-w3m.el:37:1:Error: Cannot open load file: No such file or directory, mime-view
mime-w3m.el:38:1:Error: Cannot open load file: No such file or directory, w3m


--- emacs-w3m-emacs-w3m-c9cdb7e/w3mhack.el.orig	2019-09-20 20:16:36.000000000 +0900
+++ w3mhack.el	2019-10-30 21:16:09.444149861 +0900
@@ -256,6 +256,10@@ There seems to be no shell command which
 	(push (file-name-directory x) paths))
     (if (setq x (locate-library "gnus"))
 	(push (file-name-directory x) paths))
+    (if (setq x (locate-library "mime-view"))
+	(push (file-name-directory x) paths))
+    (if (setq x (locate-library "w3m"))
+	(push (file-name-directory x) paths))
     (let (print-level print-length)
       (princ (mapconcat
 	      (function directory-file-name)