diff options
| author | drochner <drochner> | 2009-12-15 19:15:38 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2009-12-15 19:15:38 +0000 |
| commit | b9fdfc28e33d77a5e6a5b6798ee06f9f2574038e (patch) | |
| tree | dca0409c86f31e0a70f4445e87bb80340790d979 /security/gpgme | |
| parent | fd458c2a1128fc9e7edec32b4df917473be80668 (diff) | |
| download | pkgsrc-b9fdfc28e33d77a5e6a5b6798ee06f9f2574038e.tar.gz | |
minor fixes for gnupg2 support:
-don't pull in gnupg2's "gpgconf" if both gnupg1 and gnupg2 are installed
but we are building against gnupg1, this caused a build failure
-fix a selftest to work with gnupg2
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index 59879278b84..f942fe0dbf8 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2009/12/03 15:22:39 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2009/12/15 19:15:38 drochner Exp $ # DISTNAME= gpgme-1.1.8 @@ -62,8 +62,10 @@ BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.7nb1 . include "../../security/gnupg2/buildlink3.mk" CONFIGURE_ARGS+= --with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm CONFIGURE_ARGS+= --with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2 +REPLACE_SH+= tests/gpg/pinentry .else CONFIGURE_ARGS+= --without-gpgsm +CONFIGURE_ARGS+= --without-gpgconf .endif .include "../../mk/bsd.prefs.mk" |