[gtk-osx] Unstable harfbuzz: Consolidate two instances, depend on ragel, update ravel version.

[John Ralls <jralls src gnome org>]

commit 1872cd82a46e018bfd610c009b0b612bc06c33bc
Author: John Ralls <jralls ceridwen us>
Date:   Mon Feb 17 12:45:52 2014 -0800

    Unstable harfbuzz: Consolidate two instances, depend on ragel, update ravel version.

 modulesets-unstable/gtk-osx-bootstrap.modules |   19 +++++++++++++++++--
 modulesets-unstable/gtk-osx.modules           |   19 ++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 7ccb222..5786207 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -109,17 +109,32 @@
 
 
   <autotools id="harfbuzz">
+    <branch repo="freedesktop" module="harfbuzz">
+      <patch 
href="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-53815-CoreText-backend-doesn-t-link.patch"/>
+    </branch>
+    <dependencies>
+      <dep package="ragel"/>
+    </dependencies>
+    <after>
+      <dep package="glib"/>
+      <dep package="cairo"/>
+    </after>
+  </autotools>
+
+<!--  <autotools id="harfbuzz">
     <branch repo="freedesktop"/>
     <dependencies>
       <dep package="freetype"/>
       <dep package="fontconfig"/>
       <dep package="glib"/>
     </dependencies>
-
   </autotools>
+-->
+
 
   <autotools id="freetype" skip-autogen="never"
-            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
+            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s"
+            supports-non-srcdir-builds="no">
     <branch module="freetype/freetype2" repo="nongnu"/>
     <dependencies>
       <dep package="zlib"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 6411135..44a616b 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -179,26 +179,11 @@
   </autotools>
 
 <!-- Ragel, like Vala, isn't bootstrappable from git, so we might as well just use the tarball. -->
-  <autotools id="ragel"
-            autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/%(autogen-sh)s --prefix %(prefix)s 
--libdir %(libdir)s %(autogenargs)s">
-    <branch repo="complang" module="ragel/ragel-6.7.tar.gz" version="6.7">
-      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/ragel-configure.in.patch"; strip="1"/>
+  <autotools id="ragel" autogen-sh='autoreconf'>
+    <branch repo="complang" module="ragel/ragel-6.8.tar.gz" version="6.8">
     </branch>
   </autotools>
 
-  <autotools id="harfbuzz">
-    <branch repo="freedesktop" module="harfbuzz">
-      <patch 
href="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-53815-CoreText-backend-doesn-t-link.patch"/>
-    </branch>
-    <dependencies>
-      <dep package="ragel"/>
-    </dependencies>
-    <after>
-      <dep package="glib"/>
-      <dep package="cairo"/>
-    </after>
-  </autotools>
-
   <autotools id="gtk-mac-integration" autogenargs="--disable-python">
     <branch/>
     <after>