[SM-Commit] GIT changes to master grimoire by George Sherwood (8f43dc4c42a1be818a290f2e8d0c54fa614bafff)

George Sherwood scm at sourcemage.org
Sun Mar 1 14:09:34 EST 2009


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

 collab/subversion/DETAILS   |    4 ++--
 collab/subversion/HISTORY   |    5 +++++
 collab/subversion/PRE_BUILD |   20 --------------------
 3 files changed, 7 insertions(+), 22 deletions(-)

New commits:
commit 8f43dc4c42a1be818a290f2e8d0c54fa614bafff
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    subversion: Updated to version 1.5.6. Removed fixes for apr/apr-util in
    PRE_BUILD. It is finding system libs just fine.  It was causing
    breakage now with apr as it did apr0 earlier.

diff --git a/collab/subversion/DETAILS b/collab/subversion/DETAILS
index 8edf0bf..669638b 100755
--- a/collab/subversion/DETAILS
+++ b/collab/subversion/DETAILS
@@ -1,5 +1,5 @@
            SPELL=subversion
-         VERSION=1.5.5
+         VERSION=1.5.6
 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:153eb6d8f4c828d0089963c2c5aba0bdb493f3dc412a640832ca0f2afa9fa9987a19ee2806b5efdebeab89e90b9d64a6448a397d0f7f6cd7b655daee0916e451
+     SOURCE_HASH=sha512:1f7800a63268f7d0a3ab0ac4cb1b3f3742df2345cf17ea7566a48f4c23541f5213adbc981f0337928b35816611af3743a8c26d511b709a6f68d92c731c953fe2
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://subversion.tigris.org/
diff --git a/collab/subversion/HISTORY b/collab/subversion/HISTORY
index 74563f0..c0b24e0 100644
--- a/collab/subversion/HISTORY
+++ b/collab/subversion/HISTORY
@@ -1,3 +1,8 @@
+2009-03-01 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version 1.5.6
+	* PRE_BUILD: Removed. Fix for apu/apr-util causes breakage.
+	  Builds just fine against system libs
+
 2008-12-24 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 1.5.5
 
diff --git a/collab/subversion/PRE_BUILD b/collab/subversion/PRE_BUILD
deleted file mode 100755
index 68e0a23..0000000
--- a/collab/subversion/PRE_BUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-# assure we don't use the included libs by accident
-rm -Rf neon apr apr-util &&
-
-if [[ "$(get_spell_provider $SPELL APR)" == "apr" ]] || \
-   [[ "$(get_spell_provider $SPELL APU)" == "apr-util" ]]; then
-  message "${MESSAGE_COLOR}Configuring ${SPELL} for APR/APR-UTIL 1.x...${DEFAULT_COLOR}" &&
-
-  # this is one of the lovely fixes for building perl with apr 1.x
-  patch -p1 < ${SPELL_DIRECTORY}/subversion-apr_cppflags.patch &&
-
-  sedit "s:apr-config:apr-1-config:g" build/ac-macros/{find_,}ap* &&
-  sedit "s:apu-config:apu-1-config:g" build/ac-macros/{find_,}ap* &&
-  sedit 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in &&
-
-  autoreconf -v -f &&
-  libtoolize -f
-fi



More information about the SM-Commit mailing list