summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorshannonjr <shannonjr>2006-11-17 12:16:00 +0000
committershannonjr <shannonjr>2006-11-17 12:16:00 +0000
commit6ec6efc2cac3022f1a97028df8a3b8ff644169b0 (patch)
treea569588b0fbc7d3fc339084c2d2295d855d3add9 /security
parent9e6c2800fd8121ca6efeddb94b3a9fa5eefba072 (diff)
downloadpkgsrc-6ec6efc2cac3022f1a97028df8a3b8ff644169b0.tar.gz
Updated gpgsm option to use security/gnupg2 instead of security/gnupg-devel.
Diffstat (limited to 'security')
-rw-r--r--security/gpgme/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index a7cf68ea923..0d19a4175a9 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2006/10/20 15:28:01 shannonjr Exp $
+# $NetBSD: Makefile,v 1.48 2006/11/17 12:16:00 shannonjr Exp $
#
DISTNAME= gpgme-1.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ \
ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
@@ -11,7 +11,12 @@ MAINTAINER= oishi@ims.ac.jp
HOMEPAGE= http://www.gnupg.org/related_software/gpgme/
COMMENT= GnuPG Made Easy
+PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme
+PKG_SUPPORTED_OPTIONS= gpgsm
+.include "../../mk/bsd.options.mk"
+.if empty(PKG_OPTIONS:Mgpgsm)
DEPENDS+= gnupg>=1.4.2:../../security/gnupg
+.endif
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -24,10 +29,6 @@ SUBST_SED.pthread+= -e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
SUBST_SED.pthread+= -e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
SUBST_STAGE.pthread= post-patch
-PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme
-PKG_SUPPORTED_OPTIONS= gpgsm
-.include "../../mk/bsd.options.mk"
-
LIBS.SunOS+= -lnsl -lsocket
# Avoid an ICE in gcc2 on sparc64
@@ -56,8 +57,8 @@ BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.7nb1
## Option to build with gpgsm. This provides SMIME support
##
.if !empty(PKG_OPTIONS:Mgpgsm)
-. include "../../security/gnupg-devel/buildlink3.mk"
-CONFIGURE_ARGS+= --with-gpgsm=${BUILDLINK_PREFIX.gnupg-devel}/bin/gpgsm
+. include "../../security/gnupg2/buildlink3.mk"
+CONFIGURE_ARGS+= --with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
.else
CONFIGURE_ARGS+= --without-gpgsm
.endif