CVS commit: pkgsrc/security/caff

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  6 20:37:15 UTC 2017

Modified Files:
        pkgsrc/security/caff: Makefile
Added Files:
        pkgsrc/security/caff: options.mk

Log Message:
Allow choosing gnupg1, gnupg2, or gnupg21. Default to gnupg2. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/security/caff/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/security/caff/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/caff/Makefile
diff -u pkgsrc/security/caff/Makefile:1.43 pkgsrc/security/caff/Makefile:1.44
--- pkgsrc/security/caff/Makefile:1.43  Sun Oct  9 20:57:05 2016
+++ pkgsrc/security/caff/Makefile       Tue Jun  6 20:37:15 2017
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2016/10/09 20:57:05 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/06/06 20:37:15 wiz Exp $
 
 VERSION=       2.5
 DISTNAME=      signing-party_${VERSION}.orig
 PKGNAME=       caff-${VERSION}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/s/signing-party/}
 
@@ -17,7 +18,6 @@ WRKSRC=               ${WRKDIR}
 USE_TOOLS+=    gmake pod2man
 USE_TOOLS+=    perl:run
 
-DEPENDS+=      gnupg>=1.3.92:../../security/gnupg
 DEPENDS+=      p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
 DEPENDS+=      p5-Net-IDN-Encode-[0-9]*:../../textproc/p5-Net-IDN-Encode
 DEPENDS+=      p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
@@ -36,6 +36,8 @@ SUBST_SED.paths=      -e 's,/usr/,${PREFIX}/,
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 share/doc/caff share/examples/caff
 
+.include "options.mk"
+
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/caff/caff ${DESTDIR}${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/caff/pgp-fixkey ${DESTDIR}${PREFIX}/bin

Added files:

Index: pkgsrc/security/caff/options.mk
diff -u /dev/null pkgsrc/security/caff/options.mk:1.1
--- /dev/null   Tue Jun  6 20:37:15 2017
+++ pkgsrc/security/caff/options.mk     Tue Jun  6 20:37:15 2017
@@ -0,0 +1,16 @@
+# $NetBSD: options.mk,v 1.1 2017/06/06 20:37:15 wiz Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.caff
+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