[SM-Commit] GIT changes to master grimoire by George Sherwood (5946f4f958823c0a7a384ed8461fc7d69a734ffe)

George Sherwood scm at mail.sourcemage.org
Sun Oct 8 09:53:36 EDT 2006


GIT changes to master grimoire by George Sherwood <chat at sourcemage.org>:

 collab/subversion/CONFIGURE |    3 +++
 collab/subversion/DEPENDS   |    9 +++++++--
 collab/subversion/DETAILS   |    4 ++--
 collab/subversion/HISTORY   |    5 +++++
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 5946f4f958823c0a7a384ed8461fc7d69a734ffe
Author: George Sherwood <chat at sourcemage.org>
Commit: George Sherwood <chat at sourcemage.org>

    Updated subversion to 1.4.0. Also my attempt to fix Bug #10721 and make
    subversion build more regularly.

diff --git a/collab/subversion/CONFIGURE b/collab/subversion/CONFIGURE
index ce93cc6..38b5e82 100755
--- a/collab/subversion/CONFIGURE
+++ b/collab/subversion/CONFIGURE
@@ -5,5 +5,8 @@ function spell_ok_yesno {
 
 config_query SVN_HEAD 'Download latest Subversion source code?' n &&
 config_query SVN_PERL 'Install Subversion bindings for Perl?' $(spell_ok_yesno perl) &&
+if [ "$SVN_PERL" == "y" ]; then
+   NEEDSAPR0=y
+fi && 
 config_query SVN_PYTHON 'Install Subversion bindings for Python?' $(spell_ok_yesno python) &&
 config_query SVN_RUBY 'Install Subversion bindings for Ruby?' $(spell_ok_yesno ruby)
diff --git a/collab/subversion/DEPENDS b/collab/subversion/DEPENDS
index 8641cc5..3dc4847 100755
--- a/collab/subversion/DEPENDS
+++ b/collab/subversion/DEPENDS
@@ -2,8 +2,13 @@ depends autoconf &&
 depends libtool &&
 depends bison &&
 
-depends APR '--with-apr=/usr' &&
-depends APU '--with-apr-util=/usr' &&
+if [ "$NEEDSAPR0" == "y" ]; then
+     depends apr0 '--with-apr=/usr' &&
+     depends apr-util0 '--with-apr-util=/usr'
+else
+     depends APR '--with-apr=/usr' &&
+     depends APU '--with-apr-util=/usr'
+fi &&
 
 if [[ "$SVN_HEAD" == y ]]; then
   depends python
diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index a34b58b..54adb12 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
            SPELL=subversion
-         VERSION=1.3.2
+         VERSION=1.4.0
 if [[ "$SVN_HEAD" == y ]]; then VERSION=${VERSION%.*}-HEAD; fi
           SOURCE=$SPELL-$VERSION.tar.bz2
 if [[ "$SVN_HEAD" == y ]]; then
@@ -9,7 +9,7 @@ if [[ "$SVN_HEAD" == y ]]; then
 else
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://subversion.tigris.org/downloads/$SOURCE
-     SOURCE_HASH=sha512:9d164454e5dd27c81c3d5ddf8529d6221be454975b88df408242a821aa81a840f5b6521d94f257f7bc1bb80263bb3e78ee72668a37fd8742ce50d58ad828cb6b
+     SOURCE_HASH=sha512:9410be2de91ea2236fd6b514f2506985cc9ffdd4a540c7e6e0eaa25cf553a5efc16d27f3a70acbc03a22651b43c20f1fafc5463b9f9ab2b01f3150a446eaf896
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 526d261..1f12dd1 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,8 @@
+2006-10-08 George Sherwood <george at beernabeer.com>
+	* DETAILS: Updated to version 1.4.0
+	* CONFIGURE: If building with perl bindings requires apr0/apr-util0
+	* DEPENDS: If with perl require apr0/apr-util0. Bug 10721.
+
 2006-09-21 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed BUILD_API=2.
 



More information about the SM-Commit mailing list