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

Also add missing libiconv requires for apr_util.

app-text/texi2html/texi2html-1.82.recipe

@@ -9,7 +9,7 @@ COPYRIGHT="1999-2005 Patrice Dumas, Derek Price, Adrian Aichner & others."
 LICENSE="GNU GPL v2"
 SRC_URI="http://download.savannah.gnu.org/releases/texi2html/texi2html-1.82.tar.bz2"
 CHECKSUM_MD5="a8a9193c0ac1bec2f3ca7be40a5a82eb"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="any"
 
 PATCHES="texi2html-1.82.patchset"
@@ -39,7 +39,7 @@ BUILD()
 {
 	libtoolize --force --copy --install
 	./autogen.sh
-	PERL="$portPackageLinksDir/cmd:perl/bin/perl" runConfigure ./configure
+	PERL="$portPackageLinksDir/cmd~perl/bin/perl" runConfigure ./configure
 	make $jobArgs
 }
 

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

dev-vcs/subversion/subversion-1.6.18.recipe

@@ -12,7 +12,7 @@ LICENSE="Apache-Subversion"
 COPYRIGHT="2010 The Apache Software Foundation"
 SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2"
 CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925"
-REVISION="5"
+REVISION="6"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="subversion-1.6.18.patch"
@@ -94,10 +94,10 @@ BUILD()
 	aclocal -I build -I build/ac-macros
 	autoconf
 	runConfigure ./configure \
-		--with-apr=$portPackageLinksDir/devel:libapr_1 \
-		--with-apr-util=$portPackageLinksDir/devel:libaprutil_1 \
+		--with-apr=$portPackageLinksDir/devel~libapr_1 \
+		--with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \
 		--with-neon=$portPackageLinksDir/neon_devel \
-		--with-zlib=$portPackageLinksDir/devel:libz \
+		--with-zlib=$portPackageLinksDir/devel~libz \
 		--with-editor=nano \
 		--disable-nls
 	make $jobArgs

haiku-apps/wonderbrush/wonderbrush-2.1.2.recipe

@@ -8,7 +8,7 @@ LICENSE="WonderBrush"
 COPYRIGHT="2005, Stephan Aßmus und Ingo Weinhold GbR"
 SRC_URI="http://yellowbites.com/downloads/WonderBrush-2.1.2-x86-gcc2-2013-01-02.zip#noarchive"
 CHECKSUM_MD5="28e64a56946c9f5aefa40486f35ffc77"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 !x86"
 DISABLE_SOURCE_PACKAGE=yes
 
@@ -47,9 +47,9 @@ INSTALL()
 
 	# Hack to make libfreetype and libz available under the name WonderBrush
 	# has been linked against them.
-	ln -s $portPackageLinksDir/lib:libfreetype/lib/libfreetype.so.6 \
+	ln -s $portPackageLinksDir/lib~libfreetype/lib/libfreetype.so.6 \
 		$wonderbrushDir/lib/libfreetype.so
-	ln -s $portPackageLinksDir/lib:libz/lib/libz.so.1 \
+	ln -s $portPackageLinksDir/lib~libz/lib/libz.so.1 \
 		$wonderbrushDir/lib/libz.so
 
 	addAppDeskbarSymlink $wonderbrushDir/WonderBrush

haiku-libs/haikuwebkit/haikuwebkit-1.1.3_2013_08_09.recipe

@@ -10,7 +10,7 @@ LICENSE="
 	"
 SRC_URI="http://www.haiku-files.org/files/haiku-webkit-lastgood-no-tests-2013-08-09.tar.bz2"
 CHECKSUM_MD5="a6551b2573612678e9d2d27fda4fae48"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -69,7 +69,7 @@ BUILD()
 	export WEBKIT_REVISION=$webkitRevision
 	export HAIKU_WEBKIT_REVISION=$haikuWebkitRevision
 
-	libxml2Dir=$portPackageLinksDir/devel:libxml2$secondaryArchSuffix
+	libxml2Dir=$portPackageLinksDir/devel~libxml2$secondaryArchSuffix
 	libxml2Includes=$libxml2Dir/$relativeIncludeDir/libxml2
 	compileFlags="-sCCFLAGS=-I$libxml2Includes -sC++FLAGS=-I$libxml2Includes"
 

media-video/ffmpeg/ffmpeg-0.10.2.recipe

@@ -11,7 +11,7 @@ COPYRIGHT="
 	"
 SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2"
 CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
@@ -77,7 +77,7 @@ PATCH()
 		doc/ffserver.texi
 
 	# patch hard-coded paths to perl
-	sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd:perl/bin/perl," \
+	sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd~perl/bin/perl," \
 		Doxyfile \
 		doc/texi2pod.pl
 }

net-misc/openssh/openssh-6.0p1.recipe

@@ -4,7 +4,7 @@ LICENSE="OpenSSH"
 COPYRIGHT="2005-2012 Tatu Ylonen et al."
 SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.0p1.tar.gz"
 CHECKSUM_MD5="3c9347aa67862881c5da3f3b1c08da7b"
-REVISION="6"
+REVISION="7"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="openssh-6.0p1.patch"
@@ -88,8 +88,8 @@ BUILD()
 
 	# Note: override sysconfdir and libexecdir since ssh doesn't create
 	# subdirectories as it should.
-	PATH_PASSWD_PROG=$portPackageLinksDir/cmd:passwd/bin/passwd \
-	LOGIN_PROGRAM=$portPackageLinksDir/cmd:login/bin/login \
+	PATH_PASSWD_PROG=$portPackageLinksDir/cmd~passwd/bin/passwd \
+	LOGIN_PROGRAM=$portPackageLinksDir/cmd~login/bin/login \
 	runConfigure ./configure \
 		--sysconfdir=$sysconfDir/ssh \
 		--libexecdir=$libExecDir/openssh \