Update apr_util recipe

* Rename patch to match package name.
* Specify patch explicitly. Previously patch wasn't picked up anymore
  due to its name not matching the package name.
* Add cmd:apu_1_config to provides.
* Move patch command from BUILD to PATCH.
* Use runConfigure.
* Use jobArgs.
* Fix developLibDir paths in apu-1-config.
* Patch build/apu-conf.m4 so the correct include and library path is
  used for expat.
* Remove old patches.

dev-libs/apr_util/apr_util-1.4.1.recipe

@@ -4,11 +4,14 @@ 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="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 ?x86"
 
+PATCHES="apr_util-1.4.1.patch"
+
 PROVIDES="
 	apr_util = $portVersion compat >= 1
+	cmd:apu_1_config = $portVersion compat >= 1
 	lib:libaprutil = $portVersion compat >= 1
 	lib:libaprutil_1 = $portVersion compat >= 1
 	"
@@ -33,20 +36,24 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="$portVersionedName"
 
+PATCH()
+{
+	echo 'AM_INIT_AUTOMAKE' >> xml/expat/configure.in
+}
+
 BUILD()
 {
-	aprUtilPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
-	aprInstallDir=$aprUtilPackageLinksDir/apr
-	expatInstallDir=$aprUtilPackageLinksDir/expat
+	aprInstallDir=$portPackageLinksDir/apr
+	expatInstallDir=$portPackageLinksDir/expat
 
 	rm -rf aclocal.m4
 	mkdir -p m4
 	libtoolize -fci
 	aclocal --install -I m4
 	autoconf -f
+
 	cd xml/expat
 	mkdir -p m4
-	echo 'AM_INIT_AUTOMAKE' >> configure.in
 	libtoolize -fci
 	aclocal --install -I m4
 	autoconf --force
@@ -58,10 +65,10 @@ BUILD()
 	cp /boot/common/bin/libtool .
 	ln -sfn $sourceDir/libtool /libtool
 	
-    ./configure $configureDirArgs \
+    runConfigure ./configure \
 		--with-apr=$aprInstallDir \
 		--with-expat=$expatInstallDir
-	make
+	make $jobArgs
 }
 
 INSTALL()
@@ -71,6 +78,9 @@ INSTALL()
 	# prepare develop/lib
 	prepareInstalledDevelLibs libaprutil-1
 	fixPkgconfig
+
+	# fix apu-1-config
+	fixDevelopLibDirReferences $binDir/apu-1-config
 }
 
 DESCRIPTION="