[pkgsrc/trunk]: pkgsrc/mail/notmuch notmuch: Reuse GPGME_GPG variable rather ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52ccebf1a719
branches:  trunk
changeset: 426045:52ccebf1a719
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Mar 25 11:06:19 2020 +0000

description:
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.

diffstat:

 mail/notmuch/Makefile                |  10 ++--------
 mail/notmuch/distinfo                |   4 ++--
 mail/notmuch/patches/patch-configure |   4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diffs (63 lines):

diff -r beb1fc7a61e3 -r 52ccebf1a719 mail/notmuch/Makefile
--- a/mail/notmuch/Makefile     Wed Mar 25 10:56:26 2020 +0000
+++ b/mail/notmuch/Makefile     Wed Mar 25 11:06:19 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2020/03/08 16:47:54 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2020/03/25 11:06:19 jperkin Exp $
 
 DISTNAME=      notmuch-0.29.3
 PKGREVISION=   1
@@ -38,17 +38,11 @@
 SUBST_STAGE.sphinx=    pre-configure
 SUBST_MESSAGE.sphinx=  Fix sphinx command names.
 
-.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2)
-GPG=   gpg2
-.else
-GPG=   gpg
-.endif
-
 SUBST_CLASSES+=                gpg
 SUBST_STAGE.gpg=       pre-configure
 SUBST_MESSAGE.gpg=     Select GnuPG command
 SUBST_FILES.gpg+=      configure
-SUBST_VARS.gpg=                GPG
+SUBST_VARS.gpg=                GPGME_GPG
 
 LDFLAGS.SunOS+=        -lnsl
 
diff -r beb1fc7a61e3 -r 52ccebf1a719 mail/notmuch/distinfo
--- a/mail/notmuch/distinfo     Wed Mar 25 10:56:26 2020 +0000
+++ b/mail/notmuch/distinfo     Wed Mar 25 11:06:19 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2019/11/27 13:30:53 ryoon Exp $
+$NetBSD: distinfo,v 1.44 2020/03/25 11:06:19 jperkin Exp $
 
 SHA1 (notmuch-0.29.3.tar.xz) = f1cdf4d50d344ca67df182ad1e3109988e8c80e8
 RMD160 (notmuch-0.29.3.tar.xz) = e935fa029a83b9f7019547e6272c68224b04b0b2
@@ -6,6 +6,6 @@
 Size (notmuch-0.29.3.tar.xz) = 660536 bytes
 SHA1 (patch-Makefile.global) = f436bdb163e3110a8d097f3c88198aefb126eafc
 SHA1 (patch-Makefile.local) = d0a83ff130de36164f1667236860aa31d481d025
-SHA1 (patch-configure) = afbc37cdf886c6b73be4c34903d495cf0589963a
+SHA1 (patch-configure) = fb498d8ca9d74be5e9c46625f0943fbbedee3dcb
 SHA1 (patch-doc_conf.py) = 7492c878c96da68df16827aa0d6407c2e9808701
 SHA1 (patch-emacs_Makefile.local) = 4a36a2c165852a098a45c8b99c8372d65d33b07c
diff -r beb1fc7a61e3 -r 52ccebf1a719 mail/notmuch/patches/patch-configure
--- a/mail/notmuch/patches/patch-configure      Wed Mar 25 10:56:26 2020 +0000
+++ b/mail/notmuch/patches/patch-configure      Wed Mar 25 11:06:19 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2019/06/07 13:42:50 ryoon Exp $
+$NetBSD: patch-configure,v 1.2 2020/03/25 11:06:19 jperkin Exp $
 
 * Select GnuPG binary
 
@@ -9,7 +9,7 @@
          errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
 -           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < test/gnupg-secret-key.asc \
-+           && GNUPGHOME=${TEMP_GPG} @GPG@ --batch --quiet --import < test/gnupg-secret-key.asc \
++           && GNUPGHOME=${TEMP_GPG} @GPGME_GPG@ --batch --quiet --import < test/gnupg-secret-key.asc \
             && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
             && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
      then