[pkgsrc/trunk]: pkgsrc Remove gnupg21, successor gnupg2.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e961508e8b8c
branches:  trunk
changeset: 367317:e961508e8b8c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Aug 29 12:12:54 2017 +0000

description:
Remove gnupg21, successor gnupg2.

diffstat:

 doc/CHANGES-2017            |    3 +-
 security/Makefile           |    3 +-
 security/gnupg21/DESCR      |    9 ---
 security/gnupg21/Makefile   |   51 ------------------
 security/gnupg21/PLIST      |  124 --------------------------------------------
 security/gnupg21/distinfo   |    6 --
 security/gnupg21/options.mk |   25 --------
 7 files changed, 3 insertions(+), 218 deletions(-)

diffs (266 lines):

diff -r 4be50b105fa0 -r e961508e8b8c doc/CHANGES-2017
--- a/doc/CHANGES-2017  Tue Aug 29 12:11:36 2017 +0000
+++ b/doc/CHANGES-2017  Tue Aug 29 12:12:54 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2017,v 1.3478 2017/08/29 12:07:16 wiz Exp $
+$NetBSD: CHANGES-2017,v 1.3479 2017/08/29 12:12:54 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2017:
 
@@ -4890,3 +4890,4 @@
        Updated security/gpa to 0.9.10 [wiz 2017-08-29]
        Updated devel/pth to 2.0.7nb5 [wiz 2017-08-29]
        Updated security/gnupg2 to 2.2.0 [wiz 2017-08-29]
+       Removed security/gnupg21 successor security/gnupg2 [wiz 2017-08-29]
diff -r 4be50b105fa0 -r e961508e8b8c security/Makefile
--- a/security/Makefile Tue Aug 29 12:11:36 2017 +0000
+++ b/security/Makefile Tue Aug 29 12:12:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.623 2017/08/23 13:46:44 he Exp $
+# $NetBSD: Makefile,v 1.624 2017/08/29 12:12:54 wiz Exp $
 #
 
 COMMENT=       Security tools
@@ -96,7 +96,6 @@
 SUBDIR+=       gnupg
 SUBDIR+=       gnupg-pkcs11-scd
 SUBDIR+=       gnupg2
-SUBDIR+=       gnupg21
 SUBDIR+=       gnutls
 SUBDIR+=       go-crypt
 SUBDIR+=       go-crypto
