* Subversion 1.3.0.

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

3 files changed, 94 insertions, 1 deletions

diff --git a/pkgs/applications/version-management/subversion-1.3.x/builder.sh b/pkgs/applications/version-management/subversion-1.3.x/builder.sh
new file mode 100644
index 000000000000..ae36439da8fc
--- /dev/null
+++ b/pkgs/applications/version-management/subversion-1.3.x/builder.sh
@@ -0,0 +1,55 @@
+buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch"
+source $stdenv/setup
+
+configureFlags="--without-gdbm --disable-static"
+
+if test "$localServer"; then
+    configureFlags="--with-berkeley-db=$db4 $configureFlags"
+fi
+
+if test "$sslSupport"; then
+    configureFlags="--with-ssl --with-libs=$openssl $configureFlags"
+fi
+
+if test "$httpServer"; then
+    configureFlags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $configureFlags"
+    makeFlags="APACHE_LIBEXECDIR=$out/modules $makeFlags"
+else
+    configureFlags="--without-apxs $configureFlags"
+fi
+
+if test -n "$pythonBindings"; then
+    configureFlags="--with-swig=$swig $configureFlags"
+fi
+
+if test "$javahlBindings"; then
+    configureFlags="--enable-javahl --with-jdk=$jdk $configureFlags"
+fi
+
+installFlags="$makeFlags"
+
+
+postInstall() {
+    if test "$pythonBindings"; then
+        make swig-py
+        make install-swig-py
+    fi
+    if test "$javahlBindings"; then
+        mkdir -p subversion/bindings/java/javahl/classes # bug fix
+        make javahl
+        make install-javahl
+        # Hack to prevent java.lang.UnsatisfiedLinkError: no svnjavahl in java.library.path
+        cd $out/lib
+        ln -s libsvnjavahl-1.so libsvnjavahl.so
+        cd -
+        mkdir -p $out/share/doc/$name
+        $jdk/bin/javadoc -d $out/share/doc/$name \
+            -windowtitle "JavaHL Subversion Bindings" \
+            -link http://java.sun.com/j2se/1.4.2/docs/api/ \
+            subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/*.java
+    fi
+}
+postInstall=postInstall
+
+
+genericBuild
diff --git a/pkgs/applications/version-management/subversion-1.3.x/default.nix b/pkgs/applications/version-management/subversion-1.3.x/default.nix
new file mode 100644
index 000000000000..c124fd2baa2d
--- /dev/null
+++ b/pkgs/applications/version-management/subversion-1.3.x/default.nix
@@ -0,0 +1,38 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, compressionSupport ? false
+, pythonBindings ? false
+, javahlBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null
+}:
+
+assert expat != null;
+assert localServer -> db4 != null;
+assert httpServer -> httpd != null && httpd.expat == expat;
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl);
+assert pythonBindings -> swig != null && swig.pythonSupport;
+assert javahlBindings -> jdk != null;
+assert compressionSupport -> zlib != null;
+
+stdenv.mkDerivation {
+  name = "subversion-1.3.0";
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://subversion.tigris.org/downloads/subversion-1.3.0.tar.gz;
+    sha1 = "98cb017844750d4ed26e2a811c581a644e3ad585";
+  };
+
+  openssl = if sslSupport then openssl else null;
+  zlib = if compressionSupport then zlib else null;
+  httpd = if httpServer then httpd else null;
+  db4 = if localServer then db4 else null;
+  swig = if pythonBindings then swig else null;
+  python = if pythonBindings then swig.python else null;
+  jdk = if javahlBindings then jdk else null;
+
+  inherit expat localServer httpServer sslSupport
+          pythonBindings javahlBindings;
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7c9c5db15a1a..08902d7820b0 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1705,7 +1705,7 @@ rec {
     httpd = apacheHttpd;
   };
 
-  subversion = (import ../applications/version-management/subversion-1.2.x) {
+  subversion = (import ../applications/version-management/subversion-1.3.x) {
     inherit fetchurl stdenv openssl db4 expat swig zlib;
     localServer = true;
     httpServer = false;