[pkgsrc/trunk]: pkgsrc/security/gpgme Updated gpgsm option to use security/gn...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0449b0594cfb
branches:  trunk
changeset: 521665:0449b0594cfb
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Fri Nov 17 12:16:00 2006 +0000

description:
Updated gpgsm option to use security/gnupg2 instead of security/gnupg-devel.

diffstat:

 security/gpgme/Makefile |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r fa86484dfbd9 -r 0449b0594cfb security/gpgme/Makefile
--- a/security/gpgme/Makefile   Fri Nov 17 12:13:11 2006 +0000
+++ b/security/gpgme/Makefile   Fri Nov 17 12:16:00 2006 +0000
@@ -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 @@
 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_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 @@
 ## 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