CVS commit: pkgsrc/mail/notmuch

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Mar  8 18:27:31 UTC 2019

Modified Files:
        pkgsrc/mail/notmuch: Makefile PLIST distinfo
Added Files:
        pkgsrc/mail/notmuch/patches: patch-emacs_Makefile.local

Log Message:
Fix emacs option case

* Fix PLIST for notmuch-emacs option
* Install notmuch-emacs-mua script properly in notmuch-emacs case


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/mail/notmuch/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mail/notmuch/PLIST
cvs rdiff -u -r1.36 -r1.37 pkgsrc/mail/notmuch/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/notmuch/patches/patch-emacs_Makefile.local

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/notmuch/Makefile
diff -u pkgsrc/mail/notmuch/Makefile:1.43 pkgsrc/mail/notmuch/Makefile:1.44
--- pkgsrc/mail/notmuch/Makefile:1.43   Sun Feb 24 10:42:15 2019
+++ pkgsrc/mail/notmuch/Makefile        Fri Mar  8 18:27:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/02/24 10:42:15 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2019/03/08 18:27:31 ryoon Exp $
 
 DISTNAME=      notmuch-0.28.2
 CATEGORIES=    mail
@@ -18,6 +18,8 @@ MAKE_FLAGS+=  PYTHON=${PYTHONBIN}
 INFO_FILES=    yes
 #TEST_TARGET=  check
 
+REPLACE_BASH+= emacs/notmuch-emacs-mua
+
 .include "options.mk"
 
 CONFIGURE_ARGS+=       --prefix=${PREFIX}

Index: pkgsrc/mail/notmuch/PLIST
diff -u pkgsrc/mail/notmuch/PLIST:1.12 pkgsrc/mail/notmuch/PLIST:1.13
--- pkgsrc/mail/notmuch/PLIST:1.12      Sat Dec  1 11:38:12 2018
+++ pkgsrc/mail/notmuch/PLIST   Fri Mar  8 18:27:31 2019
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2018/12/01 11:38:12 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/03/08 18:27:31 ryoon Exp $
 bin/notmuch
+${PLIST.emacs}bin/notmuch-emacs-mua
 include/notmuch.h
 info/notmuch-address.info
 info/notmuch-compact.info
@@ -46,8 +47,14 @@ ${PLIST.emacs}share/emacs/site-lisp/cool
 ${PLIST.emacs}share/emacs/site-lisp/coolj.elc
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-address.el
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-address.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-company.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-company.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-compat.elc
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.el
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-crypto.elc
+${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.el
+${PLIST.emacs}share/emacs/site-lisp/notmuch-draft.elc
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.el
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-hello.elc
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-jump.el
@@ -79,5 +86,7 @@ ${PLIST.emacs}share/emacs/site-lisp/notm
 ${PLIST.emacs}share/emacs/site-lisp/notmuch-wash.elc
 ${PLIST.emacs}share/emacs/site-lisp/notmuch.el
 ${PLIST.emacs}share/emacs/site-lisp/notmuch.elc
+${PLIST.emacs}share/applications/mimeinfo.cache
+${PLIST.emacs}share/applications/notmuch-emacs-mua.desktop
 share/zsh/functions/Completion/Unix/_notmuch
 share/zsh/functions/Completion/Unix/_email-notmuch

Index: pkgsrc/mail/notmuch/distinfo
diff -u pkgsrc/mail/notmuch/distinfo:1.36 pkgsrc/mail/notmuch/distinfo:1.37
--- pkgsrc/mail/notmuch/distinfo:1.36   Sun Feb 24 10:42:15 2019
+++ pkgsrc/mail/notmuch/distinfo        Fri Mar  8 18:27:31 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2019/02/24 10:42:15 wiz Exp $
+$NetBSD: distinfo,v 1.37 2019/03/08 18:27:31 ryoon Exp $
 
 SHA1 (notmuch-0.28.2.tar.gz) = 83ef6c1eac206946ff611d0974e763b94ff57ef0
 RMD160 (notmuch-0.28.2.tar.gz) = b4b0484168344881c2c58b3872923ad7c8019533
@@ -7,3 +7,4 @@ Size (notmuch-0.28.2.tar.gz) = 921580 by
 SHA1 (patch-Makefile.global) = f436bdb163e3110a8d097f3c88198aefb126eafc
 SHA1 (patch-Makefile.local) = d0a83ff130de36164f1667236860aa31d481d025
 SHA1 (patch-doc_conf.py) = 7492c878c96da68df16827aa0d6407c2e9808701
+SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c

Added files:

Index: pkgsrc/mail/notmuch/patches/patch-emacs_Makefile.local
diff -u /dev/null pkgsrc/mail/notmuch/patches/patch-emacs_Makefile.local:1.1
--- /dev/null   Fri Mar  8 18:27:31 2019
+++ pkgsrc/mail/notmuch/patches/patch-emacs_Makefile.local      Fri Mar  8 18:27:31 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-emacs_Makefile.local,v 1.1 2019/03/08 18:27:31 ryoon Exp $
+
+* Do not replace bash with buildlinked one. This is pkgsrc-specific.
+
+--- emacs/Makefile.local.orig  2019-02-17 11:32:59.000000000 +0000
++++ emacs/Makefile.local
+@@ -111,7 +111,7 @@ endif
+       install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)"
+       mkdir -p "$(DESTDIR)$(prefix)/bin/"
+ ifeq ($(HAVE_BASH),1)
+-      sed "1s|^#!.*|#! $(BASH_ABSOLUTE)|" < $(emacs_mua) > $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua
++      ${BSD_INSTALL_SCRIPT} $(emacs_mua) $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua
+       chmod 755 $(DESTDIR)$(prefix)/bin/notmuch-emacs-mua
+ endif
+ ifeq ($(WITH_DESKTOP),1)