From 1a7a9141fa6049faec225cc9008a17b0510a8e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 8 Nov 2014 02:20:06 +0100
Subject: [PATCH] Update gnupg recipe & patch

- correctly fix detection of libnetwork to not also
link to libsocket or libbind.

- add missing optional dependencies, including libusb (probably
used to interface with smartcard readers but it's entirely untested).
---
 app-crypt/gnupg/gnupg-1.4.16.recipe           | 18 +++++++-
 app-crypt/gnupg/patches/gnupg-1.4.16.patchset | 44 +++++++++++++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 app-crypt/gnupg/patches/gnupg-1.4.16.patchset

diff --git a/app-crypt/gnupg/gnupg-1.4.16.recipe b/app-crypt/gnupg/gnupg-1.4.16.recipe
index 0373d0660..3d7f80f87 100644
--- a/app-crypt/gnupg/gnupg-1.4.16.recipe
+++ b/app-crypt/gnupg/gnupg-1.4.16.recipe
@@ -24,23 +24,39 @@ PROVIDES="gnupg = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
+	lib:libcurl
+	lib:libiconv
+	lib:libintl
+	lib:libreadline
+	lib:libusb_0.1
 	lib:libz
 	"
 BUILD_REQUIRES="
+	devel:libcurl
+	devel:libiconv
+	devel:libintl
+	devel:libreadline
+	devel:libusb_0.1
+	devel:libz
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:autoconf
+	cmd:bison
 	cmd:gcc
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
+	cmd:msgfmt
+	cmd:perl
+	cmd:tar
 	"
+PATCHES="gnupg-1.4.16.patchset"
 
 BUILD()
 {
 	#libtoolize --force --copy --install
-	#autoconf
+	autoconf
 	runConfigure ./configure 
 	make $jobArgs
 }
diff --git a/app-crypt/gnupg/patches/gnupg-1.4.16.patchset b/app-crypt/gnupg/patches/gnupg-1.4.16.patchset
new file mode 100644
index 000000000..ed33eabb2
--- /dev/null
+++ b/app-crypt/gnupg/patches/gnupg-1.4.16.patchset
@@ -0,0 +1,44 @@
+From b6a2edd27beef20ef6fc938ea930397e5d7bd484 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Sat, 8 Nov 2014 02:08:06 +0100
+Subject: [PATCH] Fix detection of libnetwork
+
+---
+ configure.ac | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af78185..7649857 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -673,10 +673,12 @@ dnl for ldap, for example. If ldap libs are static (or dynamic and without
+ dnl ELF runtime link paths), then link will fail and LDAP support won't
+ dnl be detected.
+ 
+-AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname,
+-	[NETLIBS="-lnsl $NETLIBS"]))
+-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
+-	[NETLIBS="-lsocket $NETLIBS"]))
++_net_save_libs=$LIBS
++LIBS=""
++AC_SEARCH_LIBS(gethostbyname, nsl network)
++AC_SEARCH_LIBS(setsockopt, network socket)
++NETLIBS="$LIBS"
++LIBS="$_net_save_libs"
+ 
+ dnl Now try for the resolver functions so we can use DNS for SRV, PKA,
+ dnl and CERT.
+@@ -704,8 +706,8 @@ if test x"$use_dns_pka" = xyes || test x"$use_dns_srv" = xyes || test x"$use_dns
+   _dns_save_libs=$LIBS
+   LIBS=""
+   # the double underscore thing is a glibc-ism?
+-  AC_SEARCH_LIBS(res_query,resolv bind socket,,
+-            AC_SEARCH_LIBS(__res_query,resolv bind socket,,have_resolver=no))
++  AC_SEARCH_LIBS(res_query,resolv network bind socket,,
++            AC_SEARCH_LIBS(__res_query,resolv network bind socket,,have_resolver=no))
+   AC_SEARCH_LIBS(dn_expand,resolv bind socket,,
+             AC_SEARCH_LIBS(__dn_expand,resolv bind socket,,have_resolver=no))
+   AC_SEARCH_LIBS(dn_skipname,resolv bind socket,,
+-- 
+1.8.3.4
+