summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2009-12-15 19:15:38 +0000
committerdrochner <drochner@pkgsrc.org>2009-12-15 19:15:38 +0000
commitd4f0b2de4e683d208cad76514225f0ffa682a565 (patch)
treedca0409c86f31e0a70f4445e87bb80340790d979 /security
parentc17c98c26f5208596a949bb802667769abd8b4e1 (diff)
downloadpkgsrc-d4f0b2de4e683d208cad76514225f0ffa682a565.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')
-rw-r--r--security/gpgme/Makefile4
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"