From e62a287130fde3dcf5c1173139c7bd7f4df312bd Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 24 Nov 2015 19:15:14 +0000
Subject: [PATCH] libassuan: added recipe for version 2.4.1.

---
 dev-libs/libassuan/libassuan-2.4.1.recipe     | 85 +++++++++++++++++++
 .../patches/libassuan-2.4.1.patchset          | 31 +++++++
 2 files changed, 116 insertions(+)
 create mode 100644 dev-libs/libassuan/libassuan-2.4.1.recipe
 create mode 100644 dev-libs/libassuan/patches/libassuan-2.4.1.patchset

diff --git a/dev-libs/libassuan/libassuan-2.4.1.recipe b/dev-libs/libassuan/libassuan-2.4.1.recipe
new file mode 100644
index 000000000..14da27c67
--- /dev/null
+++ b/dev-libs/libassuan/libassuan-2.4.1.recipe
@@ -0,0 +1,85 @@
+SUMMARY="IPC library used by GnuPG and GPGME"
+DESCRIPTION="
+Libassuan is a small library implementing the so-called Assuan protocol. \
+This protocol is used for IPC between most newer GnuPG components. \
+Both, server and client side functions are provided.
+"
+LICENSE="
+	GNU GPL v3
+	GNU LGPL v2.1
+	"
+COPYRIGHT="2003-2013 g10 Code GmbH"
+HOMEPAGE="http://www.gnupg.org/related_software/libassuan/index.en.html"
+SOURCE_URI="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c5738a55efd101438a25d86dc0c342a8e5da1339161a4eee1bbdc2088b88b71f"
+REVISION="1"; updateRevisionVariables
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	libassuan$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libassuan$secondaryArchSuffix = 0.7.1 compat >= 0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgpg_error${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgpg_error${secondaryArchSuffix}
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:awk
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:git
+	cmd:ld$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+PATCHES="libassuan-$portVersion.patchset"
+
+BUILD()
+{
+	autoconf
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLibs libassuan
+
+	# The libtool files reference other libraries using the wrong paths, which
+	# creates a lot of confusion. Fix them so correct paths are used.
+	local develPackageName="${portName}_devel-$portFullVersion"
+	local packageLinksDir=$(dirname $portPackageLinksDir)
+	local linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix/$relativeDevelopLibDir"
+	sed -i -e "s,^\(dependency_libs.*\)-L.*$,\1 -L$linksDir $linksDir/libassuan.la\'," \
+		$developLibDir/libassuan.la
+	sed -i -e "s,\(gpg_error_libs.*\)-L.*\( -lgpg-error\),\1-L$linksDir\2," \
+		$binDir/libassuan-config
+	linksDir="$packageLinksDir/${develPackageName}/devel~libgpg_error$secondaryArchSuffix"
+	sed -i -e "s,\(gpg_error_cflags.*\)-I.*/develop,\1-I$linksDir/develop," \
+		$binDir/libassuan-config
+
+	packageEntries devel \
+		$developDir $binDir/libassuan-config
+}
+
+PROVIDES_devel="
+	libassuan${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	cmd:libassuan_config$secondaryArchSuffix = $portVersion compat >= 1
+	devel:libassuan$secondaryArchSuffix = 0.7.1 compat >= 0
+	"
+
+REQUIRES_devel="
+	libassuan$secondaryArchSuffix == $portVersion
+	devel:libgpg_error${secondaryArchSuffix}
+	"
diff --git a/dev-libs/libassuan/patches/libassuan-2.4.1.patchset b/dev-libs/libassuan/patches/libassuan-2.4.1.patchset
new file mode 100644
index 000000000..598f48390
--- /dev/null
+++ b/dev-libs/libassuan/patches/libassuan-2.4.1.patchset
@@ -0,0 +1,31 @@
+From c8ac5a2281347d8df7a423885f68ed8039f26b93 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Sun, 16 Nov 2014 15:43:14 +0100
+Subject: [PATCH] Fix setsockopt test to search for libnetwork as well
+
+Rewrite to use AC_SEARCH_LIBS.
+---
+ configure.ac | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cb21af1..ca82038 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -263,9 +263,11 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP",
+ #
+ # Check for network libraries.  They are needed for tests.
+ #
+-AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt,
+-	[NETLIBS="-lsocket $NETLIBS"]))
++_save_libs="$LIBS"
++AC_SEARCH_LIBS(setsockopt, network socket, [], [], [$NETLIBS])
++NETLIBS="$LIBS $NETLIBS"
+ AC_SUBST(NETLIBS)
++LIBS="$_save_libs"
+ 
+ if test "$have_w32_system" = yes; then
+    if test "$have_w32ce_system" = yes; then
+-- 
+1.8.3.4
+