[gtk-osx] [Bootstrap] Add subversion and its dependencies to bootstrap.modules

[John Ralls <jralls src gnome org>]

commit 7dd7b16b2df4c8cdaed8470a3a1a405ebbe4d13e
Author: John Ralls <john methuselah-4 local>
Date:   Fri Nov 18 11:15:31 2011 -0800

    [Bootstrap] Add subversion and its dependencies to bootstrap.modules
    
    Subversion binaries seem no longer to be available for Tiger, so add
    subversion and its dependencies apr (apache runtime) and apr-util to
    bootstrap.modules, with a skip for non-Tiger hosts.

 jhbuildrc-gtk-osx                   |    1 +
 modulesets-stable/bootstrap.modules |   31 +++++++++++++++++++++++++++----
 2 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 1b2ccc2..4e12e1e 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -518,6 +518,7 @@ os.environ['LIBTOOLIZE'] = _exec_prefix + '/bin/libtoolize'
 
 if not _host_tiger:
     skip.append('make')
+    skip.append('subversion')
     skip.append('bison')
     skip.append('flex')
 
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 8217289..d14ccf0 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -2,13 +2,15 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
   <repository type="tarball" name="ftp.gnu.org"
-      href="ftp://ftp.gnu.org/gnu/"/>
+	      href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="pkgconfig"
-      href="http://pkgconfig.freedesktop.org/releases/"/>
+	      href="http://pkgconfig.freedesktop.org/releases/"/>
   <repository type="tarball" name="python"
-      href="http://www.python.org/ftp/python/"/>
+	      href="http://www.python.org/ftp/python/"/>
   <repository type="tarball" name="sourceforge"
-      href="http://downloads.sourceforge.net/sourceforge/"/>
+	      href="http://downloads.sourceforge.net/sourceforge/"/>
+  <repository type="tarball" name="apache.org"
+	      href="http://archive.apache.org/dist/"/>
   <repository type="tarball" name="tukaani.org"
 	      href="http://tukaani.org/"/>
 
@@ -22,6 +24,26 @@
             hash="sha256:9b380f502d37085a60821484a3a13747454638927cc36033be64970512451ed8"/>
   </autotools>
 
+  <autotools id="apr">
+    <branch repo="apache.org" module="apr/apr-1.4.5.tar.bz2" version="1.4.5"/>
+  </autotools>
+
+  <autotools id="apr-util" autogenargs="--with-apr=$PREFIX/bin/apr-1-config">
+    <branch repo="apache.org" module="apr/apr-util-1.3.12.tar.bz2"
+	    version="1.3.12"/>
+    <dependencies>
+      <dep package="apr"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="subversion">
+    <branch repo="apache.org" module="subversion/subversion-1.5.9.tar.bz2"
+	    version="1.5.9"/>
+    <dependencies>
+      <dep package="apr-util"/>
+    </dependencies>
+  </autotools>
+
   <autotools id='libiconv' autogen-sh='configure'>
     <branch module="libiconv/libiconv-1.13.1.tar.gz" version="1.1.3.1"
             repo="ftp.gnu.org"/>
@@ -106,6 +128,7 @@
   <metamodule id="meta-bootstrap">
     <dependencies>
       <dep package="make"/>     <!-- Needed for Tiger, skipped otherwise -->
+      <dep package="subversion"/>   <!-- Needed for Tiger, skipped otherwise -->
       <dep package="gettext" /> <!-- Pulls in libiconv, needed for 64-bit -->
       <dep package="m4"/>	<!-- Can be skipped for Leopard and later -->
       <dep package="autoconf" />