From 955ae188b200dc5020003dcfc7d98a82f8d0994f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Apr 2003 09:02:53 +0000 Subject: [PATCH] * Fix descriptor for Subversion 0.21.0. svn path=/nix/trunk/test/; revision=45 --- build/subversion-build.sh | 14 +++++++------- fixdescriptors/subversion-0.21.0.fix | 8 ++++++++ fixdescriptors/system.fix | 1 + 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 fixdescriptors/subversion-0.21.0.fix diff --git a/build/subversion-build.sh b/build/subversion-build.sh index 300c94a2fa3..cc1eba214e4 100755 --- a/build/subversion-build.sh +++ b/build/subversion-build.sh @@ -5,10 +5,10 @@ export PATH=/bin:/usr/bin export LDFLAGS=-s top=`pwd` -tar xvfz $src -cd subversion-* -./configure --prefix=$top --with-ssl -make -make install -cd .. -rm -rf subversion-* +tar xvfz $src || exit 1 +cd subversion-* || exit 1 +./configure --prefix=$top --with-ssl || exit 1 +make || exit 1 +make install || exit 1 +cd $top || exit 1 +rm -rf subversion-* || exit 1 diff --git a/fixdescriptors/subversion-0.21.0.fix b/fixdescriptors/subversion-0.21.0.fix new file mode 100644 index 00000000000..90d9d8d42b0 --- /dev/null +++ b/fixdescriptors/subversion-0.21.0.fix @@ -0,0 +1,8 @@ +Descr( + [ Bind("pkgId", Str("subversion-0.21.0")) + , Bind("releaseId", Str("1")) + + , Bind("src", File(Url("http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz"))) + , Bind("build", File(Local("../build/subversion-build.sh"))) + ] +) diff --git a/fixdescriptors/system.fix b/fixdescriptors/system.fix index e864cfac3b4..62c05600718 100644 --- a/fixdescriptors/system.fix +++ b/fixdescriptors/system.fix @@ -5,6 +5,7 @@ Descr( , Bind("actATerm", Pkg(Fix("./aterm-2.0.fix"))) , Bind("actPkgConfig", Pkg(Fix("./pkgconfig-0.15.0.fix"))) , Bind("actGlib", Pkg(Fix("./glib-2.2.1.fix"))) + , Bind("actSubversion", Pkg(Fix("./subversion-0.21.0.fix"))) , Bind("build", File(Local("../../scripts/nix-populate"))) ]