* Subversion 1.4.0rc1. Warning: will upgrade your working copy in a

  non-backwards compatible way.

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

3 files changed, 13 insertions, 46 deletions

diff --git a/pkgs/applications/version-management/subversion-1.1.x/javahl.patch b/pkgs/applications/version-management/subversion-1.1.x/javahl.patch
deleted file mode 100644
index ee306f93e242..000000000000
--- a/pkgs/applications/version-management/subversion-1.1.x/javahl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -rc subversion-orig/build-outputs.mk subversion-1.1.0-rc2/build-outputs.mk
-*** subversion-orig/build-outputs.mk	2004-08-10 20:17:32.000000000 +0200
---- subversion-1.1.0-rc2/build-outputs.mk	2004-08-23 21:04:35.000000000 +0200
-***************
-*** 200,206 ****
-  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
-  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
-  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
-! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS)
-  
-  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
-  locale: $(locale_DEPS)
---- 200,206 ----
-  libsvnjavahl_DEPS =  subversion/bindings/java/javahl/native/BlameCallback.lo subversion/bindings/java/javahl/native/CommitMessage.lo subversion/bindings/java/javahl/native/Inputer.lo subversion/bindings/java/javahl/native/JNIByteArray.lo subversion/bindings/java/javahl/native/JNICriticalSection.lo subversion/bindings/java/javahl/native/JNIMutex.lo subversion/bindings/java/javahl/native/JNIStackElement.lo subversion/bindings/java/javahl/native/JNIStringHolder.lo subversion/bindings/java/javahl/native/JNIThreadData.lo subversion/bindings/java/javahl/native/JNIUtil.lo subversion/bindings/java/javahl/native/MessageReceiver.lo subversion/bindings/java/javahl/native/Notify.lo subversion/bindings/java/javahl/native/Outputer.lo subversion/bindings/java/javahl/native/Path.lo subversion/bindings/java/javahl/native/Pool.lo subversion/bindings/java/javahl/native/Prompter.lo subversion/bindings/java/javahl/native/Revision.lo subversion/bindings/java/javahl/native/SVNAdmin.lo subversion/bindings/java/javahl/native/SVNBase.lo subversion/bindings/java/javahl/native/SVNClient.lo subversion/bindings/java/javahl/native/Targets.lo subversion/bindings/java/javahl/native/libsvnjavahl.la.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/java/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
-  libsvnjavahl_OBJECTS = BlameCallback.lo CommitMessage.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo MessageReceiver.lo Notify.lo Outputer.lo Path.lo Pool.lo Prompter.lo Revision.lo SVNAdmin.lo SVNBase.lo SVNClient.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo
-  subversion/bindings/java/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
-! 	cd subversion/bindings/java/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS) -lstdc++
-  
-  locale_DEPS =  subversion/po/de.mo subversion/po/es.mo subversion/po/ja.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/sv.mo
-  locale: $(locale_DEPS)
diff --git a/pkgs/applications/version-management/subversion-1.1.x/builder.sh b/pkgs/applications/version-management/subversion-1.4.x/builder.sh
index ed6228487949..ae36439da8fc 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/builder.sh
+++ b/pkgs/applications/version-management/subversion-1.4.x/builder.sh
@@ -14,9 +14,11 @@ 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" -o -n "$javaSwigBindings"; then
+if test -n "$pythonBindings"; then
     configureFlags="--with-swig=$swig $configureFlags"
 fi
 
@@ -32,21 +34,14 @@ postInstall() {
         make swig-py
         make install-swig-py
     fi
-    if test "$javaSwigBindings"; then
-        # Hack to get Java-Swig bindings to build if Python is not in
-        # scope (this fails because Subversion's configure script does
-        # something silly like `SWIG_JAVA_COMPILE="$SWIG_PY_COMPILE"').
-        FL1='SWIG_JAVA_COMPILE=gcc'
-        FL2='SWIG_JAVA_LINK=gcc -L$(SWIG_BUILD_DIR)/.libs'
-        make swig-java "$FL1" "$FL2"
-        make swig-java-api "$FL1" "$FL2"
-        make swig-java-java "$FL1" "$FL2"
-        make install-swig-java "$FL1" "$FL2"
-    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" \
diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.4.x/default.nix
index 0eedca4defb2..69a0fbaa0341 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.4.x/default.nix
@@ -3,7 +3,6 @@
 , sslSupport ? false
 , compressionSupport ? false
 , pythonBindings ? false
-, javaSwigBindings ? false
 , javahlBindings ? false
 , stdenv, fetchurl
 , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, jdk ? null, zlib ? null
@@ -14,33 +13,26 @@ 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 javaSwigBindings -> swig != null && swig.javaSupport;
 assert javahlBindings -> jdk != null;
 assert compressionSupport -> zlib != null;
 
 stdenv.mkDerivation {
-  name = "subversion-1.1.4";
+  name = "subversion-1.4.0pre-rc1";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
-    md5 = "6e557ae65b6b8d7577cc7704ede85a23";
+    url = http://subversion.tigris.org/downloads/subversion-1.4.0-rc1.tar.bz2;
+    sha1 = "0729403204f4cdebb4c40bdb62531721b0885cd0";
   };
 
-  # This is a hopefully temporary fix for the problem that
-  # libsvnjavahl.so isn't linked against libstdc++, which causes
-  # loading the library into the JVM to fail.
-  patches = if javahlBindings then [./javahl.patch] else [];
-
   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 || javaSwigBindings then swig else null;
+  swig = if pythonBindings then swig else null;
   python = if pythonBindings then swig.python else null;
-  jdk = if javaSwigBindings then swig.jdk else
-          if javahlBindings then jdk else null;
+  jdk = if javahlBindings then jdk else null;
 
   inherit expat localServer httpServer sslSupport
-          pythonBindings javaSwigBindings javahlBindings;
+          pythonBindings javahlBindings;
 }