Wed Mar 25 11:06:19 2020 UTC ()
notmuch: Reuse GPGME_GPG variable rather than inventing our own.

Not only cleaner, but also fixes a build issue seen on macOS likely related to
variable definition ordering, where GPG was not set correctly and ended up
trying to use a non-existent "gpg" command.  This change has the added benefit
of using the full path to the gpg binary instead of relying on PATH.


(jperkin)
diff -r1.56 -r1.57 pkgsrc/mail/notmuch/Makefile
diff -r1.43 -r1.44 pkgsrc/mail/notmuch/distinfo
diff -r1.1 -r1.2 pkgsrc/mail/notmuch/patches/patch-configure
cvs diff -r1.56 -r1.57 pkgsrc/mail/notmuch/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/Makefile 2020/03/08 16:47:54 1.56
+++ pkgsrc/mail/notmuch/Makefile 2020/03/25 11:06:19 1.57
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.56 2020/03/08 16:47:54 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2020/03/25 11:06:19 jperkin Exp $
2 2
3DISTNAME= notmuch-0.29.3 3DISTNAME= notmuch-0.29.3
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= https://notmuchmail.org/releases/ 6MASTER_SITES= https://notmuchmail.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://notmuchmail.org/ 10HOMEPAGE= https://notmuchmail.org/
11COMMENT= Mail indexer 11COMMENT= Mail indexer
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
@@ -28,37 +28,31 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/inf @@ -28,37 +28,31 @@ CONFIGURE_ARGS+= --infodir=${PREFIX}/inf
28CONFIGURE_ARGS+= --without-ruby 28CONFIGURE_ARGS+= --without-ruby
29 29
30SUBST_CLASSES.SunOS+= gnuld 30SUBST_CLASSES.SunOS+= gnuld
31SUBST_STAGE.gnuld= pre-configure 31SUBST_STAGE.gnuld= pre-configure
32SUBST_FILES.gnuld= lib/Makefile.local 32SUBST_FILES.gnuld= lib/Makefile.local
33SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g' 33SUBST_SED.gnuld= -e 's/-Wl,--[^ ]*//g'
34 34
35SUBST_CLASSES+= sphinx 35SUBST_CLASSES+= sphinx
36SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX}," 36SUBST_SED.sphinx+= -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
37SUBST_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local 37SUBST_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local
38SUBST_STAGE.sphinx= pre-configure 38SUBST_STAGE.sphinx= pre-configure
39SUBST_MESSAGE.sphinx= Fix sphinx command names. 39SUBST_MESSAGE.sphinx= Fix sphinx command names.
40 40
41.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2) 
42GPG= gpg2 
43.else 
44GPG= gpg 
45.endif 
46 
47SUBST_CLASSES+= gpg 41SUBST_CLASSES+= gpg
48SUBST_STAGE.gpg= pre-configure 42SUBST_STAGE.gpg= pre-configure
49SUBST_MESSAGE.gpg= Select GnuPG command 43SUBST_MESSAGE.gpg= Select GnuPG command
50SUBST_FILES.gpg+= configure 44SUBST_FILES.gpg+= configure
51SUBST_VARS.gpg= GPG 45SUBST_VARS.gpg= GPGME_GPG
52 46
53LDFLAGS.SunOS+= -lnsl 47LDFLAGS.SunOS+= -lnsl
54 48
55post-extract: 49post-extract:
56 ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt 50 ${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
57 51
58.include "../../lang/python/application.mk" 52.include "../../lang/python/application.mk"
59BUILDLINK_API_DEPENDS.gmime3+= gmime3>=3.0.3 53BUILDLINK_API_DEPENDS.gmime3+= gmime3>=3.0.3
60.include "../../mail/gmime3/buildlink3.mk" 54.include "../../mail/gmime3/buildlink3.mk"
61BUILDLINK_API_DEPENDS.xapian+= xapian>=1.4 55BUILDLINK_API_DEPENDS.xapian+= xapian>=1.4
62.include "../../textproc/xapian/buildlink3.mk" 56.include "../../textproc/xapian/buildlink3.mk"
63.include "../../devel/talloc/buildlink3.mk" 57.include "../../devel/talloc/buildlink3.mk"
64BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2 58BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.5.2
cvs diff -r1.43 -r1.44 pkgsrc/mail/notmuch/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/distinfo 2019/11/27 13:30:53 1.43
+++ pkgsrc/mail/notmuch/distinfo 2020/03/25 11:06:19 1.44
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.43 2019/11/27 13:30:53 ryoon Exp $ 1$NetBSD: distinfo,v 1.44 2020/03/25 11:06:19 jperkin Exp $
2 2
3SHA1 (notmuch-0.29.3.tar.xz) = f1cdf4d50d344ca67df182ad1e3109988e8c80e8 3SHA1 (notmuch-0.29.3.tar.xz) = f1cdf4d50d344ca67df182ad1e3109988e8c80e8
4RMD160 (notmuch-0.29.3.tar.xz) = e935fa029a83b9f7019547e6272c68224b04b0b2 4RMD160 (notmuch-0.29.3.tar.xz) = e935fa029a83b9f7019547e6272c68224b04b0b2
5SHA512 (notmuch-0.29.3.tar.xz) = b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65 5SHA512 (notmuch-0.29.3.tar.xz) = b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
6Size (notmuch-0.29.3.tar.xz) = 660536 bytes 6Size (notmuch-0.29.3.tar.xz) = 660536 bytes
7SHA1 (patch-Makefile.global) = f436bdb163e3110a8d097f3c88198aefb126eafc 7SHA1 (patch-Makefile.global) = f436bdb163e3110a8d097f3c88198aefb126eafc
8SHA1 (patch-Makefile.local) = d0a83ff130de36164f1667236860aa31d481d025 8SHA1 (patch-Makefile.local) = d0a83ff130de36164f1667236860aa31d481d025
9SHA1 (patch-configure) = afbc37cdf886c6b73be4c34903d495cf0589963a 9SHA1 (patch-configure) = fb498d8ca9d74be5e9c46625f0943fbbedee3dcb
10SHA1 (patch-doc_conf.py) = 7492c878c96da68df16827aa0d6407c2e9808701 10SHA1 (patch-doc_conf.py) = 7492c878c96da68df16827aa0d6407c2e9808701
11SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c 11SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c
cvs diff -r1.1 -r1.2 pkgsrc/mail/notmuch/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/mail/notmuch/patches/patch-configure 2019/06/07 13:42:50 1.1
+++ pkgsrc/mail/notmuch/patches/patch-configure 2020/03/25 11:06:19 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-configure,v 1.1 2019/06/07 13:42:50 ryoon Exp $ 1$NetBSD: patch-configure,v 1.2 2020/03/25 11:06:19 jperkin Exp $
2 2
3* Select GnuPG binary 3* Select GnuPG binary
4 4
5--- configure.orig 2019-06-07 09:46:30.000000000 +0000 5--- configure.orig 2019-06-07 09:46:30.000000000 +0000
6+++ configure 6+++ configure
7@@ -533,7 +533,7 @@ EOF 7@@ -533,7 +533,7 @@ EOF
8 printf 'No.\nCould not make tempdir for testing session-key support.\n' 8 printf 'No.\nCould not make tempdir for testing session-key support.\n'
9 errors=$((errors + 1)) 9 errors=$((errors + 1))
10 elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ 10 elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
11- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \ 11- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
12+ && GNUPGHOME=${TEMP_GPG} @GPG@ --batch --quiet --import < test/gnupg-secret-key.asc \ 12+ && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < test/gnupg-secret-key.asc \
13 && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ 13 && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
14 && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] 14 && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
15 then 15 then