CVS commit: pkgsrc/security/p5-GnuPG-Interface

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  6 20:40:56 UTC 2017

Modified Files:
        pkgsrc/security/p5-GnuPG-Interface: Makefile
Added Files:
        pkgsrc/security/p5-GnuPG-Interface: options.mk

Log Message:
Allow selecting gnupg version. Switch default to gnupg2.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/security/p5-GnuPG-Interface/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/p5-GnuPG-Interface/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/p5-GnuPG-Interface/Makefile
diff -u pkgsrc/security/p5-GnuPG-Interface/Makefile:1.27 pkgsrc/security/p5-GnuPG-Interface/Makefile:1.28
--- pkgsrc/security/p5-GnuPG-Interface/Makefile:1.27    Mon Jun  5 14:24:33 2017
+++ pkgsrc/security/p5-GnuPG-Interface/Makefile Tue Jun  6 20:40:56 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2017/06/05 14:24:33 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2017/06/06 20:40:56 wiz Exp $
 
 DISTNAME=              GnuPG-Interface-0.52
 PKGNAME=               p5-${DISTNAME}
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            security perl5
 MASTER_SITES=          ${MASTER_SITE_PERL_CPAN:=GnuPG/}
 
@@ -12,12 +12,13 @@ HOMEPAGE=           http://search.cpan.org/dist/G
 COMMENT=               Perl interface to GnuPG
 LICENSE=               ${PERL5_LICENSE}
 
-DEPENDS+=              gnupg>=1.2.3:../../security/gnupg
 DEPENDS+=              p5-Moo-[0-9]*:../../devel/p5-Moo
 DEPENDS+=              p5-MooX-late-[0-9]*:../../devel/p5-MooX-late
 DEPENDS+=              p5-MooX-HandlesVia-[0-9]*:../../devel/p5-MooX-HandlesVia
 
 PERL5_PACKLIST=                auto/GnuPG/Interface/.packlist
 
+.include "options.mk"
+
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/security/p5-GnuPG-Interface/options.mk
diff -u /dev/null pkgsrc/security/p5-GnuPG-Interface/options.mk:1.1
--- /dev/null   Tue Jun  6 20:40:56 2017
+++ pkgsrc/security/p5-GnuPG-Interface/options.mk       Tue Jun  6 20:40:56 2017
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2017/06/06 20:40:56 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.p5_GnuPG_Interface
+PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
+PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2 gnupg21
+PKG_SUGGESTED_OPTIONS=         gnupg2
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnupg21)
+DEPENDS+=              gnupg21>=2.1:../../security/gnupg21
+.elif !empty(PKG_OPTIONS:Mgnupg2)
+DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
+.else
+DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
+.endif