Remove references to gnupg21 in preparation for its removal.

8 files changed, 16 insertions, 48 deletions

diff --git a/mail/spamassassin/options.mk b/mail/spamassassin/options.mk
index f028818bfbf..b399409e344 100644
--- a/mail/spamassassin/options.mk
+++ b/mail/spamassassin/options.mk
@@ -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 @@ DEPENDS+=		p5-IO-Socket-INET6-[0-9]*:../../net/p5-IO-Socket-INET6
 #
 # 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 --git a/mail/thunderbird-enigmail/Makefile.common b/mail/thunderbird-enigmail/Makefile.common
index 491d06ccc72..f0b4bcbdf12 100644
--- a/mail/thunderbird-enigmail/Makefile.common
+++ b/mail/thunderbird-enigmail/Makefile.common
@@ -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 @@ USE_TOOLS+=	gmake perl sed unzip zip
 # 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 --git a/mail/thunderbird-enigmail/options.mk b/mail/thunderbird-enigmail/options.mk
deleted file mode 100644
index 86799973053..00000000000
--- a/mail/thunderbird-enigmail/options.mk
+++ /dev/null
@@ -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 --git a/mk/defaults/options.description b/mk/defaults/options.description
index 6fadd741a4c..11c96025d65 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -249,8 +249,6 @@ gnome-keyring		Enable GNOME keyring support.
 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 --git a/security/caff/options.mk b/security/caff/options.mk
index 1732ed297a8..bbd1c16cc43 100644
--- a/security/caff/options.mk
+++ b/security/caff/options.mk
@@ -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 --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
index 243682a35e9..e0d66b552b8 100644
--- a/security/gnupg2/options.mk
+++ b/security/gnupg2/options.mk
@@ -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 --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index 07e16c620f6..218dac87672 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -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 @@ BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
 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 --git a/security/gpgme/options.mk b/security/gpgme/options.mk
index 606821e574b..e0ca9b6d9ba 100644
--- a/security/gpgme/options.mk
+++ b/security/gpgme/options.mk
@@ -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