* Converted some old Fix descriptors.

* A solution to the library abstraction problem (i.e., if 
  package X needs library Y, and library Y needs library Z, 
  then we do not (generally) want to declare Z as a input to X 
  since that would break abstraction).  This was not possible 
  under the old Nix.

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

2 files changed, 47 insertions, 0 deletions

diff --git a/pkgs/subversion/subversion-build.sh b/pkgs/subversion/subversion-build.sh
new file mode 100755
index 0000000000000..d4b279df2229d
--- /dev/null
+++ b/pkgs/subversion/subversion-build.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
+export LD_LIBRARY_PATH=$ssl/lib:
+
+export LDFLAGS=-s
+
+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"
+    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+fi
+
+if test $pythonBindings; then
+    extraflags="--with-swig=$swig $extraflags"
+fi
+
+echo "extra flags: $extraflags"
+
+tar xvfz $src || exit 1
+cd subversion-* || exit 1
+./configure --prefix=$out $extraflags || 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
diff --git a/pkgs/subversion/subversion.fix b/pkgs/subversion/subversion.fix
new file mode 100644
index 0000000000000..13e7f5f00a654
--- /dev/null
+++ b/pkgs/subversion/subversion.fix
@@ -0,0 +1,11 @@
+Package(
+  [ ("name", "subversion-0.25.0")
+  , ("build", Relative("subversion/subversion-build.sh"))
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://subversion.tigris.org/files/documents/15/5110/subversion-0.25.tar.gz")
+      , ("md5", "a018220d5c790161bc712ccb7d0f1b38")
+      ]))
+  , ("httpsClient", "1")
+  , ("ssl", IncludeFix("openssl/openssl.fix"))
+  ]
+)