From f311c2020d39106e4ee6fcde3f55236974634a61 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Tue, 5 Jun 2012 07:07:25 +0000
Subject: [PATCH] Updated apr-util to 1.4.1

---
 dev-libs/apr-util/apr-util-1.4.1.bep          | 49 +++++++++++++++++++
 .../apr-util/patches/apr-util-1.4.1.patch     | 27 ++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 dev-libs/apr-util/apr-util-1.4.1.bep
 create mode 100644 dev-libs/apr-util/patches/apr-util-1.4.1.patch

diff --git a/dev-libs/apr-util/apr-util-1.4.1.bep b/dev-libs/apr-util/apr-util-1.4.1.bep
new file mode 100644
index 000000000..bd3695d4c
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.4.1.bep
@@ -0,0 +1,49 @@
+DESCRIPTION="apr-util - Apache Portable Runtime Utility Library" 
+HOMEPAGE="http://apr.apache.org/" 
+SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz"
+CHECKSUM_MD5="666a5d56098a9debf998510e304c8095"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/apr == 1.4.6"
+BUILD {
+	cd apr-util-1.4.1
+	rm -rf aclocal.m4
+	mkdir -p m4
+	haikuporter -b apr-1.4.6
+	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
+	autoheader
+	touch libtool.m4	
+	cd ../..
+	sed -i 's/\/usr\/bin\/env/\/bin\/env/' `haikuporter -t`/dev-libs/apr/work/apr-1.4.6/build/gen-build.py
+	buildconf --with-apr=`haikuporter -t`/dev-libs/apr/work/apr-1.4.6 \
+		--prefix=`finddir B_COMMON_DIRECTORY`	
+	ln -sf `finddir B_COMMON_BIN_DIRECTORY`/libtool ./libtool 
+    ./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
+		--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY` \
+		--localstatedir=`finddir B_COMMON_VAR_DIRECTORY` \
+		--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
+		--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
+		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+		--with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config
+	make
+}
+
+INSTALL {
+	cd apr-util-1.4.1
+	make install
+}
+
+LICENSE="Apache v2"
+COPYRIGHT="2011 The Apache Software Foundation."
diff --git a/dev-libs/apr-util/patches/apr-util-1.4.1.patch b/dev-libs/apr-util/patches/apr-util-1.4.1.patch
new file mode 100644
index 000000000..799676743
--- /dev/null
+++ b/dev-libs/apr-util/patches/apr-util-1.4.1.patch
@@ -0,0 +1,27 @@
+diff -urN apr-util-1.4.1/config.layout apr-util-1.4.1-haiku/config.layout
+--- apr-util-1.4.1/config.layout	2005-02-09 12:18:43.049283072 +0000
++++ apr-util-1.4.1-haiku/config.layout	2011-03-25 11:04:46.549453824 +0000
+@@ -60,6 +60,23 @@
+     runtimedir:    ${localstatedir}/run
+ </Layout>
+ 
++#	Haiku Layout making use of finddir
++<Layout haiku>
++    prefix:        /boot/common
++    exec_prefix:   /boot/common
++    bindir:        /boot/common/bin
++    sbindir:       /boot/common/servers
++    libdir:        /boot/common/lib
++    libexecdir:    /boot/common/servers
++    mandir:        /boot/common/documentation/man
++    sysconfdir:    /boot/common/settings
++    datadir:       /boot/common/data
++    installbuilddir: /boot/develop/build
++    includedir:    /boot/common/include
++    localstatedir: /boot/common/var
++    runtimedir:    ${localstatedir}/log
++</Layout>
++
+ #   Mac OS X Server (Rhapsody)
+ <Layout Mac OS X Server>
+     prefix:        /Local/Library/WebServer