From 33345404129ffdb326fceaabdb3013a563d74da7 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <juergen.daubert@t-online.de>
Date: Fri, 24 Feb 2006 07:59:47 +0000
Subject: [PATCH] apr: switched to build from apr sources

---
 apr/.footprint |  9 +++------
 apr/.md5sum    |  3 ++-
 apr/Pkgfile    | 41 ++++++++++++++++++++++-------------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/apr/.footprint b/apr/.footprint
index 9ad774bd5..285c78bfc 100644
--- a/apr/.footprint
+++ b/apr/.footprint
@@ -67,8 +67,6 @@ drwxr-xr-x	root/root	usr/include/apr-0/
 -rw-r--r--	root/root	usr/include/apr-0/apu_version.h
 -rw-r--r--	root/root	usr/include/apr-0/apu_want.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/apr.exp
--rw-r--r--	root/root	usr/lib/aprutil.exp
 -rw-r--r--	root/root	usr/lib/libapr-0.a
 -rw-r--r--	root/root	usr/lib/libapr-0.la
 lrwxrwxrwx	root/root	usr/lib/libapr-0.so -> libapr-0.so.0.9.7
@@ -80,7 +78,6 @@ lrwxrwxrwx	root/root	usr/lib/libaprutil-0.so -> libaprutil-0.so.0.9.7
 lrwxrwxrwx	root/root	usr/lib/libaprutil-0.so.0 -> libaprutil-0.so.0.9.7
 -rwxr-xr-x	root/root	usr/lib/libaprutil-0.so.0.9.7
 drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/apr/
--rw-r--r--	root/root	usr/share/apr/apr_rules.mk
--rwxr-xr-x	root/root	usr/share/apr/libtool
--rw-r--r--	root/root	usr/share/apr/make_exports.awk
+drwxr-xr-x	root/root	usr/share/apr-0/
+-rw-r--r--	root/root	usr/share/apr-0/apr_rules.mk
+-rwxr-xr-x	root/root	usr/share/apr-0/libtool
diff --git a/apr/.md5sum b/apr/.md5sum
index 13dc50ee8..3cdba21a3 100644
--- a/apr/.md5sum
+++ b/apr/.md5sum
@@ -1 +1,2 @@
-f1b5b65c8661db9ffe38b5a4a865a0e2  httpd-2.0.55.tar.bz2
+e37f4209c29c98c17ab99856aff7e242  apr-0.9.7.tar.bz2
+3e38aadd88ff365a20ed4b310b2b221b  apr-util-0.9.7.tar.bz2
diff --git a/apr/Pkgfile b/apr/Pkgfile
index 4d12ead29..4b22242ce 100644
--- a/apr/Pkgfile
+++ b/apr/Pkgfile
@@ -1,30 +1,33 @@
 # Description: Apache Portable Runtime library
 # Maintainer:  Jürgen Daubert, juergen dot daubert at t-online dot de
 # URL:         http://apr.apache.org/
-# Depends on:  expat
-# Group:       apache
+# Depends on:  expat, db, gdbm
 
 name=apr
-version=2.0.55
+version=0.9.7
 release=1
-source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2)
+source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \
+        http://www.apache.org/dist/$name/$name-util-$version.tar.bz2)
 
 build(){
-   cd httpd-$version/srclib/$name
-   ./configure --prefix=/usr \
-               --with-installbuilddir=/usr/share/apr
-   make 
-   make DESTDIR=$PKG install
+    cd $name-$version
+    ./configure --prefix=/usr \
+                --with-installbuilddir=/usr/share/apr-0 
+    make 
+    make DESTDIR=$PKG install
 
-   cd ../$name-util
-   ./configure --prefix=/usr \
-               --with-expat=/usr \
-               --with-apr=../apr
-   make
-   make DESTDIR=$PKG install
+    cd $SRC/$name-util-$version
+    ./configure --prefix=/usr \
+                --with-apr=$SRC/$name-$version \
+                --with-expat=/usr \
+                --with-berkeley-db=/usr
+    make
+    make DESTDIR=$PKG install
 
-   cp ../../build/make_exports.awk $PKG/usr/share/apr
-   sed -i '/^APR_SOURCE/s|=.*|="/usr/share/apr"|' $PKG/usr/bin/apr-config
-   sed -i '/^apr_/s|=.*|="/usr/share/apr"|' $PKG/usr/share/apr/apr_rules.mk
-   chown -R root:root $PKG
+    sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-config
+    sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-config
+    sed -i "/^apr_/s|$SRC|/usr/share/apr-0|"  $PKG/usr/share/apr-0/apr_rules.mk
+    
+    rm -r $PKG/usr/lib/*.exp
+    chown -R root:root $PKG
 }