Thu Sep 24 23:33:08 2015 UTC ()
Bump PKGREVISION

* Do not abuse buildlink3.
* Use GnuPG 2.0 explicitly.


(ryoon)
diff -r1.76 -r1.77 pkgsrc/security/gpgme/Makefile
diff -r1.1 -r1.2 pkgsrc/security/gpgme/options.mk
cvs diff -r1.76 -r1.77 pkgsrc/security/gpgme/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gpgme/Makefile 2015/08/27 03:39:20 1.76
+++ pkgsrc/security/gpgme/Makefile 2015/09/24 23:33:08 1.77
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.76 2015/08/27 03:39:20 mef Exp $ 1# $NetBSD: Makefile,v 1.77 2015/09/24 23:33:08 ryoon Exp $
2 2
3DISTNAME= gpgme-1.6.0 3DISTNAME= gpgme-1.6.0
 4PKGREVISION= 1
4CATEGORIES= security 5CATEGORIES= security
5MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/ 6MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gpgme/
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnupg.org/related_software/gpgme/ 10HOMEPAGE= http://www.gnupg.org/related_software/gpgme/
10COMMENT= GnuPG Made Easy 11COMMENT= GnuPG Made Easy
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13USE_LIBTOOL= yes 14USE_LIBTOOL= yes
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15PTHREAD_OPTS+= require 16PTHREAD_OPTS+= require
16INFO_FILES= yes 17INFO_FILES= yes
cvs diff -r1.1 -r1.2 pkgsrc/security/gpgme/options.mk (expand / switch to unified diff)

--- pkgsrc/security/gpgme/options.mk 2011/03/03 11:39:47 1.1
+++ pkgsrc/security/gpgme/options.mk 2015/09/24 23:33:08 1.2
@@ -1,21 +1,23 @@ @@ -1,21 +1,23 @@
1# $NetBSD: options.mk,v 1.1 2011/03/03 11:39:47 adam Exp $ 1# $NetBSD: options.mk,v 1.2 2015/09/24 23:33:08 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme 3PKG_OPTIONS_VAR= PKG_OPTIONS.gpgme
4PKG_SUPPORTED_OPTIONS= gpgsm 4PKG_SUPPORTED_OPTIONS= gpgsm
5PKG_SUGGESTED_OPTIONS= gpgsm 5PKG_SUGGESTED_OPTIONS= gpgsm
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9## 9##
10## Option to build with gpgsm. This provides SMIME support 10## Option to build with gpgsm. This provides SMIME support
11## 11##
12.if !empty(PKG_OPTIONS:Mgpgsm) 12.if !empty(PKG_OPTIONS:Mgpgsm)
13. include "../../security/gnupg2/buildlink3.mk" 13DEPENDS+= gnupg2>=2.0<2.1:../../security/gnupg2
14CONFIGURE_ARGS+= --with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm 14FIND_PREFIX:= GPG2DIR=gnupg2
15CONFIGURE_ARGS+= --with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2 15.include "../../mk/find-prefix.mk"
 16CONFIGURE_ARGS+= --with-gpgsm=${GPG2DIR}/bin/gpgsm
 17CONFIGURE_ARGS+= --with-gpg=${GPG2DIR}/bin/gpg2
16REPLACE_SH+= tests/gpg/pinentry 18REPLACE_SH+= tests/gpg/pinentry
17.else 19.else
18DEPENDS+= gnupg>=1.4.2:../../security/gnupg 20DEPENDS+= gnupg>=1.4.2:../../security/gnupg
19CONFIGURE_ARGS+= --without-gpgconf 21CONFIGURE_ARGS+= --without-gpgconf
20CONFIGURE_ARGS+= --without-gpgsm 22CONFIGURE_ARGS+= --without-gpgsm
21.endif 23.endif