From 158aa95f5256dfd7f40bc125fc28eafcfda556b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Mar 2004 15:48:03 +0000
Subject: [PATCH] * Upgrade to 1.0.1.

svn path=/nixpkgs/trunk/; revision=852
---
 .../version-management/subversion/builder.sh  | 57 +++++++++++--------
 .../version-management/subversion/default.nix | 16 +++---
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/builder.sh b/pkgs/applications/version-management/subversion/builder.sh
index 1a4e4033d223..c73a6677db4a 100755
--- a/pkgs/applications/version-management/subversion/builder.sh
+++ b/pkgs/applications/version-management/subversion/builder.sh
@@ -1,35 +1,46 @@
-#! /bin/sh
+#! /bin/sh -e
 
-buildinputs="$openssl $db4 $httpd $swig $python $expat"
-. $stdenv/setup || exit 1
+buildInputs="$openssl $db4 $httpd $swig $python $expat"
+. $stdenv/setup
 
-if test $localServer; then
-    extraflags="--with-berkeley-db=$db4 $extraflags"
+configureFlags="--without-gdbm --disable-static"
+
+if test "$localServer"; then
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
 fi
 
-if test $sslSupport; then
-    extraflags="--with-ssl --with-libs=$openssl $extraflags"
+if test "$sslSupport"; then
+    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
 fi
 
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+if test "$httpServer"; then
+    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
+    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
 fi
 
-if test $swigBindings; then
-    extraflags="--with-swig=$swig $extraflags"
+if test "$swigBindings"; then
+    configureFlags="--with-swig=$swig $configureFlags"
 fi
 
-echo "extra flags: $extraflags"
+installFlags="$makeFlags"
 
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$out $extraflags \
- --without-gdbm --disable-static || exit 1
-make $extramakeflags || exit 1
-make install $extramakeflags || exit 1
 
-if test $swigBindings; then
-    make swig-py || exit 1
-    make install-swig-py || exit 1
-fi
+preConfigure() {
+    for i in $(find . -name "ltmain.sh"); do
+        echo "fixing $i"
+        fixLibtool $i
+    done
+}
+preConfigure=preConfigure
+
+
+postInstall() {
+    if test "$swigBindings"; then
+        make swig-py
+        make install-swig-py
+    fi
+}
+postInstall=postInstall
+
+
+genericBuild
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 3e2469513ecd..2951eb0c2960 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -6,20 +6,20 @@
 , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
 }:
 
-assert !isNull expat;
-assert localServer -> !isNull db4;
-assert httpServer -> !isNull httpd && httpd.expat == expat;
-assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
-assert swigBindings -> !isNull swig && swig.pythonSupport;
+assert expat != null;
+assert localServer -> db4 != null;
+assert httpServer -> httpd != null && httpd.expat == expat;
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
+assert swigBindings -> swig != null && swig.pythonSupport;
 
 derivation {
-  name = "subversion-0.37.0";
+  name = "subversion-1.0.1";
   system = stdenv.system;
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-0.37.0.tar.gz;
-    md5 = "048c4d17d5880dc8f3699020eac56224";
+    url = http://subversion.tigris.org/tarballs/subversion-1.0.1.tar.bz2;
+    md5 = "50ca608d260b76d99ed85909acb7ae92";
   };
 
   openssl = if sslSupport then openssl else null;