Re: CVS commit: pkgsrc/security/gnupg21

[Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>]

Hi,

From: Ryo ONODERA <ryo_on%yk.rim.or.jp@localhost>, Date: Sun, 20 Sep 2015 17:41:28 +0900 (JST)

> Hi,
> 
> From: Joerg Sonnenberger <joerg%britannica.bec.de@localhost>, Date: Thu, 17 Sep 2015 12:00:53 +0200
> 
>> On Sun, Aug 30, 2015 at 12:57:17AM +0200, Joerg Sonnenberger wrote:
>>> On Sat, Jul 04, 2015 at 05:26:21AM +0000, Ryo ONODERA wrote:
>>> > Module Name:	pkgsrc
>>> > Committed By:	ryoon
>>> > Date:		Sat Jul  4 05:26:21 UTC 2015
>>> > 
>>> > Added Files:
>>> > 	pkgsrc/security/gnupg21: DESCR Makefile PLIST distinfo
>>> > 	pkgsrc/security/gnupg21/patches: patch-doc_Makefile.in
>>> > 
>>> > Log Message:
>>> > Import gnupg2-2.1.6 as security/gnupg21.
>>> 
>>> So right now, gnupg21 will picked up in bulk builds instead of
>>> security/gnupg2 by its buildlink3.mk. It doesn't come witih its own, soo
>>> this might actually be intentional. If it is, the b3.mk file should be
>>> updated. Otherwise, it needs its own b3.mk and the patterns should be
>>> limited.
>>> 
>>> Which is it?
>> 
>> Ping?
> 
> security/gnupg2 and security/gnupg21 do not provide any header files or
> library files.
> Why buildlink3.mk is required?
> 
> At least security/gpgme case, FIND_PREFIX from mk/find-prefix.mk
> should be used.
> 
> I will investigate mail/claws-mail-smime and security/qca2-gnupg later.

I would like to commit these and remove security/gnupg2/buildlink3.mk
after freeze.
Please send me your comments.

Thank you.

Index: mail/claws-mail-smime/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/claws-mail-smime/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- mail/claws-mail-smime/Makefile	25 Apr 2015 14:23:27 -0000	1.43
+++ mail/claws-mail-smime/Makefile	21 Sep 2015 00:09:01 -0000
@@ -2,7 +2,7 @@
 #
 
 PLUGIN_NAME=	smime
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../mail/claws-mail/plugins.mk"
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
@@ -10,6 +10,8 @@
 
 PLIST_SRC+=	PLIST
 
+DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
+
 CONFIGURE_ARGS+=	--enable-smime-plugin
 CONFIGURE_ARGS+=	--enable-pgpcore-plugin
 
@@ -20,6 +22,5 @@
 .include "../../mail/claws-mail/Makefile.vers"
 .include "../../mail/claws-mail-pgpcore/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
-.include "../../security/gnupg2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: security/gpgme/options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/gpgme/options.mk,v
retrieving revision 1.1
diff -u -r1.1 options.mk
--- security/gpgme/options.mk	3 Mar 2011 11:39:47 -0000	1.1
+++ security/gpgme/options.mk	21 Sep 2015 00:09:01 -0000
@@ -11,8 +11,10 @@
 ##
 .if !empty(PKG_OPTIONS:Mgpgsm)
 .  include "../../security/gnupg2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
-CONFIGURE_ARGS+=	--with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2
+FIND_PREFIX:=	GPG2DIR=gnupg2
+.include "../../mk/find-prefix.mk"
+CONFIGURE_ARGS+=	--with-gpgsm=${GPG2DIR}/bin/gpgsm
+CONFIGURE_ARGS+=	--with-gpg=${GPG2DIR}/bin/gpg2
 REPLACE_SH+=		tests/gpg/pinentry
 .else
 DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
Index: security/qca2-gnupg/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/qca2-gnupg/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- security/qca2-gnupg/Makefile	25 Apr 2015 14:24:49 -0000	1.18
+++ security/qca2-gnupg/Makefile	21 Sep 2015 00:09:01 -0000
@@ -2,7 +2,7 @@
 
 DISTNAME=	qca-gnupg-2.0.0-beta3
 PKGNAME=	qca2-gnupg-${DISTNAME:S/-beta/beta/:C/.*-//}
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	security
 MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,8 @@
 COMMENT=	Cross-platform crypto API for QT - GnuPG plugin
 LICENSE=	gnu-lgpl-v2.1
 
+DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
+
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 HAS_CONFIGURE=	yes
@@ -24,5 +26,4 @@
 #CONFIGURE_ARGS+=	--with-openssl-lib=${SSLBASE}/lib
 
 .include "../../security/qca2/buildlink3.mk"
-.include "../../security/gnupg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

--
Ryo ONODERA // ryo_on%yk.rim.or.jp@localhost
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB  FD1B F404 27FA C7D1 15F3