* Descriptors for Berkeley DB and SWIG.

* Updated to Apache httpd 2.0.46.
* Build Subversion/Python bindings.

svn path=/nixpkgs/trunk/; revision=76

12 files changed, 88 insertions, 22 deletions

diff --git a/build/db4-build.sh b/build/db4-build.sh
new file mode 100755
index 0000000000000..14793f93b885d
--- /dev/null
+++ b/build/db4-build.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+
+top=`pwd`
+tar xvfz $src || exit 1
+cd db-*/build_unix || exit 1
+../dist/configure --prefix=$top --enable-cxx --enable-compat185 || exit 1
+make || exit 1
+make install || exit 1
+cd $top || exit 1
+rm -rf db-* || exit 1
diff --git a/build/httpd-build.sh b/build/httpd-build.sh
index a5b43d7443291..6182d79a2f65c 100755
--- a/build/httpd-build.sh
+++ b/build/httpd-build.sh
@@ -1,11 +1,12 @@
 #! /bin/sh
 
 export PATH=/bin:/usr/bin
+export LD_LIBRARY_PATH=$ssl/lib:
 
 top=`pwd`
 tar xvfz $src || exit 1
 cd httpd-* || exit 1
-./configure --prefix=$top --enable-ssl --with-ssl=$ssl --enable-mods-shared=all || exit 1
+./configure --prefix=$top --enable-ssl --with-ssl=$ssl --with-berkeley-db=$db4 --enable-mods-shared=all || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1
diff --git a/build/openssl-build.sh b/build/openssl-build.sh
index 23437a37b3364..8ccef5657e54d 100755
--- a/build/openssl-build.sh
+++ b/build/openssl-build.sh
@@ -5,7 +5,7 @@ export PATH=/bin:/usr/bin
 top=`pwd`
 tar xvfz $src || exit 1
 cd openssl-* || exit 1
-./config --prefix=$top || exit 1
+./config --prefix=$top shared || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1
diff --git a/build/populate-linkdirs.pl b/build/populate-linkdirs.pl
index c632a9ca31d94..5f890c2cc5c2f 100755
--- a/build/populate-linkdirs.pl
+++ b/build/populate-linkdirs.pl
@@ -8,9 +8,9 @@ my $selfdir = cwd;
 my @dirs = ("bin", "sbin", "lib", "include", "man");
 
 # Create the subdirectories.
-mkdir $selfdir;
+mkdir $selfdir, 0755;
 foreach my $dir (@dirs) {
-    mkdir "$selfdir/$dir";
+    mkdir "$selfdir/$dir", 0755;
 }
 
 # For each activated package, create symlinks.
