apr_util: fix recipe.

* remove an old recipe.

dev-libs/apr_util/apr_util-1.5.3.recipe

@@ -1,128 +0,0 @@
-SUMMARY="Apache Portable Runtime Utility Library"
-HOMEPAGE="http://apr.apache.org/"
-SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-1.5.3.tar.gz"
-CHECKSUM_SHA256="76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"
-LICENSE="Apache v2"
-COPYRIGHT="2011 The Apache Software Foundation."
-REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PATCHES="apr_util-1.5.3.patch"
-
-PROVIDES="
-	apr_util = $portVersion compat >= 1
-	lib:libaprutil_1 = 0.5.3 compat >= 0
-	"
-REQUIRES="
-	haiku
-	lib:libapr_1
-	lib:libexpat
-	lib:libiconv
-	"
-BUILD_REQUIRES="
-	devel:libapr_1 >= 0.5.0
-	devel:libexpat
-	devel:libiconv
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autoheader
-	cmd:gcc
-	cmd:ld
-	cmd:libtoolize
-	cmd:make
-	"
-
-SOURCE_DIR="apr-util-$portVersion"
-
-PATCH()
-{
-	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
-}
-
-BUILD()
-{
-	aprInstallDir=$portPackageLinksDir/lib~libapr_1
-	expatInstallDir=$portPackageLinksDir/lib~libexpat
-
-	rm -rf aclocal.m4
-	mkdir -p m4
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf -f
-
-	cd xml/expat
-	mkdir -p m4
-	libtoolize -fci
-	aclocal --install -I m4
-	autoconf --force
-	autoheader
-	touch libtool.m4
-	cd ../..
-
-	# TODO: fix this hack!
-	cp /boot/system/bin/libtool .
-	ln -sfn $sourceDir/libtool /libtool
-
-	runConfigure ./configure \
-		--with-apr=$aprInstallDir \
-		--with-expat=$expatInstallDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# prepare develop/lib
-	prepareInstalledDevelLibs libaprutil-1
-	fixPkgconfig
-
-	# fix apu-1-config
-	fixDevelopLibDirReferences $binDir/apu-1-config
-
-	# remove superfluous .exp file
-	rm $libDir/aprutil.exp
-
-	# devel package
-	packageEntries devel \
-		$binDir \
-		$developDir
-}
-
-DESCRIPTION="
-The mission of the Apache Portable Runtime (APR) project is to create and \
-maintain software libraries that provide a predictable and consistent \
-interface to underlying platform-specific implementations. The primary goal is \
-to provide an API to which software developers may code and be assured of \
-predictable if not identical behaviour regardless of the platform on which \
-their software is built, relieving them of the need to code special-case \
-conditions to work around or take advantage of platform-specific deficiencies \
-or features.
-To give a brief overview, the primary core subsystems of APR 1.x include the \
-following:
-- atomic operations
-- dynamic Shared Object loading
-- file I/O
-- locks (mutexes, condition variables, etc)
-- memory management (high performance allocators)
-- memory-mapped files
-- multicast Sockets
-- network I/O
-- shared memory
-- thread and Process management
-- various data structures (tables, hashes, priority queues, etc)
-"
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	apr_util_devel = portVersion compat >= 1
-	cmd:apu_1_config = $portVersion compat >= 1
-	devel:libaprutil_1 = 0.5.3 compat >= 0
-	"
-REQUIRES_devel="
-	apr_util == $portVersion base
-	"

dev-libs/apr_util/apr_util-1.5.4.recipe

@@ -10,11 +10,11 @@ deficiencies or features."
 HOMEPAGE="http://apr.apache.org/"
 COPYRIGHT="2011 The Apache Software Foundation."
 LICENSE="Apache v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://archive.apache.org/dist/apr/apr-util-$portVersion.tar.gz"
 CHECKSUM_SHA256="976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"
 SOURCE_DIR="apr-util-$portVersion"
-PATCHES="apr_util-1.5.3.patch"
+PATCHES="apr_util-$portVersion.patch"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -79,10 +79,6 @@ BUILD()
 	touch libtool.m4
 	cd ../..
 
-	# TODO: fix this hack!
-	cp /boot/system/bin/libtool .
-	ln -sfn $sourceDir/libtool /libtool
-
 	runConfigure ./configure \
 		--with-apr=/$relativeBinDir \
 		--with-expat=$expatInstallDir