[pkgsrc/trunk]: pkgsrc Remove references to gnupg21 in preparation for its re...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/260b665f9125
branches:  trunk
changeset: 367315:260b665f9125
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Aug 29 12:11:35 2017 +0000

description:
Remove references to gnupg21 in preparation for its removal.

diffstat:

 mail/spamassassin/options.mk              |   9 +++------
 mail/thunderbird-enigmail/Makefile.common |   5 ++---
 mail/thunderbird-enigmail/options.mk      |  16 ----------------
 mk/defaults/options.description           |   2 --
 security/caff/options.mk                  |   8 +++-----
 security/gnupg2/options.mk                |   4 ++--
 security/gpgme/buildlink3.mk              |   9 +++------
 security/gpgme/options.mk                 |  11 +++--------
 8 files changed, 16 insertions(+), 48 deletions(-)

diffs (158 lines):

diff -r a367f4174461 -r 260b665f9125 mail/spamassassin/options.mk
--- a/mail/spamassassin/options.mk      Tue Aug 29 12:07:16 2017 +0000
+++ b/mail/spamassassin/options.mk      Tue Aug 29 12:11:35 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.13 2017/07/09 22:12:12 schmonz Exp $
+# $NetBSD: options.mk,v 1.14 2017/08/29 12:11:35 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.spamassassin
-PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2 gnupg21
+PKG_SUPPORTED_OPTIONS= inet6 ssl gnupg2
 
 #
 # Default options
@@ -53,10 +53,7 @@
 #
 # use gnupg2 instead of gnupg1
 #
-.if !empty(PKG_OPTIONS:Mgnupg21)
-DEPENDS+=      gnupg21-[0-9]*:../../security/gnupg21
-GPGPATH=       ${PREFIX}/bin/gpg2
-.elif !empty(PKG_OPTIONS:Mgnupg2)
+.if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=       gnupg2-[0-9]*:../../security/gnupg2
 GPGPATH=        ${PREFIX}/bin/gpg2
 .else
diff -r a367f4174461 -r 260b665f9125 mail/thunderbird-enigmail/Makefile.common
--- a/mail/thunderbird-enigmail/Makefile.common Tue Aug 29 12:07:16 2017 +0000
+++ b/mail/thunderbird-enigmail/Makefile.common Tue Aug 29 12:11:35 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2017/08/15 18:57:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2017/08/29 12:11:36 wiz Exp $
 # used by mail/thunderbird-enigmail/Makefile
 # used by mail/seamonkey-enigmail/Makefile
 
@@ -15,8 +15,7 @@
 # https://aur.archlinux.org/packages/th/thunderbird-enigmail/PKGBUILD
 MAKE_JOBS_SAFE=        no
 
-.include "../../mail/thunderbird-enigmail/options.mk"
-
+DEPENDS+=              gnupg2>=2.0.7:../../security/gnupg2
 DEPENDS+=              pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
 
 DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird-enigmail/distinfo
diff -r a367f4174461 -r 260b665f9125 mail/thunderbird-enigmail/options.mk
--- a/mail/thunderbird-enigmail/options.mk      Tue Aug 29 12:07:16 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2016/05/05 12:06:38 wiz Exp $
-
-PKG_OPTIONS_VAR=               PKG_OPTIONS.enigmail
-PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
-PKG_OPTIONS_GROUP.gnupg=       gnupg2 gnupg21
-PKG_SUGGESTED_OPTIONS=         gnupg2
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgnupg2)
-DEPENDS+=                      gnupg2>=2.0.7:../../security/gnupg2
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnupg21)
-DEPENDS+=                      gnupg21-[0-9]*:../../security/gnupg21
-.endif
diff -r a367f4174461 -r 260b665f9125 mk/defaults/options.description
--- a/mk/defaults/options.description   Tue Aug 29 12:07:16 2017 +0000
+++ b/mk/defaults/options.description   Tue Aug 29 12:11:35 2017 +0000
@@ -249,8 +249,6 @@
 gnomecanvas            Enable GNOME canvas support
 gnomevfs               Enable GNOME Virtual File System support.
 gnupg2                 Use GNU Privacy Guard (GnuPG) Version 2.0
