Replace ':' in package link paths by '~'

Also add missing libiconv requires for apr_util.

dev-libs/apr_util/apr_util-1.4.1.recipe

@@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
 LICENSE="Apache v2"
 COPYRIGHT="2011 The Apache Software Foundation."
 CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="apr_util-1.4.1.patch"
@@ -17,10 +17,12 @@ REQUIRES="
 	haiku >= $haikuVersion
 	lib:libapr_1
 	lib:libexpat
+	lib:libiconv
 	"
 BUILD_REQUIRES="
 	devel:libapr_1 >= 0.4.6
 	devel:libexpat >= 1.5.2
+	devel:libiconv
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
@@ -42,8 +44,8 @@ PATCH()
 
 BUILD()
 {
-	aprInstallDir=$portPackageLinksDir/apr_devel
-	expatInstallDir=$portPackageLinksDir/expat_devel
+	aprInstallDir=$portPackageLinksDir/lib~libapr_1
+	expatInstallDir=$portPackageLinksDir/lib~libexpat
 
 	rm -rf aclocal.m4
 	mkdir -p m4