diff -r 4be50b105fa0 -r e961508e8b8c security/gnupg21/DESCR
--- a/security/gnupg21/DESCR    Tue Aug 29 12:11:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-GnuPG-2 provides several utilities that are used by mail clients,
-such as Kmail and Balsa, including OpenPGP and S/MIME support.
-GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.5) in that
-it splits up functionality into several modules.  However, both
-versions may be installed alongside without any conflict.  In fact,
-the gpg version from GnuPG-1 is able to make use of the gpg-agent as
-included in GnuPG-2 and allows for seamless passphrase caching.  The
-advantage of GnuPG-1 is its smaller size and the lack of dependency on
-other modules at run and build time.
diff -r 4be50b105fa0 -r e961508e8b8c security/gnupg21/Makefile
--- a/security/gnupg21/Makefile Tue Aug 29 12:11:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-# $NetBSD: Makefile,v 1.34 2017/08/11 01:12:43 ryoon Exp $
-
-DISTNAME=      gnupg-2.1.23
-PKGNAME=       ${DISTNAME:S/gnupg-/gnupg21-/}
-CATEGORIES=    security
-MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
-EXTRACT_SUFX=  .tar.bz2
-
-MAINTAINER=    ada%netbsdfr.org@localhost
-HOMEPAGE=      https://www.gnupg.org/
-COMMENT=       GnuPG with OpenPGP and S/MIME capabilities
-LICENSE=       gnu-gpl-v3
-
-DEPENDS+=      pinentry-[0-9]*:../../security/pinentry
-
-CONFLICTS=     dirmngr-[0-9]*
-
-BUILD_DEFS+=           VARBASE
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake pkg-config makeinfo
-USE_LIBTOOL=           yes
-INFO_FILES=            yes
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-g13
-CONFIGURE_ARGS+=       --enable-gpg-is-gpg2
-
-# one test failure in 2.1.20, fixed upstream; see
-# https://dev.gnupg.org/T3047
-TEST_TARGET=           check
-
-# SunOS does have getaddrinfo() and the code knows how to use it
-CONFIGURE_ARGS.SunOS+= ac_cv_func_getaddrinfo=yes
-
-LDFLAGS.Darwin+=       -lintl -lresolv
-LDFLAGS.SunOS+=                -lintl -lsocket
-
-.include "options.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgcrypt+=      libgcrypt>=1.7
-.include "../../security/libgcrypt/buildlink3.mk"
-.include "../../databases/sqlite3/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgpg-error+=   libgpg-error>=1.24
-.include "../../security/libgpg-error/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libassuan+=      libassuan>=2.4.3
-.include "../../security/libassuan2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libksba+=                libksba>=1.3.4
-.include "../../security/libksba/buildlink3.mk"
-BUILDLINK_API_DEPENDS.npth+=           npth>=0.91
-.include "../../devel/npth/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r 4be50b105fa0 -r e961508e8b8c security/gnupg21/PLIST
--- a/security/gnupg21/PLIST    Tue Aug 29 12:11:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2017/07/28 19:33:24 wiz Exp $
-bin/dirmngr
-bin/dirmngr-client
-bin/g13
-bin/gpg-agent
-bin/gpg-connect-agent
-bin/gpg2
-bin/gpgconf
-bin/gpgparsemail
-bin/gpgscm
-bin/gpgsm
-bin/gpgtar
-bin/gpgv2
-bin/kbxutil
-bin/watchgnupg
-info/gnupg.info
-${PLIST.ldap}libexec/dirmngr_ldap
-libexec/gpg-check-pattern
-libexec/gpg-preset-passphrase
-libexec/gpg-protect-tool
-libexec/gpg-wks-client
-libexec/scdaemon
-man/man1/dirmngr-client.1
-man/man1/gpg-agent.1
-man/man1/gpg-connect-agent.1
-man/man1/gpg-preset-passphrase.1
-man/man1/gpg-wks-client.1
-man/man1/gpg-wks-server.1
-man/man1/gpg2.1
-man/man1/gpgconf.1
-man/man1/gpgparsemail.1
-man/man1/gpgsm.1
-man/man1/gpgv2.1
-man/man1/scdaemon.1
-man/man1/symcryptrun.1
-man/man1/watchgnupg.1
-man/man7/gnupg.7
-man/man8/addgnupghome.8
-man/man8/applygnupgdefaults.8
-man/man8/dirmngr.8
-sbin/addgnupghome
-sbin/applygnupgdefaults
-sbin/g13-syshelp
-share/doc/gnupg/DCO
-share/doc/gnupg/DETAILS
-share/doc/gnupg/FAQ
-share/doc/gnupg/HACKING
-share/doc/gnupg/KEYSERVER
-share/doc/gnupg/OpenPGP
-share/doc/gnupg/README
-share/doc/gnupg/TRANSLATE
-share/doc/gnupg/examples/README
-share/doc/gnupg/examples/debug.prf
-share/doc/gnupg/examples/gpgconf.conf
-share/doc/gnupg/examples/pwpattern.list
-share/doc/gnupg/examples/scd-event
-share/doc/gnupg/examples/systemd-user/README
-share/doc/gnupg/examples/systemd-user/dirmngr.service
-share/doc/gnupg/examples/systemd-user/dirmngr.socket
-share/doc/gnupg/examples/systemd-user/gpg-agent-browser.socket
-share/doc/gnupg/examples/systemd-user/gpg-agent-extra.socket
-share/doc/gnupg/examples/systemd-user/gpg-agent-ssh.socket
-share/doc/gnupg/examples/systemd-user/gpg-agent.service
-share/doc/gnupg/examples/systemd-user/gpg-agent.socket
-share/doc/gnupg/examples/trustlist.txt
-share/doc/gnupg/examples/vsnfd.prf
-share/gnupg/distsigkey.gpg
-share/gnupg/help.be.txt
-share/gnupg/help.ca.txt
-share/gnupg/help.cs.txt
-share/gnupg/help.da.txt
-share/gnupg/help.de.txt
-share/gnupg/help.el.txt
-share/gnupg/help.eo.txt
-share/gnupg/help.es.txt
-share/gnupg/help.et.txt
-share/gnupg/help.fi.txt
-share/gnupg/help.fr.txt
-share/gnupg/help.gl.txt
-share/gnupg/help.hu.txt
-share/gnupg/help.id.txt
-share/gnupg/help.it.txt
-share/gnupg/help.ja.txt
-share/gnupg/help.nb.txt
-share/gnupg/help.pl.txt
-share/gnupg/help.pt.txt
-share/gnupg/help.pt_BR.txt
-share/gnupg/help.ro.txt
-share/gnupg/help.ru.txt
-share/gnupg/help.sk.txt
-share/gnupg/help.sv.txt
-share/gnupg/help.tr.txt
-share/gnupg/help.txt
-share/gnupg/help.zh_CN.txt
-share/gnupg/help.zh_TW.txt
-share/gnupg/sks-keyservers.netCA.pem
-share/locale/ca/LC_MESSAGES/gnupg2.mo
-share/locale/cs/LC_MESSAGES/gnupg2.mo
-share/locale/da/LC_MESSAGES/gnupg2.mo
-share/locale/de/LC_MESSAGES/gnupg2.mo
-share/locale/el/LC_MESSAGES/gnupg2.mo
-share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
-share/locale/en@quot/LC_MESSAGES/gnupg2.mo
-share/locale/eo/LC_MESSAGES/gnupg2.mo
-share/locale/es/LC_MESSAGES/gnupg2.mo
-share/locale/et/LC_MESSAGES/gnupg2.mo
-share/locale/fi/LC_MESSAGES/gnupg2.mo
-share/locale/fr/LC_MESSAGES/gnupg2.mo
-share/locale/gl/LC_MESSAGES/gnupg2.mo
-share/locale/hu/LC_MESSAGES/gnupg2.mo
-share/locale/id/LC_MESSAGES/gnupg2.mo
-share/locale/it/LC_MESSAGES/gnupg2.mo
-share/locale/ja/LC_MESSAGES/gnupg2.mo
-share/locale/nb/LC_MESSAGES/gnupg2.mo
-share/locale/pl/LC_MESSAGES/gnupg2.mo
-share/locale/pt/LC_MESSAGES/gnupg2.mo
-share/locale/ro/LC_MESSAGES/gnupg2.mo
-share/locale/ru/LC_MESSAGES/gnupg2.mo
-share/locale/sk/LC_MESSAGES/gnupg2.mo
-share/locale/sv/LC_MESSAGES/gnupg2.mo
-share/locale/tr/LC_MESSAGES/gnupg2.mo
-share/locale/uk/LC_MESSAGES/gnupg2.mo
-share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
-share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
diff -r 4be50b105fa0 -r e961508e8b8c security/gnupg21/distinfo
--- a/security/gnupg21/distinfo Tue Aug 29 12:11:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.20 2017/08/11 01:12:43 ryoon Exp $
-
-SHA1 (gnupg-2.1.23.tar.bz2) = c470777eaa9657ef3258068507065c9a7caef9eb
-RMD160 (gnupg-2.1.23.tar.bz2) = 622eef6554d77c2e0a2c04bd16dcebfbee2265ad
-SHA512 (gnupg-2.1.23.tar.bz2) = 8b8be0784129f5aa0ccde32a413a68c36e0e4131abe70c3eb186958c60f3df1023deb2db2db84d63ad30a3408a75c7622b430aff1a524ff28a24be511c952412
-Size (gnupg-2.1.23.tar.bz2) = 6526734 bytes
diff -r 4be50b105fa0 -r e961508e8b8c security/gnupg21/options.mk
--- a/security/gnupg21/options.mk       Tue Aug 29 12:11:36 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2016/07/02 15:16:11 wiz Exp $
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gnupg21
-PKG_SUPPORTED_OPTIONS= ldap libusb-1
-PKG_SUGGESTED_OPTIONS= libusb-1
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+=           ldap
-.if !empty(PKG_OPTIONS:Mldap)
-CONFIGURE_ARGS+=       --with-ldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST.ldap=            yes
-.include "../../databases/openldap-client/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-ldap
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibusb-1)
-# gnupg unfortunately doesn't use pkg-config
-CONFIGURE_ARGS+=       CPPFLAGS="${CPPFLAGS} -I${BUILDLINK_PREFIX.libusb1}/include/libusb-1.0"
-CONFIGURE_ARGS+=       LDFLAGS="${LDFLAGS} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libusb1}/lib -L${BUILDLINK_PREFIX.libusb1}/lib"
-.include "../../devel/libusb1/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-ccid-driver
-.endif