@@ -28,7 +28,7 @@ sub createLinks {
         if (-d $srcfile) {
             # !!! hack for resolving name clashes
             if (!-e $dstfile) {
-                mkdir($dstfile) or 
+                mkdir $dstfile, 0755 or 
                     die "error creating directory $dstfile";
             }
             -d $dstfile or die "$dstfile is not a directory";
diff --git a/build/subversion-build.sh b/build/subversion-build.sh
index 3cd17ab98fa7e..6c3b7e86b0a4a 100755
--- a/build/subversion-build.sh
+++ b/build/subversion-build.sh
@@ -1,18 +1,27 @@
 #! /bin/sh
 
-export PATH=$libxml/bin:/bin:/usr/bin
+export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
+export LD_LIBRARY_PATH=$ssl/lib:
 
 export LDFLAGS=-s
 
 top=`pwd`
 
+if test $localServer; then
+    extraflags="--with-berkeley-db=$db4 $extraflags"
+fi
+
 if test $httpsClient; then
     extraflags="--with-ssl --with-libs=$ssl $extraflags"
 fi
 
 if test $httpServer; then
     extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extrainst="APACHE_LIBEXECDIR=$top/modules $extrainst"
+    extramakeflags="APACHE_LIBEXECDIR=$top/modules $extramakeflags"
+fi
+
+if test $pythonBindings; then
+    extraflags="--with-swig=$swig $extraflags"
 fi
 
 echo "extra flags: $extraflags"
@@ -20,7 +29,13 @@ echo "extra flags: $extraflags"
 tar xvfz $src || exit 1
 cd subversion-* || exit 1
 ./configure --prefix=$top $extraflags || exit 1
-make || exit 1
-make install $extrainst || exit 1
+make $extramakeflags || exit 1
+make install $extramakeflags || exit 1
+
+if test $pythonBindings; then
+    make swig-py || exit 1
+    make install-swig-py || exit 1
+fi
+
 cd $top || exit 1
 rm -rf subversion-* || exit 1
diff --git a/build/swig-build.sh b/build/swig-build.sh
new file mode 100755
index 0000000000000..ba798e9046650
--- /dev/null
+++ b/build/swig-build.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin:/usr/local/bin
+
+top=`pwd`
+tar xvfz $src || exit 1
+cd SWIG-* || exit 1
+./configure --prefix=$top || exit 1
+gmake || exit 1
+gmake install || exit 1
+cd $top || exit 1
+rm -rf SWIG-* || exit 1
diff --git a/descriptors/db-4.0.14.fix b/descriptors/db-4.0.14.fix
new file mode 100644
index 0000000000000..33c4ba93a3b24
--- /dev/null
+++ b/descriptors/db-4.0.14.fix
@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "db-4.0.14")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("12262c64fcd64b772e7cffad8e4d0ebc", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz"))
+  , Bind("build", Local("../build/db4-build.sh"))
+  ]
+)
diff --git a/descriptors/httpd-2.0.45.fix b/descriptors/httpd-2.0.45.fix
deleted file mode 100644
index e0db5ab2ef4a2..0000000000000
--- a/descriptors/httpd-2.0.45.fix
+++ /dev/null
@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "httpd-2.0.45")
-  , Bind("releaseId", "1")
-
-  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
-
-  , Bind("src", Url("1f33e9a2e2de06da190230fa72738d75", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz"))
-  , Bind("build", Local("../build/httpd-build.sh"))
-  ]
-)
diff --git a/descriptors/httpd-2.0.46.fix b/descriptors/httpd-2.0.46.fix
new file mode 100644
index 0000000000000..541ce7e8f351f
--- /dev/null
+++ b/descriptors/httpd-2.0.46.fix
@@ -0,0 +1,11 @@
+Descr(
+  [ Bind("pkgId", "httpd-2.0.46")
+  , Bind("releaseId", "1")
+
+  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
+  , Bind("db4", Fix("./db-4.0.14.fix"))
+
+  , Bind("src", Url("ff682f82f0808eb01df60824d959ebe8", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.46.tar.gz"))
+  , Bind("build", Local("../build/httpd-build.sh"))
+  ]
+)
diff --git a/descriptors/subversion-0.23.0.fix b/descriptors/subversion-0.23.0.fix
index a83e5aa9a3a8e..0d3cae102cb1b 100644
--- a/descriptors/subversion-0.23.0.fix
+++ b/descriptors/subversion-0.23.0.fix
@@ -1,16 +1,22 @@
 Descr(
   [ Bind("pkgId", "subversion-0.23.0")
-  , Bind("releaseId", "1")
+  , Bind("releaseId", "3")
 
+  , Bind("localServer", Bool(True))
   , Bind("httpsClient", Bool(True))
   , Bind("httpServer", Bool(True))
   , Bind("httpsServer", Bool(True))
+  , Bind("pythonBindings", Bool(True))
+
+  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
+
+  , Bind("db4", If(Var("localServer"), Fix("./db-4.0.14.fix"), ""))
 
   , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
 
-  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
+  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.46.fix"), ""))
 
-  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
+  , Bind("swig", If(Var("pythonBindings"), Fix("./swig-1.3.19.fix"), ""))
 
   , Bind("src", Url("59661f2145976437b371a0ab3a555dbd", "http://subversion.tigris.org/files/documents/15/4218/subversion-0.23.0.tar.gz"))
   , Bind("build", Local("../build/subversion-build.sh"))
diff --git a/descriptors/swig-1.3.19.fix b/descriptors/swig-1.3.19.fix
new file mode 100644
index 0000000000000..dd6f3ec2c5fd8
--- /dev/null
+++ b/descriptors/swig-1.3.19.fix
@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "swig-1.3.19")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("a733455544426b31868dd87fc162e750", "http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz"))
+  , Bind("build", Local("../build/swig-build.sh"))
+  ]
+)
diff --git a/descriptors/system.fix b/descriptors/system.fix
index 22d12ea3dd0d0..f777d692fe0cf 100644
--- a/descriptors/system.fix
+++ b/descriptors/system.fix
@@ -17,6 +17,9 @@ Descr(
   , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
   , Bind("actPan", Fix("./pan-0.14.0.fix"))
   , Bind("actSubversion", Fix("./subversion-0.23.0.fix"))
+  , Bind("actDb4", Fix("./db-4.0.14.fix"))
+  , Bind("actHttpd", Fix("./httpd-2.0.46.fix"))
+  , Bind("actSsl", Fix("./openssl-0.9.7b.fix"))
 
   , Bind("build", Local("../build/populate-linkdirs.pl"))
   ]