CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 29 12:23:25 UTC 2017

Modified Files:
        pkgsrc/mail/claws-mail-smime: Makefile
        pkgsrc/meta-pkgs/bulk-medium: Makefile
        pkgsrc/security/caff: options.mk
        pkgsrc/security/p5-GnuPG-Interface: options.mk
        pkgsrc/security/qca2-gnupg: Makefile

Log Message:
Fix gnupg2 dependency pattern.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/mail/claws-mail-smime/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/meta-pkgs/bulk-medium/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/caff/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/security/p5-GnuPG-Interface/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/qca2-gnupg/Makefile

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

Modified files:

Index: pkgsrc/mail/claws-mail-smime/Makefile
diff -u pkgsrc/mail/claws-mail-smime/Makefile:1.57 pkgsrc/mail/claws-mail-smime/Makefile:1.58
--- pkgsrc/mail/claws-mail-smime/Makefile:1.57  Thu Aug 24 20:03:28 2017
+++ pkgsrc/mail/claws-mail-smime/Makefile       Tue Aug 29 12:23:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/08/24 20:03:28 adam Exp $
+# $NetBSD: Makefile,v 1.58 2017/08/29 12:23:24 wiz Exp $
 #
 
 PLUGIN_NAME=   smime
@@ -10,7 +10,7 @@ COMMENT=      This plugin handles S/MIME sign
 
 PLIST_SRC+=    PLIST
 
-DEPENDS+=      gnupg2>=2.0<2.1:../../security/gnupg2
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 
 CONFIGURE_ARGS+=       --enable-smime-plugin
 CONFIGURE_ARGS+=       --enable-pgpcore-plugin

Index: pkgsrc/meta-pkgs/bulk-medium/Makefile
diff -u pkgsrc/meta-pkgs/bulk-medium/Makefile:1.42 pkgsrc/meta-pkgs/bulk-medium/Makefile:1.43
--- pkgsrc/meta-pkgs/bulk-medium/Makefile:1.42  Tue Jun 20 13:44:25 2017
+++ pkgsrc/meta-pkgs/bulk-medium/Makefile       Tue Aug 29 12:23:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/06/20 13:44:25 taca Exp $
+# $NetBSD: Makefile,v 1.43 2017/08/29 12:23:25 wiz Exp $
 
 DISTNAME=      bulk-medium-20170620
 CATEGORIES=    meta-pkgs
@@ -114,7 +114,7 @@ BUILD_DEPENDS+=     ghostscript-agpl-[0-9]*:
 BUILD_DEPENDS+=        poppler-utils-[0-9]*:../../print/poppler-utils
 BUILD_DEPENDS+=        xpdf-[0-9]*:../../print/xpdf
 BUILD_DEPENDS+=        gnupg-[0-9]*:../../security/gnupg
-BUILD_DEPENDS+=        gnupg2>=2.0<2.1:../../security/gnupg2
+BUILD_DEPENDS+=        gnupg2-[0-9]*:../../security/gnupg2
 BUILD_DEPENDS+=        desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
 BUILD_DEPENDS+=        xe-guest-utilities-[0-9]*:../../sysutils/xe-guest-utilities
 BUILD_DEPENDS+=        xenkernel45-[0-9]*:../../sysutils/xenkernel45

Index: pkgsrc/security/caff/options.mk
diff -u pkgsrc/security/caff/options.mk:1.2 pkgsrc/security/caff/options.mk:1.3
--- pkgsrc/security/caff/options.mk:1.2 Tue Aug 29 12:11:35 2017
+++ pkgsrc/security/caff/options.mk     Tue Aug 29 12:23:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/08/29 12:11:35 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2017/08/29 12:23:24 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.caff
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=          gnupg2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
 .else
 DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
 .endif

Index: pkgsrc/security/p5-GnuPG-Interface/options.mk
diff -u pkgsrc/security/p5-GnuPG-Interface/options.mk:1.3 pkgsrc/security/p5-GnuPG-Interface/options.mk:1.4
--- pkgsrc/security/p5-GnuPG-Interface/options.mk:1.3   Tue Aug 29 12:11:36 2017
+++ pkgsrc/security/p5-GnuPG-Interface/options.mk       Tue Aug 29 12:23:24 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2017/08/29 12:11:36 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2017/08/29 12:23:24 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.p5_GnuPG_Interface
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=          gnupg1
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
 .else
 DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
 .endif

Index: pkgsrc/security/qca2-gnupg/Makefile
diff -u pkgsrc/security/qca2-gnupg/Makefile:1.20 pkgsrc/security/qca2-gnupg/Makefile:1.21
--- pkgsrc/security/qca2-gnupg/Makefile:1.20    Sat Mar  5 11:29:25 2016
+++ pkgsrc/security/qca2-gnupg/Makefile Tue Aug 29 12:23:25 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/03/05 11:29:25 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/29 12:23:25 wiz Exp $
 
 DISTNAME=      qca-gnupg-2.0.0-beta3
 PKGNAME=       qca2-gnupg-${DISTNAME:S/-beta/beta/:C/.*-//}
@@ -12,7 +12,7 @@ HOMEPAGE=     http://delta.affinix.com/qca/
 COMMENT=       Cross-platform crypto API for QT - GnuPG plugin
 LICENSE=       gnu-lgpl-v2.1
 
-DEPENDS+=      gnupg2>=2.0<2.1:../../security/gnupg2
+DEPENDS+=      gnupg2-[0-9]*:../../security/gnupg2
 
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes