[pkgsrc/trunk]: pkgsrc/security/caff Fix bad merge on patch file which broke ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f10ebd238bb9
branches:  trunk
changeset: 367489:f10ebd238bb9
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Sep 02 18:15:42 2017 +0000

description:
Fix bad merge on patch file which broke the build under macOS Sierra.

diffstat:

 security/caff/distinfo               |   4 ++--
 security/caff/patches/patch-Makefile |  14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r 69771a614dff -r f10ebd238bb9 security/caff/distinfo
--- a/security/caff/distinfo    Sat Sep 02 17:45:10 2017 +0000
+++ b/security/caff/distinfo    Sat Sep 02 18:15:42 2017 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.31 2017/08/14 20:48:02 wiz Exp $
+$NetBSD: distinfo,v 1.32 2017/09/02 18:15:42 tron Exp $
 
 SHA1 (signing-party_2.6.orig.tar.gz) = 1c7be323c8fb27563713ee13feab39951a0749f9
 RMD160 (signing-party_2.6.orig.tar.gz) = 1d700c835449e8cbe350c032f0ad4d9a26afaa17
 SHA512 (signing-party_2.6.orig.tar.gz) = 094af9b354d958d382bf99a1f10a9f12585f85769686e3bc9b9b813016f68232775e4002c0a7accbc894c946f7532b32ee7f9b3e23d467b973041c092ba4efb9
 Size (signing-party_2.6.orig.tar.gz) = 201210 bytes
-SHA1 (patch-Makefile) = 8ec25bd7aa0ec6aea0efafb673a359d0dcbc01c8
+SHA1 (patch-Makefile) = 64a659cc698da2de7da600a34006254da90a158d
diff -r 69771a614dff -r f10ebd238bb9 security/caff/patches/patch-Makefile
--- a/security/caff/patches/patch-Makefile      Sat Sep 02 17:45:10 2017 +0000
+++ b/security/caff/patches/patch-Makefile      Sat Sep 02 18:15:42 2017 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-Makefile,v 1.2 2017/08/14 20:48:02 wiz Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/09/02 18:15:42 tron Exp $
 
 Don't attempt to build "keyanalyze" and related utilties. They don't build
 on systems without SHA1 hash functions in the system library and we don't
 install them in the first place.
 
---- Makefile.orig      2017-07-07 15:06:13.000000000 +0000
-+++ Makefile
-@@ -1,4 +1,4 @@
+--- Makefile.orig      2017-07-07 16:06:13.000000000 +0100
++++ Makefile   2017-09-02 19:14:30.000000000 +0100
+@@ -1,6 +1,4 @@
 --include /usr/share/dpkg/pkg-info.mk
+-
+-DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
 +DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keylookup \
- 
- DIRS=caff gpg-key2ps gpg-mailkeys gpgsigs gpglist gpgparticipants keyanalyze keylookup \
       sig2dot springgraph gpgwrap gpgdir keyart gpg-key2latex
+ TGZ=../signing-party_$(DEB_VERSION_UPSREAM).orig.tar.gz
+ TGZ_DIR=signing-party-$(DEB_VERSION_UPSREAM)