diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-03-25 11:06:19 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-03-25 11:06:19 +0000 |
| commit | 21633dcd4adb05b56d895494940f99b99a4eeb88 (patch) | |
| tree | 9e27bca65bda5c379df17aaf59179c6d11254a2c /mail | |
| parent | acecf233a991f23153557d027373259a4074b92a (diff) | |
| download | pkgsrc-21633dcd4adb05b56d895494940f99b99a4eeb88.tar.gz | |
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 (limited to 'mail')
| -rw-r--r-- | mail/notmuch/Makefile | 10 | ||||
| -rw-r--r-- | mail/notmuch/distinfo | 4 | ||||
| -rw-r--r-- | mail/notmuch/patches/patch-configure | 4 |
3 files changed, 6 insertions, 12 deletions
diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile index e68d83c90fa..a18faf83948 100644 --- a/mail/notmuch/Makefile +++ b/mail/notmuch/Makefile @@ -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_FILES.sphinx+= bindings/python/docs/Makefile configure doc/Makefile.local 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 --git a/mail/notmuch/distinfo b/mail/notmuch/distinfo index 1207344d85d..1dc7d7c702f 100644 --- a/mail/notmuch/distinfo +++ b/mail/notmuch/distinfo @@ -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 @@ SHA512 (notmuch-0.29.3.tar.xz) = b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78e 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 --git a/mail/notmuch/patches/patch-configure b/mail/notmuch/patches/patch-configure index ecf72bd347d..887356ab4a7 100644 --- a/mail/notmuch/patches/patch-configure +++ b/mail/notmuch/patches/patch-configure @@ -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 @@ $NetBSD: patch-configure,v 1.1 2019/06/07 13:42:50 ryoon Exp $ 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 |