-gnupg2-gpgsm           Install gpgsm binary.
-gnupg21                        Use GNU Privacy Guard (GnuPG) Version 2.1
 gnuplot-pdf-doc                Install PDF document.
 gnutls                 Enable GNU TLS support.
 goffice                        Enable goffice support.
diff -r a367f4174461 -r 260b665f9125 security/caff/options.mk
--- a/security/caff/options.mk  Tue Aug 29 12:07:16 2017 +0000
+++ b/security/caff/options.mk  Tue Aug 29 12:11:35 2017 +0000
@@ -1,15 +1,13 @@
-# $NetBSD: options.mk,v 1.1 2017/06/06 20:37:15 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2017/08/29 12:11:35 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.caff
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
-PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2 gnupg21
+PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2
 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)
+.if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
 .else
 DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
diff -r a367f4174461 -r 260b665f9125 security/gnupg2/options.mk
--- a/security/gnupg2/options.mk        Tue Aug 29 12:07:16 2017 +0000
+++ b/security/gnupg2/options.mk        Tue Aug 29 12:11:35 2017 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.10 2017/08/29 12:07:04 wiz Exp $
+# $NetBSD: options.mk,v 1.11 2017/08/29 12:11:35 wiz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg21
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg2
 PKG_SUPPORTED_OPTIONS= ldap libusb-1
 PKG_SUGGESTED_OPTIONS= libusb-1
 
diff -r a367f4174461 -r 260b665f9125 security/gpgme/buildlink3.mk
--- a/security/gpgme/buildlink3.mk      Tue Aug 29 12:07:16 2017 +0000
+++ b/security/gpgme/buildlink3.mk      Tue Aug 29 12:11:35 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2017/08/29 11:27:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2017/08/29 12:11:35 wiz Exp $
 
 BUILDLINK_TREE+=       gpgme
 
@@ -15,11 +15,8 @@
 pkgbase:=              gpgme
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg21)
-DEPENDS+=              gnupg21>=2.1:../../security/gnupg21
-GPGME_GPG=             ${PREFIX}/bin/gpg2
-.elif !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2)
-DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
+.if !empty(PKG_BUILD_OPTIONS.gpgme:Mgnupg2)
+DEPENDS+=              gnupg2-[0-9]*:../../security/gnupg2
 GPGME_GPG=             ${PREFIX}/bin/gpg2
 .else
 DEPENDS+=              gnupg>=1.4.2:../../security/gnupg
diff -r a367f4174461 -r 260b665f9125 security/gpgme/options.mk
--- a/security/gpgme/options.mk Tue Aug 29 12:07:16 2017 +0000
+++ b/security/gpgme/options.mk Tue Aug 29 12:11:35 2017 +0000
@@ -1,18 +1,13 @@
-# $NetBSD: options.mk,v 1.5 2017/04/05 08:58:24 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2017/08/29 12:11:35 wiz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.gpgme
 PKG_OPTIONS_REQUIRED_GROUPS=   gnupg
-PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2 gnupg21
+PKG_OPTIONS_GROUP.gnupg=       gnupg1 gnupg2
 PKG_SUGGESTED_OPTIONS=         gnupg2
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mgnupg21)
-DEPENDS+=              gnupg21>=2.1:../../security/gnupg21
-REPLACE_SH+=           tests/gpg/pinentry
-GPG_DEFAULT=           ${LOCALBASE}/bin/gpg2
-MAKE_FLAGS+=           GPG=${GPG_DEFAULT}
-.elif !empty(PKG_OPTIONS:Mgnupg2)
+.if !empty(PKG_OPTIONS:Mgnupg2)
 DEPENDS+=              gnupg2>=2.0<2.1:../../security/gnupg2
 REPLACE_SH+=           tests/gpg/pinentry
 GPG_DEFAULT=           ${LOCALBASE}/bin/gpg2