[pkgsrc/trunk]: pkgsrc/security/gnupg devel/gnupg: Stop installing gpgsplit, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8af2d6b164f
branches:  trunk
changeset: 438477:c8af2d6b164f
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Sep 07 13:08:28 2020 +0000

description:
devel/gnupg: Stop installing gpgsplit, because it conflicts with gnupg2

gpgsplit has been installed by gnupg(1) since 2002.  gpgsplit has also
been in tools/ within gnupg-2, but upstream recently moved it from
noinst_PROGRAMS to bin_PROGRAMS without noting this in NEWS.

Because gnugp2 is normal and gnupg remains for special cases, simply
drop gpgsplit from gnupg; we have no intent to save people from
installing gnupg2 -- only to continue to allow them to use the old gpg
binary for special uses.

diffstat:

 security/gnupg/Makefile                        |   4 ++--
 security/gnupg/PLIST                           |   3 +--
 security/gnupg/distinfo                        |   3 ++-
 security/gnupg/patches/patch-tools_Makefile.in |  14 ++++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 76a5e34b836a -r c8af2d6b164f security/gnupg/Makefile
--- a/security/gnupg/Makefile   Mon Sep 07 12:50:23 2020 +0000
+++ b/security/gnupg/Makefile   Mon Sep 07 13:08:28 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.156 2020/05/22 10:56:36 adam Exp $
+# $NetBSD: Makefile,v 1.157 2020/09/07 13:08:28 gdt Exp $
 
 DISTNAME=      gnupg-1.4.23
-PKGREVISION=   10
+PKGREVISION=   11
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.gnupg.org/gcrypt/gnupg/
 MASTER_SITES+= ftp://ftp.ring.gr.jp/pub/net/gnupg/gnupg/
diff -r 76a5e34b836a -r c8af2d6b164f security/gnupg/PLIST
--- a/security/gnupg/PLIST      Mon Sep 07 12:50:23 2020 +0000
+++ b/security/gnupg/PLIST      Mon Sep 07 13:08:28 2020 +0000
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.28 2015/02/28 00:13:25 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2020/09/07 13:08:28 gdt Exp $
 bin/gpg
 bin/gpg-zip
-bin/gpgsplit
 bin/gpgv
 info/gnupg1.info
 libexec/gnupg/gpgkeys_curl
diff -r 76a5e34b836a -r c8af2d6b164f security/gnupg/distinfo
--- a/security/gnupg/distinfo   Mon Sep 07 12:50:23 2020 +0000
+++ b/security/gnupg/distinfo   Mon Sep 07 13:08:28 2020 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.72 2018/06/15 21:51:23 tez Exp $
+$NetBSD: distinfo,v 1.73 2020/09/07 13:08:28 gdt Exp $
 
 SHA1 (gnupg-1.4.23.tar.bz2) = 13747486ed5ff707f796f34f50f4c3085c3a6875
 RMD160 (gnupg-1.4.23.tar.bz2) = 087c494ff78bd1e85873ac383e0c6e236b6a9869
 SHA512 (gnupg-1.4.23.tar.bz2) = 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
 Size (gnupg-1.4.23.tar.bz2) = 3749353 bytes
 SHA1 (patch-ab) = 24e200a04f8f31e53e22dc80ed079570cb5de8d8
+SHA1 (patch-tools_Makefile.in) = 55227d3932b49eae8689051df249c69a6568ef63
diff -r 76a5e34b836a -r c8af2d6b164f security/gnupg/patches/patch-tools_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/gnupg/patches/patch-tools_Makefile.in    Mon Sep 07 13:08:28 2020 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_Makefile.in,v 1.1 2020/09/07 13:08:28 gdt Exp $
+
+--- tools/Makefile.in.orig     2018-06-11 08:47:56.000000000 +0000
++++ tools/Makefile.in
+@@ -98,7 +98,8 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ @HAVE_DOSISH_SYSTEM_FALSE@am__append_1 = -DLOCALEDIR="\"$(localedir)\""
+-bin_PROGRAMS = gpgsplit$(EXEEXT)
++#gpgsplit is now in gnupg-2
++#bin_PROGRAMS = gpgsplit$(EXEEXT)
+ noinst_PROGRAMS = mpicalc$(EXEEXT) bftest$(EXEEXT) clean-sat$(EXEEXT) \
+       mk-tdata$(EXEEXT) shmtest$(EXEEXT) make-dns-cert$(EXEEXT) \
+       $(am__EXEEXT_1)