[gtk-osx] Add skip-autogen="never" to freetype and zlib

[John Ralls <jralls src gnome org>]

commit ce9c445c41e2a3f0fe67be5a7f0707734b765cc9
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 11 09:00:44 2012 -0800

    Add skip-autogen="never" to freetype and zlib

 modulesets-stable/gtk-osx-bootstrap.modules     |    3 +--
 modulesets-stable/gtk-osx-unsupported.modules   |    2 +-
 modulesets-unstable/gtk-osx-bootstrap.modules   |    2 +-
 modulesets-unstable/gtk-osx-unsupported.modules |    6 +++---
 modulesets/gtk-osx-bootstrap.modules            |    4 ++--
 modulesets/gtk-osx-unsupported.modules          |    2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index ff5ce04..5d996d2 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -116,8 +116,7 @@
     </dependemcies>
   </autotools>
 
-  <autotools id="freetype"
-	     autogen-template="%(srcdir)s/configure --prefix %(prefix)s %(autogenargs)s">
+  <autotools id="freetype" autogen-sh="configure" skip-autogen="never">
     <branch module="freetype/freetype-2.4.10.tar.gz" version="2.4.10"
             repo="sourceforge">
     </branch>
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 94de7dd..035c643 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -62,7 +62,7 @@
 	    repo="iso-codes" checkoutdir="iso-codes-3.39"/>
   </autotools>
 
-  <autotools id="zlib" autogen-sh="configure">
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never">
     <branch repo="sourceforge" version="1.2.7"
 	    module="libpng/zlib-1.2.7.tar.gz"/>
   </autotools>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index e0b2831..2c204de 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -106,7 +106,7 @@
     <branch repo="freedesktop"/>
   </autotools>
 
-  <autotools id="freetype">
+  <autotools id="freetype" skip-autogen="never">
     <branch module="freetype/freetype2" repo="nongnu"/>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-unsupported.modules b/modulesets-unstable/gtk-osx-unsupported.modules
index da50467..08af336 100644
--- a/modulesets-unstable/gtk-osx-unsupported.modules
+++ b/modulesets-unstable/gtk-osx-unsupported.modules
@@ -50,9 +50,9 @@
 
   </autotools>
 
-  <autotools id="zlib">
-    <branch repo="sourceforge" version="1.2.5"
-	    module="libpng/zlib-1.2.5.tar.gz"/>
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never">
+    <branch repo="sourceforge" version="1.2.7"
+	    module="libpng/zlib-1.2.7.tar.gz"/>
   </autotools>
 
   <autotools id="p11-kit">
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 665d299..c14794e 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -108,7 +108,7 @@
     <branch repo="freedesktop" tag="0.9.5"/>
   </autotools>
 
-  <autotools id="freetype">
+  <autotools id="freetype" skip-sutogen="never">
     <branch module="freetype/freetype2" tag="VER-2-4-10" repo="nongnu"/>
   </autotools>
 
@@ -140,7 +140,7 @@
 
   <autotools id="gtk-doc" autogenargs="--disable-scrollkeeper --with-xml-catalog=$JHBUILD_PREFIX/etc/xml/catalog"
 	     makeargs="-k -i" makeinstallargs="-k -i install">
-    <branch tag="GTK_DOC_1_18"/>
+    <branch tag="GTK_DOC_1_18" repo="git.gnome.org"/>
     <dependencies>
       <dep package="gtk-osx-docbook"/>
       <dep package="gnome-doc-utils"/>
diff --git a/modulesets/gtk-osx-unsupported.modules b/modulesets/gtk-osx-unsupported.modules
index e506b45..3eea0c3 100644
--- a/modulesets/gtk-osx-unsupported.modules
+++ b/modulesets/gtk-osx-unsupported.modules
@@ -58,7 +58,7 @@
 
   </autotools>
 
-  <autotools id="zlib">
+  <autotools id="zlib" autogen-sh="configure" skip-autogen="never">
     <branch repo="sourceforge" version="1.2.7"
 	    module="libpng/zlib-1.2.7.tar.gz"/>
   </autotools>