From 6e34d5fe6c312ca0aa05b2ef9587c27be13e923b Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert@pkgsrc.org>
Date: Sat, 20 Aug 2016 13:40:30 +0000
Subject: Link gpgscm against libintl to fix build failures. Add required
 minimum versions of libcrypt and libksba.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reported by Andreas Kusalananda Kähäri in mail to pkgsrc-user.
---
 security/gnupg21/Makefile                               |  5 ++++-
 security/gnupg21/distinfo                               |  3 ++-
 security/gnupg21/patches/patch-tests_gpgscm_Makefile.in | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 security/gnupg21/patches/patch-tests_gpgscm_Makefile.in

diff --git a/security/gnupg21/Makefile b/security/gnupg21/Makefile
index c76d0792222..7678aa7a937 100644
--- a/security/gnupg21/Makefile
+++ b/security/gnupg21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/07/16 08:32:05 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/20 13:40:30 bsiegert Exp $
 
 DISTNAME=	gnupg-2.1.14
 PKGNAME=	${DISTNAME:S/gnupg-/gnupg21-/}
@@ -32,11 +32,14 @@ LDFLAGS.Darwin+=	-lresolv
 
 .include "options.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"
diff --git a/security/gnupg21/distinfo b/security/gnupg21/distinfo
index 19f5acc434b..187e5250faf 100644
--- a/security/gnupg21/distinfo
+++ b/security/gnupg21/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2016/07/16 08:32:05 wiz Exp $
+$NetBSD: distinfo,v 1.10 2016/08/20 13:40:30 bsiegert Exp $
 
 SHA1 (gnupg-2.1.14.tar.bz2) = bc7609a3a0daf0ed0efb22f77b43e82f28e20e34
 RMD160 (gnupg-2.1.14.tar.bz2) = 22d1f1791133f48ab71e900617ad7fd13c8a4e0f
@@ -7,3 +7,4 @@ Size (gnupg-2.1.14.tar.bz2) = 5706058 bytes
 SHA1 (patch-dirmngr_Makefile.in) = fa74bcf4ea214945c64d383dff039ab938ae1446
 SHA1 (patch-dirmngr_ks-engine-ldap.c) = 3a7d96d877cd52bed66c481af83da99c517d3380
 SHA1 (patch-kbx_Makefile.in) = 58f7c3711744a42d40f580944fb768f7aaaf1b68
+SHA1 (patch-tests_gpgscm_Makefile.in) = 9251e0b4a124812ff8d6c859519cb5c7faa6b712
diff --git a/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in b/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in
new file mode 100644
index 00000000000..7e5155c9a8c
--- /dev/null
+++ b/security/gnupg21/patches/patch-tests_gpgscm_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_gpgscm_Makefile.in,v 1.1 2016/08/20 13:40:30 bsiegert Exp $
+
+gpgscm needs libintl, at least on Darwin.
+
+--- tests/gpgscm/Makefile.in.orig	2016-08-20 13:25:51.000000000 +0000
++++ tests/gpgscm/Makefile.in
+@@ -458,7 +458,7 @@ gpgscm_SOURCES = main.c private.h ffi.c 
+ 
+ gpgscm_LDADD = $(LDADD) $(common_libs) \
+ 	$(NETLIBS) $(LIBICONV) $(LIBREADLINE) \
+-	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS)
++	$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL)
+ 
+ t_child_SOURCES = t-child.c
+ all: all-am
-- 
cgit v1.2.3