From a383a0cae8f86a6d01f8201294e580a04735b1fc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 10 Nov 2014 22:36:51 +0000
Subject: [PATCH] serf: bump version

* fix pkgconfig file
---
 ...serf-1.3.7.patchset => serf-1.3.8.patchset} |  0
 .../{serf-1.3.7.recipe => serf-1.3.8.recipe}   | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 rename net-libs/serf/patches/{serf-1.3.7.patchset => serf-1.3.8.patchset} (100%)
 rename net-libs/serf/{serf-1.3.7.recipe => serf-1.3.8.recipe} (72%)

diff --git a/net-libs/serf/patches/serf-1.3.7.patchset b/net-libs/serf/patches/serf-1.3.8.patchset
similarity index 100%
rename from net-libs/serf/patches/serf-1.3.7.patchset
rename to net-libs/serf/patches/serf-1.3.8.patchset
diff --git a/net-libs/serf/serf-1.3.7.recipe b/net-libs/serf/serf-1.3.8.recipe
similarity index 72%
rename from net-libs/serf/serf-1.3.7.recipe
rename to net-libs/serf/serf-1.3.8.recipe
index ce2dd035a..ac8eab22b 100644
--- a/net-libs/serf/serf-1.3.7.recipe
+++ b/net-libs/serf/serf-1.3.8.recipe
@@ -9,11 +9,11 @@ HOMEPAGE="http://code.google.com/p/serf/"
 LICENSE="Apache v2"
 COPYRIGHT="2002-2013 Justin Erenkrantz and Greg Stein"
 SRC_URI="http://serf.googlecode.com/svn/src_releases/serf-$portVersion.tar.bz2"
-CHECKSUM_SHA256="ecccb74e665e6ea7539271e126a21d0f7eeddfeaa8ce090adb3aec6682f9f0ae"
+CHECKSUM_SHA256="e0500be065dbbce490449837bb2ab624e46d64fc0b090474d9acaa87c82b2590"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-PATCHES="serf-1.3.7.patchset"
+PATCHES="serf-$portVersion.patchset"
 
 PROVIDES="
 	serf$secondaryArchSuffix = $portVersion
@@ -67,6 +67,18 @@ INSTALL()
 	
 	fixPkgconfig
 	
+	# The pkgconfig file 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~libaprutil_1$secondaryArchSuffix/$relativeDevelopLibDir"
+	sed -i -e "s,^\(Libs.private.*\)-L.* \(-laprutil.*\)$,\1-L$linksDir \2," \
+		$developLibDir/pkgconfig/serf-1.pc
+	local linksDir="$packageLinksDir/${develPackageName}/devel~libapr_1$secondaryArchSuffix/$relativeDevelopLibDir"
+	sed -i -e "s,\-L/packages/apr-1.* \(-lapr-1 .*\)$,-L$linksDir \1," \
+		$developLibDir/pkgconfig/serf-1.pc
+	
+	
 	# devel package
 	packageEntries devel $developDir
 }
@@ -79,4 +91,6 @@ PROVIDES_devel="
 	"
 REQUIRES_devel="
 	serf$secondaryArchSuffix == $portVersion base
+	devel:libapr_1$secondaryArchSuffix
+	devel:libaprutil_1$secondaryArchSuffix
 	"