Use slapos.recipe.cmmi to install components.

Add patches of Cygwin.

component/apache-php/buildout.cfg

@@ -3,6 +3,7 @@ parts = apache-php
 
 extends =
   ../apache/buildout.cfg
+  ../bison/buildout.cfg
   ../bzip2/buildout.cfg
   ../cclient/buildout.cfg
   ../curl/buildout.cfg
@@ -19,54 +20,82 @@ extends =
 
 [apache-php]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
-depends =
-  ${mariadb:version}
+recipe = slapos.recipe.cmmi
+dependencies = bison mariadb apache libxml2 zlib bzip2 libmcrypt libjpeg libpng freetype curl zip gettext openssl libtool libiconv
 url = http://fr2.php.net/distributions/php-5.3.13.tar.gz
 md5sum = 179c67ce347680f468edbfc3c425476a
 configure-options =
-  --with-apxs2=${apache:location}/bin/apxs
-  --with-libxml-dir=${libxml2:location}
-  --with-mysql=${mariadb:location}
-  --with-zlib-dir=${zlib:location}
-  --with-bz2-dir=${bzip2:location}
-  --with-mcrypt=${libmcrypt:location}
+  --with-apxs2=${apache:prefix}/bin/apxs
+  --with-libxml-dir=${libxml2:prefix}
+  --with-mysql=${mariadb:prefix}
+  --with-zlib-dir=${zlib:prefix}
+  --with-mcrypt=${libmcrypt:prefix}
   --with-gd
-  --with-jpeg-dir=${libjpeg:location}
-  --with-png-dir=${libpng:location}
+  --with-jpeg-dir=${libjpeg:prefix}
+  --with-png-dir=${libpng:prefix}
   --enable-gd-native-ttf
-  --with-ttf
-  --with-freetype-dir=${freetype:location}
+  --with-freetype-dir=${freetype:prefix}
   --with-pdo-mysql=mysqlnd
   --with-mysqli=mysqlnd
-  --with-curl=${curl:location}
-  --with-zip-dir=${zip:location}
-  --with-imap=${cclient:location}
-  --with-iconv-dir=${libiconv:location}
-  --with-gettext=${gettext:location}
-  --with-ldap=${openldap:location}
-  --with-imap-ssl
-  --with-openssl=${openssl:location}
+  --with-curl=${curl:prefix}  
+  --with-gettext=${gettext:prefix}
+  --with-openssl=${openssl:prefix}
   --enable-libxml
   --enable-mbstring
   --enable-session
   --enable-exif
+  --enable-ftp
+
+[x86-linux-apache-php]
+dependencies = ${apache-php:dependencies} cclient openldap
+configure-options =
+  ${apache-php:configure-options}
+  --with-imap=${cclient:prefix}
+  --with-ldap=${openldap:prefix}
+  --with-imap-ssl
+  --with-zip-dir=${zip:prefix}
   --enable-zip
+  --with-bz2-dir=${bzip2:prefix}
   --enable-bz2
-  --enable-ftp
+  --with-ttf
+  --with-iconv-dir=${libiconv:prefix}
 
-environment =
-  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
-  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
-  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+[x86-cygwin-apache-php]
+pre-configure = 
+  rm -f build/libtool.m4
+  ac_macrodir=build libtoolize --copy --force || error "libtoolize failed"
+  cat build/lt*.m4 >> build/libtool.m4
+  make -j1 -B -f build/build.mk ZENDDIR="Zend"
+  true
+pre-build =
+  _X_=$(grep 'CFLAGS_CLEAN =' Makefile); _X_=$${_X_:15}; _X_=$${_X_//\//\\/}
+  sed -i -e "s/^LTCFLAGS=.*$/LTCFLAGS=\" $_X_ \"/g" -e "s/\/cyg\//\/lib\//g" libtool
+configure-options =
+  ${apache-php:configure-options}
+  --enable-zip=${zip:prefix}
+  --with-bz2=${bzip2:prefix}
+  --without-iconv
 
+patch-options = -p2
+patches = ${:_profile_base_location_}/cygwin-php-5.3.13.patch
 
 [libmcrypt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/mcrypt/files/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2/download
 md5sum = c4f491dd411a09e9de3b8702ea6f73eb
 
 [xml-rpc]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz
 md5sum = 59a644c636c6d98267d0c99b406ae9e8
+
+[no-environment]
+environment =
+  PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
+  LDFLAGS =-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid
+
+configure-options = 
+  --with-bz2-dir=${bzip2:prefix}
+  --with-zip-dir=${zip:prefix}
+  --enable-bz2

component/apache/buildout.cfg

@@ -18,7 +18,7 @@ recipe = hexagonit.recipe.download
 version = 1.4.6
 url = http://mir2.ovh.net/ftp.apache.org/dist/apr/apr-${:version}.tar.bz2
 md5sum = ffee70a111fd07372982b0550bbb14b7
-
+ 
 [apr-util]
 recipe = hexagonit.recipe.download
 version = 1.4.1
@@ -27,162 +27,95 @@ md5sum = 52b31b33fb1aa16e65ddaefc76e41151
 
 [apache]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
-depends =
-  ${gdbm:version}
+recipe = slapos.recipe.cmmi
+dependencies = gdbm libexpat libuuid openssl pcre pkgconfig sqlite3 zlib
 version = 2.4.3
-revision = 1
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
 md5sum = 87aaf7bc7e8715f0455997bb8c6791aa
-configure-command = cp -ar ${apr:location}/apr-${apr:version} srclib/apr/; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util; ./configure
-configure-options = --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
-                    --disable-static
-                    --enable-authn-alias
-                    --enable-bucketeer
-                    --enable-cache
-                    --enable-case-filter
-                    --enable-case-filter-in
-                    --enable-cgid
-                    --enable-charset-lite
-                    --enable-disk-cache
-                    --enable-mem-cache
-                    --enable-echo
-                    --enable-exception-hook
-                    --enable-mods-shared=all
-                    --enable-optional-fn-export
-                    --enable-optional-fn-import
-                    --enable-optional-hook-export
-                    --enable-optional-hook-import
-                    --enable-proxy
-                    --enable-proxy-ajp
-                    --enable-proxy-balancer
-                    --enable-proxy-connect
-                    --enable-proxy-ftp
-                    --enable-proxy-http
-                    --enable-proxy-scgi
-                    --enable-dav
-                    --enable-dav-fs
-                    --enable-so
-                    --enable-ssl
-                    --disable-lua
-                    --with-included-apr
-                    --with-ssl=${openssl:location}
-                    --with-z=${zlib:location}
-                    --with-expat=${libexpat:location}
-                    --with-pcre=${pcre:location}
-                    --with-sqlite3=${sqlite3:location}
-                    --with-gdbm=${gdbm:location}
-                    --without-lber
-                    --without-ldap
-                    --without-ndbm
-                    --without-berkeley-db
-                    --without-pgsql
-                    --without-mysql
-                    --without-sqlite2
-                    --without-oracle
-                    --without-freedts
-                    --without-odbc
-                    --without-iconv
-
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
-
-[mod_antiloris-apache-2.4.patch]
-# http://www.apachelounge.com/viewtopic.php?p=19139
-# http://www.apachelounge.com/viewtopic.php?p=20551
+pre-configure = cp -ar ${apr:location}/apr-${apr:version} srclib/apr; cp -ar ${apr-util:location}/apr-util-${apr-util:version} srclib/apr-util
+configure-options = 
+  --disable-static
+  --enable-authn-alias
+  --enable-bucketeer
+  --enable-cache
+  --enable-case-filter
+  --enable-case-filter-in
+  --enable-cgid
+  --enable-charset-lite
+  --enable-disk-cache
+  --enable-mem-cache
+  --enable-echo
+  --enable-exception-hook
+  --enable-mods-shared=all
+  --enable-optional-fn-export
+  --enable-optional-fn-import
+  --enable-optional-hook-export
+  --enable-optional-hook-import
+  --enable-proxy
+  --enable-proxy-ajp
+  --enable-proxy-balancer
+  --enable-proxy-connect
+  --enable-proxy-ftp
+  --enable-proxy-http
+  --enable-proxy-scgi
+  --enable-dav
+  --enable-dav-fs
+  --enable-so
+  --enable-ssl
+  --disable-lua
+  --with-included-apr
+  --without-lber
+  --without-ldap
+  --without-ndbm
+  --without-berkeley-db
+  --without-pgsql
+  --without-mysql
+  --without-sqlite2
+  --without-oracle
+  --without-freedts
+  --without-odbc
+  --without-iconv
+  --with-ssl=${openssl:prefix}
+  --with-z=${zlib:prefix}
+  --with-expat=${libexpat:prefix}
+  --with-pcre=${pcre:prefix}
+  --with-sqlite3=${sqlite3:prefix}
+  --with-gdbm=${gdbm:prefix}
+ 
+[apr-patches]
 recipe = hexagonit.recipe.download
-url =${:_profile_base_location_}/${:filename}
-filename = mod_antiloris-apache-2.4.patch
-download-only = true
-md5sum = 4f074f035d3b37f3f3e71cd9616440f3
+url = ${:_profile_base_location_}/cygwin-apr-patches.tar.gz
+md5sum = b6a537dc01775fca8438c4434d23798a
 
-[apache-antiloris]
-# Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
-url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
-md5sum = 66862bf10e9be3a023e475604a28a0b4
-patch-options = -p0
-patches =
-  ${mod_antiloris-apache-2.4.patch:location}/${mod_antiloris-apache-2.4.patch:filename}
-depends =
-  ${apache:version}
-  ${apache:revision}
-  ${mod_antiloris-apache-2.4.patch:md5sum}
-configure-command = ${apache:location}/bin/apxs
-configure-options = -c mod_antiloris.c
-make-binary = ${:configure-command}
-make-options = -i -a -n antiloris mod_antiloris.la
-make-targets =
+[x86-cygwin-apache]
+# Patch apr and apr-util after copied to srclib
+dependencies = ${apache:dependencies} apr-patches
+pre-configure = ${apache:pre-configure}; (cd srclib/apr; patch -p2 < ${apr-patches:location}/cygwin-apr-1.4.6.patch; cd ../apr-util; patch -p2 < ${apr-patches:location}/cygwin-apr-util-1.4.1.patch); true
 
-[apache-2.2]
-# inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
-recipe = hexagonit.recipe.cmmi
-url = http://mir2.ovh.net/ftp.apache.org/dist//httpd/httpd-2.2.22.tar.gz
-md5sum = d77fa5af23df96a8af68ea8114fa6ce1
 patch-options = -p1
-configure-options = --disable-static
-                    --enable-authn-alias
-                    --enable-bucketeer
-                    --enable-cache
-                    --enable-case-filter
-                    --enable-case-filter-in
-                    --enable-cgid
-                    --enable-charset-lite
-                    --enable-disk-cache
-                    --enable-mem-cache
-                    --enable-echo
-                    --enable-exception-hook
-                    --enable-mods-shared=all
-                    --enable-optional-fn-export
-                    --enable-optional-fn-import
-                    --enable-optional-hook-export
-                    --enable-optional-hook-import
-                    --enable-proxy
-                    --enable-proxy-ajp
-                    --enable-proxy-balancer
-                    --enable-proxy-connect
-                    --enable-proxy-ftp
-                    --enable-proxy-http
-                    --enable-proxy-scgi
-                    --enable-dav
-                    --enable-dav-fs
-                    --enable-so
-                    --enable-ssl
-                    --with-included-apr
-                    --with-ssl=${openssl:location}
-                    --with-z=${zlib:location}
-                    --with-expat=${libexpat:location}
-                    --with-pcre=${pcre:location}
-                    --with-sqlite3=${sqlite3:location}
-                    --with-gdbm=${gdbm:location}
-                    --without-lber
-                    --without-ldap
-                    --without-ndbm
-                    --without-berkeley-db
-                    --without-pgsql
-                    --without-mysql
-                    --without-sqlite2
-                    --without-oracle
-                    --without-freedts
-                    --without-odbc
-                    --without-iconv
+patches =
+  ${:_profile_base_location_}/cygwin-httpd-2.4.3-no-undefined.patch
+  ${:_profile_base_location_}/cygwin-httpd-2.4.3-src.patch
 
-environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
-  PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig
-  CPPFLAGS =-I${libuuid:location}/include
-  LDFLAGS =-Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath=${libuuid:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${sqlite3:location}/lib -Wl,-rpath=${gdbm:location}/lib
+# Need rebase moduels in the cygwin, and because cygwin is running,
+# some cygwin dlls can't be rebase, ignore this error.
+# post-install = (cd %(prefix)s/modules; for i in *.so ; do rebase -q -s -d $i 2>/dev/null; done); true
 
-[apache-antiloris-apache-2.2]
+[apache-antiloris]
 # Note: Shall react on each build of apache and reinstall itself
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = apache
 url = http://sourceforge.net/projects/mod-antiloris/files/mod_antiloris-0.4.tar.bz2/download
 md5sum = 66862bf10e9be3a023e475604a28a0b4
-configure-command = ${apache-2.2:location}/bin/apxs
+configure-command = ${apache:prefix}/bin/apxs
 configure-options = -c mod_antiloris.c
 make-binary = ${:configure-command}
 make-options = -i -a -n antiloris mod_antiloris.la
 make-targets =
+patch-options = -p0
+patches =
+  ${:_profile_base_location_}/mod_antiloris-apache-2.4.patch#4f074f035d3b37f3f3e71cd9616440f3
+
+[x86-cygwin-apache-antiloris]
+environment =
+  LDFLAGS =-no-undefined

component/apache/cygwin-apr-util-1.4.1.patch

+diff --git a/apr-util-1.4.1/Makefile.in b/apr-util-1.4.1/Makefile.in
+index 963fead..c9827de 100644
+--- a/apr-util-1.4.1/Makefile.in
++++ b/apr-util-1.4.1/Makefile.in
+@@ -23,7 +23,7 @@ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ APU_MODULES = @APU_MODULES@
+-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
++LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APRUTIL_MAJOR_VERSION) -module -no-undefined -rpath $(APU_DSO_LIBDIR) @abs_builddir@/lib@APRUTIL_LIBNAME@.la $(APRUTIL_LIBS)
+ APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+ 
+ LT_VERSION = @APU_LTVERSION@
+diff --git a/apr-util-1.4.1/dbd/apr_dbd.c b/apr-util-1.4.1/dbd/apr_dbd.c
+index 49553f2..664b441 100644
+--- a/apr-util-1.4.1/dbd/apr_dbd.c
++++ b/apr-util-1.4.1/dbd/apr_dbd.c
+@@ -184,7 +184,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
+ 
+ #if defined(NETWARE)
+     apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
+-#elif defined(WIN32)
++#elif defined(WIN32) || defined(CYGWIN)
+     apr_snprintf(modname, sizeof(modname),
+                  "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
+ #else
+diff --git a/apr-util-1.4.1/dbm/apr_dbm.c b/apr-util-1.4.1/dbm/apr_dbm.c
+index 5c506fc..a5beead 100644
+--- a/apr-util-1.4.1/dbm/apr_dbm.c
++++ b/apr-util-1.4.1/dbm/apr_dbm.c
+@@ -162,7 +162,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable,
+ 
+ #if defined(NETWARE)
+     apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type);
+-#elif defined(WIN32)
++#elif defined(WIN32) || defined(CYGWIN)
+     apr_snprintf(modname, sizeof(modname),
+                  "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type);
+ #else
+diff --git a/apr-util-1.4.1/ldap/apr_ldap_stub.c b/apr-util-1.4.1/ldap/apr_ldap_stub.c
+index 97c1551..9df76b7 100644
+--- a/apr-util-1.4.1/ldap/apr_ldap_stub.c
++++ b/apr-util-1.4.1/ldap/apr_ldap_stub.c
+@@ -45,7 +45,7 @@ static apr_status_t load_ldap(apr_pool_t *pool)
+         return rv;
+     }
+ 
+-#if defined(WIN32)
++#if defined(WIN32) || defined(CYGWIN)
+     modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll";
+ #else
+     modname = "apr_ldap-" APU_STRINGIFY(APU_MAJOR_VERSION) ".so";

component/apache/cygwin-httpd-2.4.3-src.patch

+diff --git a/docs/conf/httpd.conf.in b/docs/conf/httpd.conf.in
+index a46499d..f40b84f 100644
+--- a/docs/conf/httpd.conf.in
++++ b/docs/conf/httpd.conf.in
+@@ -74,8 +74,8 @@ Listen @@Port@@
+ # It is usually good practice to create a dedicated user and group for
+ # running httpd, as with most system services.
+ #
+-User daemon
+-Group daemon
++#User daemon
++#Group daemon
+ 
+ </IfModule>
+ 
+@@ -397,6 +397,10 @@ Include @rel_sysconfdir@/extra/proxy-html.conf
+ 
+ # Secure (SSL/TLS) connections
+ #Include @rel_sysconfdir@/extra/httpd-ssl.conf
++
++# Provide a way for additional packages to add configuration fragments
++#Include @rel_sysconfdir@/conf.d/*.conf
++
+ #
+ # Note: The following must must be present to support
+ #       starting without SSL on platforms with no /dev/random equivalent
+diff --git a/support/apxs.in b/support/apxs.in
+index 8bdc2da..ec36d05 100644
+--- a/support/apxs.in
++++ b/support/apxs.in
+@@ -48,6 +48,9 @@ my $libexecdir     = get_vars("libexecdir");
+ my $CFG_LIBEXECDIR = eval qq("$libexecdir");
+ my $sbindir        = get_vars("sbindir");
+ my $CFG_SBINDIR    = eval qq("$sbindir");
++my $libdir         = get_vars("libdir");
++my $CFG_LIBDIR     = eval qq("$libdir");
++my $SH_LDFLAGS     = get_vars("SH_LDFLAGS");
+ my $ltflags        = $ENV{'LTFLAGS'};
+ $ltflags or $ltflags = "--silent";
+ 
+@@ -464,9 +467,14 @@ if ($opt_c) {
+         $opt .= " ".$apu_libs." ".$apr_libs;
+     }
+     else {
+-        my $apr_ldflags=`$apr_config --ldflags`;
+-        chomp($apr_ldflags);
+-        $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
++         my $apr_libs = `$apr_config --ldflags --link-libtool --libs`;
++         chomp($apr_libs);
++         my $apu_libs = `$apu_config --ldflags --link-libtool --libs`;
++         chomp($apu_libs);
++            
++         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
++         $opt .= " $SH_LDFLAGS -L$CFG_LIBDIR -lhttpd2core";
++         $opt .= " ".$apu_libs." ".$apr_libs;
+     }
+ 
+     push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo");
+diff --git a/build/install.sh b/build/install.sh
+index c5d20da..abf4864 100755
+--- a/build/install.sh
++++ b/build/install.sh
+@@ -102,6 +102,14 @@ fi
+ src="$src$ext"
+ dst="$dst$ext"
+ 
++# Automagically append .exe - this is needed because libtool will not pass
++# unknown options to an install program, so we are unable to use "-e .exe"
++# in this case.
++if [ -f "$src.exe" ]; then
++  src="$src.exe"
++  dst="$dst.exe"
++fi
++
+ #  Make a temp file name in the proper directory.
+ dstdir=`dirname $dst`
+ dsttmp=$dstdir/#inst.$$#

component/bison/buildout.cfg

@@ -4,16 +4,8 @@ extends =
 parts =
   bison
 
-[bison-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = ac06cbaa298ac686d0b0c04bc03e6ad8
-download-only = true
-filename = drop.gets.patch
-
 [bison]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = m4
 url = http://ftp.gnu.org/gnu/bison/bison-2.5.tar.bz2
 md5sum = 9dba20116b13fc61a0846b0058fbe004
-environment =
-  M4=${m4:location}/bin/m4

component/bzip2/buildout.cfg

@@ -2,19 +2,16 @@
 parts =
   bzip2
 
-[bzip2-hooks-download]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 066c8355b7d726f30176ea5b6a35e1a2
-download-only = true
-filename = bzip2-hooks.py
-
 [bzip2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
 md5sum = 00b516f4704d4a7cb50a1d97e6e8e15b
-configure-command = true
-make-options =
-  PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
-  CFLAGS="-fpic -fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64"
-post-make-hook = ${bzip2-hooks-download:location}/${bzip2-hooks-download:filename}:post_make_hook
+configure-command = autoconf && ./configure
+configure-options = --enable-shared
+patch-options = -p1
+patches = ${:_profile_base_location_}/bzip2-autotools-buildfiles.patch
+  
+[x86-cygwin-bzip2]
+patches-cygwin =
+  ${bzip2:patches}
+  ${:_profile_base_location_}/cygwin-bzip2-1.0.6.src.patch
\ No newline at end of file

component/ca-certificates/buildout.cfg

 # CA certificates
 
 [buildout]
-
-extends =
-  ../patch/buildout.cfg
-
 parts =
   ca-certificates
 
-
-[ca-certificates-sbin-dir.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 0b4e7d82ce768823c01954ee41ef177b
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [ca-certificates]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 20120623
 url = ftp://ftp.free.fr/mirrors/ftp.debian.org/pool/main/c/ca-certificates/ca-certificates_${:version}.tar.gz
-patch-binary = ${patch:location}/bin/patch
 md5sum = 5105d4cc086f0d4ecf7bf2e4c4667289
-patches =
-  ${ca-certificates-sbin-dir.patch:location}/${ca-certificates-sbin-dir.patch:filename}
-patch-options = -p0
 configure-command = true
-make-targets = install DESTDIR=${buildout:parts-directory}/${:_buildout_section_name_} CERTSDIR=certs SBINDIR=sbin
+make-targets = install DESTDIR=%(prefix)s CERTSDIR=certs SBINDIR=sbin
+patches =
+  ${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b

component/cclient/buildout.cfg

@@ -6,34 +6,38 @@ extends =
   ../openssl/buildout.cfg
 
 parts =
-  cclient-patch
   cclient
 
-[cclient-patch]
-recipe = slapos.recipe.download
-url = ${:_profile_base_location_}/imap-2007f.patch
-md5sum = 42c77fdd5d7a976fc302b93aadb3da98
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-filename = imap-2007f.patch
-
 [cclient]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = openssl
 url = ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz
 md5sum = 2126fd125ea26b73b20f01fcd5940369
 configure-command = true
-# cclient does not support parallel compilation
+patch-options = -p1
+patches =
+  ${:_profile_base_location_}/imap-2007f.patch#42c77fdd5d7a976fc302b93aadb3da98
 make-options = 
-  slx
-  SSLTYPE=unix
-  SSLDIR=${openssl:location}
   SSLCRYPTO=-lcrypto
   IP=6
-  SSLLIB=${openssl:location}/lib
   EXTRACFLAGS=-fPIC
-  CCLIENT=${buildout:parts-directory}
+  CCLIENT=%(prefix)s
   -j1
 
-patches = 
-  ${cclient-patch:location}/${cclient-patch:filename}
 
-patch-options = -p1
+[x86-cygwin-cclient]
+# cclient does not support parallel compilation
+make-options = 
+  cyg
+  SSLTYPE=none
+  ${cclient:make-options}
+
+[x86-linux-cclient]
+# cclient does not support parallel compilation
+make-options = 
+  slx
+  SSLTYPE=unix
+  SSLDIR=${openssl:prefix}
+  SSLLIB=${openssl:prefix}/lib
+  ${cclient:make-options}
+  
\ No newline at end of file

component/curl/buildout.cfg

@@ -10,7 +10,8 @@ parts =
   curl
 
 [curl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = zlib openssl pkgconfig
 url = http://curl.haxx.se/download/curl-7.24.0.tar.bz2
 #md5sum = 5f6d50c4d4ee38c57fe37e3cff75adbd
 configure-options =
@@ -27,12 +28,15 @@ configure-options =
   --disable-gopher
   --enable-ipv6
   --disable-sspi
-  --with-ssl=${openssl:location}
-  --with-zlib=${zlib:location}
   --without-nss
   --without-libssh2
   --without-libidn
 
+[x86-linux-curl]
+configure-options =
+  --with-ssl=${openssl:location}
+  --with-zlib=${zlib:location}
+
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig

component/cygwin/cygwin-slapos-core-env-none.patch

+diff --git a/slapos/grid/slapgrid.py b/slapos/grid/slapgrid.py
+index a459639..a5a31f6 100644
+--- a/slapos/grid/slapgrid.py
++++ b/slapos/grid/slapgrid.py
+@@ -659,7 +659,7 @@ class Slapgrid(object):
+         process_handler = subprocess.Popen(command,
+           preexec_fn=lambda: dropPrivileges(uid, gid),
+           cwd=cwd,
+-          env={}, **kw)
++          env=None, **kw)
+         process_handler.stdin.flush()
+         process_handler.stdin.close()
+         process_handler.stdin = None
+diff --git a/slapos/grid/utils.py b/slapos/grid/utils.py
+index c27603e..de10406 100644
+--- a/slapos/grid/utils.py
++++ b/slapos/grid/utils.py
+@@ -97,6 +97,8 @@ class SlapPopen(subprocess.Popen):
+   """
+   def __init__(self, *args, **kwargs):
+     kwargs.update(stdin=subprocess.PIPE)
++    if sys.platform == 'cygwin' and kwargs.get('env') == {}:
++      kwargs['env'] = None
+     subprocess.Popen.__init__(self, *args, **kwargs)
+     self.stdin.flush()
+     self.stdin.close()

component/slapos/cygwin/slapos-core-cygwin.patch → component/cygwin/cygwin-slapos-core-format.patch

---- slapos.core-0.33-py2.6.egg/slapos/format.py	2012-11-08 09:45:24.718750000 +0800
-+++ slapos.core-0.33-py2.7.egg/slapos/format.py	2012-11-21 19:20:09.593750000 +0800
+--- a/slapos/format.py	2012-11-08 09:45:24.718750000 +0800
++++ b/slapos/format.py	2012-11-21 19:20:09.593750000 +0800
 @@ -460,9 +460,9 @@
      #      This method shall check if all is correctly done
      #      This method shall not reset groups, just add them

component/file/buildout.cfg

@@ -7,11 +7,14 @@ extends =
   ../zlib/buildout.cfg
 
 [file]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = zlib
 url = ftp://ftp.astron.com/pub/file/file-5.11.tar.gz
 md5sum = 16a407bd66d6c7a832f3a5c0d609c27b
 configure-options =
   --disable-static
+
+[x86-linux-file]
 environment =
   CPPFLAGS=-I${zlib:location}/include
   LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/freetype/buildout.cfg

@@ -10,11 +10,14 @@ parts =
   freetype
 
 [freetype]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = zlib bzip2
 url = http://download.savannah.gnu.org/releases/freetype/freetype-2.4.9.tar.bz2
 md5sum = 77a893dae81fd5b896632715ca041179
 configure-options =
   --disable-static
+
+[x86-linux-freetype]
 environment =
   CPPFLAGS=-I${bzip2:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib

component/gdbm/buildout.cfg

@@ -3,19 +3,22 @@ parts =
   gdbm
 
 [gdbm]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 1.10
 url = ftp://ftp.gnu.org/gnu/gdbm/gdbm-${:version}.tar.gz
 md5sum = 88770493c2559dc80b561293e39d3570
 configure-options =
   --disable-static
+
+[x86-linux-gdbm]
 # install as parts/gdbm/include/gdbm/*.h etc. because some softwares
 # (eg. python's dbmmodule.c extension) assume the location like this.
-includedir = ${buildout:parts-directory}/${:_buildout_section_name_}/include
 make-targets =
-  install includedir=${:includedir}/gdbm && rm -f ${:includedir}/*.h && ln -sf gdbm/gdbm.h ${:includedir}/gdbm.h
+  install includedir=%(preifx)s/gdbm 
+post-install = rm -f %(preifx)s/*.h && ln -sf gdbm/gdbm.h %(preifx)s/gdbm.h
 # it seems that parallel build sometimes fails for gdbm.
 make-options =
   -j1
 
-patches = /opt/patch/gdbm-1.10-cygwin.patch
+[x86-cygwin-gdbm]
+patches = ${:_profile_base_location_}/cygwin-gdbm-1.10-src.patch

component/gdbm/cygwin-gdbm-1.10-src.patch

+--- src/Makefile.am.org	2012-11-07 20:42:53.281250000 +0800
++++ src/Makefile.am	2012-11-07 20:43:12.421875000 +0800
+@@ -60,7 +60,7 @@
+  update.c\
+  version.c
+ 
+-libgdbm_la_LDFLAGS = -version-info $(VI_CURRENT):$(VI_REVISION):$(VI_AGE)
++libgdbm_la_LDFLAGS = -version-info $(VI_CURRENT):$(VI_REVISION):$(VI_AGE) -no-undefined
+ 
+ # Programs
+ bin_PROGRAMS = testgdbm 
+--- configure.ac.org    2012-11-07 21:03:20.359375000 +0800
++++ configure.ac        2012-11-07 21:03:45.640625000 +0800
+@@ -87,6 +87,8 @@
+ dnl AC_C_BIGENDIAN([])
+ AC_C_CONST
+
++AC_LIBTOOL_WIN32_DLL
++
+ dnl Internationalization macros.
+ AM_GNU_GETTEXT([external], [need-ngettext])
+ AM_GNU_GETTEXT_VERSION(0.18)

component/gettext/buildout.cfg

 [buildout]
-parts =
-  gettext
 extends =
   ../ncurses/buildout.cfg
+  ../libiconv/buildout.cfg
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
-
-[gettext-drop.gets.patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 1a17a2e6c1539927304379dfa0f149c5
-download-only = true
-filename = drop.gets.patch
+parts = gettext
 
 [gettext]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = libiconv zlib ncurses libxml2
 url = http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz
 md5sum = 3dd55b952826d2b32f51308f2f91aa89
-
-patches = /opt/patch/gettext-0.18.1.1-cygwin.patch
-  
 configure-options =
   --disable-static
   --disable-java
   --disable-csharp
-  --with-libncurses-prefix=${ncurses:location}
-  --with-libxml2-prefix=${libxml2:location}
   --with-included-gettext
   --without-emacs
   --disable-acl
   --disable-openmp
   --without-git
+patches = ${:_profile_base_location_}/drop.gets.patch
+
+[x86-cygwin-gettext]
+# Refer to http://savannah.gnu.org/bugs/?36443 for CFLAGS/CXXFLAGS -O2
+configure-options =
+  ${gettext:configure-options}
+  CFLAGS="$CFLAGS -O2"
+  CXXFLAGS="$CXXFLAGS -O2"
+patches =
+  ${:_profile_base_location_}/cygwin-gettext-0.18.1.1-src.patch
 
-environment =
-  CPPFLAGS=-I${libxml2:location}/include -I${zlib:location}/include -I${ncurses:location}/include
-  LDFLAGS=-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

component/glib/buildout.cfg

@@ -4,7 +4,10 @@ extends =
   ../zlib/buildout.cfg
 
 [glib]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies =
+  zlib
+  gettext
 url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.8.tar.bz2
 md5sum = 789e7520f71c6a4bf08bc683ec764d24
 configure-options =
@@ -13,9 +16,6 @@ configure-options =
   --disable-fam
   --disable-xattr
 
-patches = /opt/patch/glib-2.28.8-cygwin.patch
-
-environment =
-  CPPFLAGS=-I${zlib:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
-  PATH=${gettext:location}/bin:${ncurses:location}/bin:%(PATH)s
+[x86-cygwin-glib]
+patches =
+  ${:_profile_base_location_}/cygwin-glib-2.28.8-src.patch

component/glib/cygwin-glib-2.28.8-src.patch

+--- glib/gstrfuncs.c~	2012-12-30 14:51:30.000000000 +0800
++++ glib/gstrfuncs.c	2012-12-30 14:51:50.203125000 +0800
+@@ -1423,7 +1423,7 @@
+ #ifdef HAVE_STRSIGNAL
+   const char *msg_locale;
+ 
+-#if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
++#if defined(G_OS_BEOS) 
+ extern const char *strsignal(int);
+ #else
+   /* this is declared differently (const) in string.h on BeOS */

component/libaio/buildout.cfg

@@ -9,4 +9,5 @@ url = http://ftp.free.fr/mirrors/ftp.debian.org/pool/main/liba/libaio/libaio_0.3
 md5sum = 435a5b16ca6198eaf01155263d855756
 location = ${buildout:parts-directory}/${:_buildout_section_name_}
 configure-command = echo
-make-options = prefix=${:location}
+# make-options = prefix=${:location}
+make-binary = true

component/libevent/buildout.cfg

@@ -2,7 +2,7 @@
 parts = libevent
 
 [libevent]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.monkey.org/~provos/libevent-1.4.13-stable.tar.gz
 md5sum = 0b3ea18c634072d12b3c1ee734263664
 configure-options =

component/libexpat/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   libexpat
 
 [libexpat]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://sourceforge.net/projects/expat/files/expat/2.1.0/expat-2.1.0.tar.gz/download
 md5sum = dd7dab7a5fea97d2a6a43f511449b7cd
 configure-options =

component/libiconv/buildout.cfg

@@ -3,6 +3,6 @@ parts =
   libiconv
 
 [libiconv]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
 md5sum = e34509b1623cec449dfeb73d7ce9c6c6

component/libjpeg/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   libjpeg
 
 [libjpeg]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
 md5sum = 52654eb3b2e60c35731ea8fc87f1bd29
 configure-options =

component/libpng/buildout.cfg

@@ -3,23 +3,18 @@ extends =
   ../zlib/buildout.cfg
 
 parts =
-  libpng12
   libpng
 
-[libpng-common]
-recipe = hexagonit.recipe.cmmi
+[libpng]
+recipe = slapos.recipe.cmmi
+dependencies = zlib
+url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
+md5sum = d87f9c34ccab8242c00e41925839f6c9
 configure-options =
   --disable-static
+
+[x86-linux-libpng]
 environment =
   CPPFLAGS =-I${zlib:location}/include
   LDFLAGS =-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
 
-[libpng12]
-<= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.2.50.tar.bz2
-md5sum = 717caa58e9c71a80820eb38c4f4d6ec3
-
-[libpng]
-<= libpng-common
-url = http://download.sourceforge.net/libpng/libpng-1.5.12.tar.bz2
-md5sum = d87f9c34ccab8242c00e41925839f6c9

component/libtool/buildout.cfg

@@ -2,7 +2,7 @@
 parts = libtool
 
 [libtool]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 md5sum = d2f3b7d4627e69e13514a40e72a24d50
 url = http://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz
 configure-options =

component/libuuid/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   libuuid
 
 [libuuid]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://www.kernel.org/pub/linux/utils/util-linux/v2.18/util-linux-ng-2.18.tar.bz2
 md5sum = 2f5f71e6af969d041d73ab778c141a77
 configure-options =
@@ -38,3 +38,7 @@ configure-options =
 
 make-options =
   -C shlibs/uuid
+
+[cygwin-libuuid]
+environment =
+  LDFLAGS =-no-undefined
\ No newline at end of file

component/libxml2/buildout.cfg

@@ -7,13 +7,11 @@ parts =
   libxml2
 
 [libxml2]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = zlib
 url = ftp://ftp.xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz
 md5sum = c62106f02ee00b6437f0fb9d370c1093
 configure-options =
   --disable-static
   --without-python
   --without-lzma
-  --with-zlib=${zlib:location}
-environment =
-    LDFLAGS = -Wl,-rpath=${zlib:location}/lib

component/libxslt/buildout.cfg

@@ -8,16 +8,21 @@ parts =
   libxslt
 
 [libxslt]
+recipe = slapos.recipe.cmmi
+dependencies = zlib libxml2 pkgconfig
 url = ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
 md5sum = e61d0364a30146aaa3001296f853b2b9
-recipe = hexagonit.recipe.cmmi
 configure-options =
   --disable-static
-  --with-libxml-prefix=${libxml2:location}
   --without-crypto
   --without-python
   --without-debug
   --without-debugger
+
+[x86-linux-libxslt]
+configure-options = 
+  ${libxslt:configure-options}
+  --with-libxml-prefix=${libxml2:location}
 environment =
   PATH=${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${zlib:location}/include

component/lxml-python/buildout.cfg

@@ -8,14 +8,14 @@ parts =
   lxml-python
 
 [lxml-python-env]
-PATH = ${libxslt:location}/bin:${zlib:location}/bin:%(PATH)s
+PATH = ${libxslt:prefix}/bin:${zlib:prefix}/bin:%(PATH)s
 
 [lxml-python]
 recipe = zc.recipe.egg:custom
 egg = lxml
 
 rpath =
-  ${libxml2:location}/lib/
-  ${libxslt:location}/lib/
-  ${zlib:location}/lib/
+  ${libxml2:prefix}/lib/
+  ${libxslt:prefix}/lib/
+  ${zlib:prefix}/lib/
 environment = lxml-python-env

component/m4/buildout.cfg

@@ -10,6 +10,6 @@ download-only = true
 filename = drop.gets.patch
 
 [m4]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.bz2
 md5sum = 8a7cef47fecab6272eb86a6be6363b2f

component/mariadb/buildout.cfg

@@ -3,40 +3,26 @@
 
 [buildout]
 extends =
+  ../bison/buildout.cfg
   ../cmake/buildout.cfg
   ../zlib/buildout.cfg
-  ../groonga/buildout.cfg
-  ../libaio/buildout.cfg
   ../libevent/buildout.cfg
   ../ncurses/buildout.cfg
   ../openssl/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../readline/buildout.cfg
 
-parts =
-  mariadb
-
-[mariadb-5.5-no_test-patch]
-recipe = hexagonit.recipe.download
-url = ${:_profile_base_location_}/${:filename}
-md5sum = 14e6d713c16298a10f40d29f2b799aca
-filename = mariadb_5.5_create_system_tables__no_test.patch
-download-only = true
+parts = mariadb
 
 [mariadb]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 version = 5.5.25
-revision = 1
+dependencies = cmake zlib libevent ncurses openssl pkgconfig readline bison
 url = http://downloads.askmonty.org/f/mariadb-${:version}/kvm-tarbake-jaunty-x86/mariadb-${:version}.tar.gz/from/http://ftp.osuosl.org/pub/mariadb
 md5sum = 943f67c267d73a4080ab497e11740daf
-# compile directory is required to build mysql plugins.
-keep-compile-dir = true
-patch-options = -p0
-patches =
-  ${mariadb-5.5-no_test-patch:location}/${mariadb-5.5-no_test-patch:filename}
-configure-command = ${cmake:location}/bin/cmake
+configure-command = ${cmake:prefix}/bin/cmake
 configure-options =
-  -DCMAKE_INSTALL_PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
+  -DCMAKE_INSTALL_PREFIX=%(prefix)s
   -DBUILD_CONFIG=mysql_release
   -DDEFAULT_CHARSET=utf8
   -DDEFAULT_COLLATION=utf8_unicode_ci
@@ -49,19 +35,37 @@ configure-options =
   -DWITH_EMBEDDED_SERVER=0
   -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
   -DWITHOUT_DAEMON_EXAMPLE=1
-  -DCMAKE_C_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_CXX_FLAGS="-I${libaio:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${zlib:location}/include"
-  -DCMAKE_INSTALL_RPATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-environment =
-  CMAKE_PROGRAM_PATH=${cmake:location}/bin
-  CMAKE_INCLUDE_PATH=${libaio:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${zlib:location}/include
-  CMAKE_LIBRARY_PATH=${libaio:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${zlib:location}/lib
-  LDFLAGS=-L${libaio:location}/lib
 
+patches =
+  ${:_profile_base_location_}/mariadb_5.5_create_system_tables__no_test.patch
+  ${:_profile_base_location_}/mariadb-5.5.25-no-mysql-test.patch
+
+[x86-cygwin-mariadb]
+patches =
+  ${mariadb:patches}
+  ${:_profile_base_location_}/cygwin-mariadb-5.5.25-no-threadpool.patch
+post-install =
+  ln -fs  %(prefix)s/lib/libmysqlclient.dll.a  %(prefix)s/lib/libmysqlclient_r.dll.a
+  cp --preserve -f %(prefix)s/lib/cygmysqlclient-*.dll %(prefix)s/bin
+
+[x86-linux-mariadb]
+configure-options =
+  ${mariadb:configure-options}
+  -DCMAKE_C_FLAGS="-I${ncurses:prefix}/include -I${openssl:prefix}/include -I${readline5:prefix}/include -I${zlib:prefix}/include"
+  -DCMAKE_CXX_FLAGS="-I${ncurses:prefix}/include -I${openssl:prefix}/include -I${readline5:prefix}/include -I${zlib:prefix}/include"
+  -DCMAKE_INSTALL_RPATH=${ncurses:prefix}/lib:${openssl:prefix}/lib:${readline5:prefix}/lib:${zlib:prefix}/lib
+  -DCMAKE_INSTALL_COMPONENT="Readme Server Client SharedLibraries SupportFiles Server_Scripts IniFiles Development SqlBench" 
+#  Test
+
+environment =
+  CMAKE_PROGRAM_PATH=${cmake:prefix}/bin
+  CMAKE_INCLUDE_PATH=${ncurses:prefix}/include:${openssl:prefix}/include:${readline5:prefix}/include:${zlib:prefix}/include
+  CMAKE_LIBRARY_PATH=${ncurses:prefix}/lib:${openssl:prefix}/lib:${readline5:prefix}/lib:${zlib:prefix}/lib
+  
 [mroonga-mariadb]
 # mroonga - a storage engine for MySQL. It provides fast fulltext search feature to all MySQL users.
 # http://mroonga.github.com/
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = https://github.com/downloads/mroonga/mroonga/mroonga-2.06.tar.gz
 md5sum = 89ce640a57ed8f2161b8358ff4c29c66
 configure-options =

component/mariadb/cygwin-mariadb-5.5.25-no-threadpool.patch

+diff --git sql/CMakeLists.txt sql/CMakeLists.txt
+index ecf91fc..adbb7bb 100644
+--- sql/CMakeLists.txt
++++ sql/CMakeLists.txt
+@@ -31,7 +31,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/lex_hash.h
+ 
+ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCES} PROPERTIES GENERATED 1)
+ 
+-ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER -DHAVE_POOL_OF_THREADS) 
++ADD_DEFINITIONS(-DMYSQL_SERVER -DHAVE_EVENT_SCHEDULER) 
+ IF(SSL_DEFINES)
+  ADD_DEFINITIONS(${SSL_DEFINES})
+ ENDIF()
+@@ -83,18 +83,11 @@ SET (SQL_SOURCE
+                opt_index_cond_pushdown.cc opt_subselect.cc
+                opt_table_elimination.cc sql_expression_cache.cc
+                gcalc_slicescan.cc gcalc_tools.cc
+-			   threadpool_common.cc 
+ 			   ../sql-common/mysql_async.c
+                ${GEN_SOURCES}
+                ${MYSYS_LIBWRAP_SOURCE}
+ 			   )
+   
+-IF(WIN32)
+-  SET(SQL_SOURCE ${SQL_SOURCE} threadpool_win.cc)
+-ELSE()
+- SET(SQL_SOURCE ${SQL_SOURCE} threadpool_unix.cc)
+-ENDIF()
+-
+ MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
+ RECOMPILE_FOR_EMBEDDED)
+ 
+diff --git sql/scheduler.h sql/scheduler.h
+index 82bba5a..fa38335 100644
+--- sql/scheduler.h
++++ sql/scheduler.h
+@@ -99,14 +99,7 @@ public:
+   void *data;                  /* scheduler-specific data structure */
+ };
+ 
+-#if !defined(EMBEDDED_LIBRARY)
+-#define HAVE_POOL_OF_THREADS 1
+-void pool_of_threads_scheduler(scheduler_functions* func,
+-   ulong *arg_max_connections,
+-   uint *arg_connection_count);
+-#else
+ #define pool_of_threads_scheduler(A,B,C) \
+   one_thread_per_connection_scheduler(A, B, C)
+-#endif
+ 
+ #endif /* SCHEDULER_INCLUDED */
+diff --git strings/dtoa.c strings/dtoa.c
+index 6b21605..4bb5de9 100644
+--- strings/dtoa.c
++++ strings/dtoa.c
+@@ -51,7 +51,7 @@
+ #define DTOA_OVERFLOW 9999
+ 
+ static double my_strtod_int(const char *, char **, int *, char *, size_t);
+-static char *dtoa(double, int, int, int *, int *, char **, char *, size_t);
++static char *x_dtoa(double, int, int, int *, int *, char **, char *, size_t);
+ static void dtoa_free(char *, char *, size_t);
+ 
+ /**
+@@ -92,7 +92,7 @@ size_t my_fcvt(double x, int precision, char *to, my_bool *error)
+   char buf[DTOA_BUFF_SIZE];
+   DBUG_ASSERT(precision >= 0 && precision < NOT_FIXED_DEC && to != NULL);
+   
+-  res= dtoa(x, 5, precision, &decpt, &sign, &end, buf, sizeof(buf));
++  res= x_dtoa(x, 5, precision, &decpt, &sign, &end, buf, sizeof(buf));
+ 
+   if (decpt == DTOA_OVERFLOW)
+   {
+@@ -221,7 +221,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
+   if (x < 0.)
+     width--;
+ 
+-  res= dtoa(x, 4, type == MY_GCVT_ARG_DOUBLE ? width : min(width, FLT_DIG),
++  res= x_dtoa(x, 4, type == MY_GCVT_ARG_DOUBLE ? width : min(width, FLT_DIG),
+             &decpt, &sign, &end, buf, sizeof(buf));
+   if (decpt == DTOA_OVERFLOW)
+   {
+@@ -327,7 +327,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
+         number of significant digits = (len-decpt) - (len-width) = width-decpt
+       */
+       dtoa_free(res, buf, sizeof(buf));
+-      res= dtoa(x, 5, width - decpt, &decpt, &sign, &end, buf, sizeof(buf));
++      res= x_dtoa(x, 5, width - decpt, &decpt, &sign, &end, buf, sizeof(buf));
+       src= res;
+       len= end - res;
+     }
+@@ -393,7 +393,7 @@ size_t my_gcvt(double x, my_gcvt_arg_type type, int width, char *to,
+     {
+       /* Yes, re-convert with a smaller width */
+       dtoa_free(res, buf, sizeof(buf));
+-      res= dtoa(x, 4, width, &decpt, &sign, &end, buf, sizeof(buf));
++      res= x_dtoa(x, 4, width, &decpt, &sign, &end, buf, sizeof(buf));
+       src= res;
+       len= end - res;
+       if (--decpt < 0)
+@@ -2166,7 +2166,7 @@ static int quorem(Bigint *b, Bigint *S)
+            calculation.
+  */
+ 
+-static char *dtoa(double dd, int mode, int ndigits, int *decpt, int *sign,
++static char *x_dtoa(double dd, int mode, int ndigits, int *decpt, int *sign,
+                   char **rve, char *buf, size_t buf_size)
+ {
+   /*

component/mariadb/mariadb-5.5.25-no-mysql-test.patch

+--- CMakeLists.txt~	2013-01-05 14:37:13.937500000 +0800
++++ CMakeLists.txt	2013-01-05 14:37:35.906250000 +0800
+@@ -312,8 +312,6 @@
+    ADD_SUBDIRECTORY(libmysqld/examples)
+   ENDIF(WITH_EMBEDDED_SERVER)
+ 
+-  ADD_SUBDIRECTORY(mysql-test)
+-  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+   ADD_SUBDIRECTORY(support-files)
+   ADD_SUBDIRECTORY(scripts)
+   ADD_SUBDIRECTORY(sql-bench)

component/ncurses/buildout.cfg

@@ -3,21 +3,29 @@ parts =
   ncurses
 
 [ncurses]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.9.tar.gz
 md5sum = 8cb9c412e5f2d96bc6f459aa8c6282a1
 configure-options =
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
   --with-shared
   --without-normal
   --without-debug
   --without-gpm
   --enable-rpath
+
 # tricky way to rerun with --enable-widec
-make-targets =
-  install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done; ln -sf libncurses.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} install
+make-targets = install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h ${buildout:parts-directory}/${:_buildout_section_name_}/include/$i.h; done; ln -sf libncurses.so ${buildout:parts-directory}/${:_buildout_section_name_}/lib/libcurses.so) && ./configure ${:configure-options} --enable-widec && make ${:make-options} install
+make-options =
+  -j1
+
+[x86-cygwin-ncurses]
+configure-options =
+  ${ncurses:configure-options}
+  --with-libtool
+
+make-targets = install && (for i in curses unctrl eti form menu panel term; do ln -sf ncurses/$i.h %(prefix)s/include/$i.h; done; ln -sf libncurses.dll.a %(prefix)s/lib/libcurses.dll.a) && CFLAGS="" CPPFLAGS="" CXXFLAGS="" ./configure --prefix=%(prefix)s ${ncurses:configure-options} --enable-widec && make install
+
+[no-environment]
 # pass dummy LDCONFIG to skip needless calling of ldconfig by non-root user
 environment =
   LDCONFIG=/bin/echo
-make-options =
-  -j1

component/openssl/buildout.cfg

@@ -7,47 +7,29 @@
 extends =
   ../ca-certificates/buildout.cfg
   ../zlib/buildout.cfg
-  ../patch/buildout.cfg
 
 parts =
   openssl
 
-[openssl-nodoc.patch]
-# Disable doc generation part in Makefile 
-recipe = hexagonit.recipe.download
-md5sum = b4887a7b4e18402447bc6227d2493b92
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
-[openssl-exlibs.patch]
-recipe = hexagonit.recipe.download
-md5sum = dfb8979460d6d75f2d23d1ea83bbb40a
-url = ${:_profile_base_location_}/${:filename}
-filename = ${:_buildout_section_name_}
-download-only = true
-
 [openssl]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies =
+  zlib
+  ca-certificates
 url = https://www.openssl.org/source/openssl-1.0.1c.tar.gz
 md5sum = ae412727c8c15b67880aef7bd2999b2e
-patch-binary = ${patch:location}/bin/patch
-patches =
-  ${openssl-nodoc.patch:location}/${openssl-nodoc.patch:filename}
-  ${openssl-exlibs.patch:location}/${openssl-exlibs.patch:filename}
-patch-options = -p0
 configure-command = ./config
 configure-options =
-  -I${zlib:location}/include
-  -L${zlib:location}/lib
-  --openssldir=${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl
-  --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
+  --prefix=%(prefix)s
+  --openssldir=%(prefix)s/etc/ssl
   --libdir=lib
   shared no-idea no-mdc2 no-rc5 zlib
-  -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib
-
 # it seems that parallel build sometimes fails for openssl.
 make-options =
   -j1
-make-targets =
-  install && rm -f ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/* && for i in ${ca-certificates:location}/certs/*/*.crt; do ln -sv $i ${buildout:parts-directory}/${:_buildout_section_name_}/etc/ssl/certs/`${buildout:parts-directory}/${:_buildout_section_name_}/bin/openssl x509 -hash -noout -in $i`.0; done; true
+post-install = rm -f %(prefix)s/etc/ssl/certs/* && for i in ${ca-certificates:prefix}/certs/*/*.crt; do ln -sv $i %(prefix)s/etc/ssl/certs/`%(prefix)s/bin/openssl x509 -hash -noout -in $i`.0; done; true
+
+patches =
+  ${:_profile_base_location_}/openssl-nodoc.patch#b4887a7b4e18402447bc6227d2493b92
+  ${:_profile_base_location_}/openssl-exlibs.patch#dfb8979460d6d75f2d23d1ea83bbb40a
+

component/patch/buildout.cfg

@@ -3,6 +3,6 @@ parts =
   patch
 
 [patch]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.gnu.org/gnu/patch/patch-2.6.1.tar.gz
 md5sum = d758eb96d3f75047efc004a720d33daf

component/pcre/buildout.cfg

@@ -3,7 +3,7 @@ parts =
   pcre
 
 [pcre]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
 md5sum = 0a7b592bea64b7aa7f4011fc7171a730
 configure-options =

component/pkgconfig/buildout.cfg

@@ -10,18 +10,25 @@ extends =
   ../popt/buildout.cfg
 
 [pkgconfig]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies =
+  glib
+  popt
+  gettext
 url = ftp://mirror.ovh.net/gentoo-distfiles/distfiles/pkg-config-0.26.tar.gz
 md5sum = 47525c26a9ba7ba14bf85e01509a7234
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
 # build pkg-config twice so that second configure can use pkg-config
 # to compute GLIB_CFLAGS and GLIB_LIBS.
-configure-command =
-  ./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make && make install && ./configure
+pre-configure = 
+  ./configure --prefix=%(prefix)s --with-installed-glib --with-installed-popt && make && make install
 configure-options =
-  --prefix=${:location}
   --with-installed-glib
   --with-installed-popt
+environment =
+  GLIB_CFLAGS=-I${glib:prefix}/include/glib-2.0 -I${glib:prefix}/lib/glib-2.0/include
+  GLIB_LIBS=-L${glib:prefix}/lib -lglib-2.0 -lintl
+
+[linux-pkgconfig]
 environment =
   PATH=${:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig

component/popt/buildout.cfg

@@ -3,8 +3,11 @@ parts =
   popt
 
 [popt]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = ftp://anduin.linuxfromscratch.org/BLFS/svn/p/popt-1.16.tar.gz
 md5sum = 3743beefa3dd6247a73f8f7a32c14c33
 configure-options =
   --disable-static
+
+[x86-cygwin-popt]
+patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
\ No newline at end of file

component/popt/cygwin-popt-1.16-src.patch

+--- poptconfig.c~	2011-09-10 22:49:30.802250000 +0800
++++ poptconfig.c	2011-09-10 23:46:30.572048000 +0800
+@@ -45,8 +45,9 @@ extern int glob_pattern_p (const char *_
+ #if !defined(__GLIBC__)
+ /* Return nonzero if PATTERN contains any metacharacters.
+    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
++#define glob_pattern_p glob_pattern_p_s
+ static int
+-glob_pattern_p (const char * pattern, int quote)
++glob_pattern_p_s(const char * pattern, int quote)
+ 	/*@*/
+ {
+     const char * p;

component/python-2.7/buildout.cfg

@@ -24,19 +24,15 @@ arguments = sys.argv[1:] + ["bootstrap"]
 python = python2.7
 
 [python2.7]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 package_version = 2.7.3
 package_version_suffix =
 md5sum = c57477edd6d18bd9eeca2f21add73919
-
-depends =
-  ${gdbm:version}
+dependencies = bzip2 gdbm gettext libexpat ncurses openssl readline sqlite3 zlib file
 # This is actually the default setting for prefix, but we can't use it in
 # other settings in this part if we don't set it explicitly here.
-prefix = ${buildout:parts-directory}/${:_buildout_section_name_}
 version = 2.7
-executable = ${:prefix}/bin/python${:version}
-
+executable = %(prefix)s/bin/python${:version}
 url =
   http://python.org/ftp/python/${:package_version}/Python-${:package_version}${:package_version_suffix}.tar.bz2
 configure-options =
@@ -45,9 +41,11 @@ configure-options =
   --with-system-expat
   --with-threads
 
+[x86-cygwin-python2.7]
 patch-options = -p1
-patches = /opt/patch/python-2.7.3-cygwin.patch
+patches = ${:_profile_base_location_}/cygwin-python-2.7.3.patch
 
+[x86-linux-python2.7]
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =

component/readline/buildout.cfg

 [buildout]
 extends =
-       ../ncurses/buildout.cfg
+  ../ncurses/buildout.cfg
 
 parts =
   readline5
@@ -8,7 +8,7 @@ parts =
 
 # readline-5.x is still used for GPL2 only softwares.
 [readline5]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
 url = http://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
 md5sum = e39331f32ad14009b9ff49cc10c5e751
 configure-options =
@@ -16,12 +16,10 @@ configure-options =
   --disable-static
 
 [readline]
-recipe = hexagonit.recipe.cmmi
+recipe = slapos.recipe.cmmi
+dependencies = ncurses
 url = http://ftp.gnu.org/gnu/readline/readline-6.2.tar.gz
 md5sum = 67948acb2ca081f23359d0256e9a271c
 configure-options =
   --enable-multibyte
   --disable-static
-
-environment =
-       LDFLAGS=-L${ncurses:location}/lib

component/slapos/cygwin/glib-2.28.8-cygwin.patch

---- glib/gstrfuncs.c~	2011-09-10 22:57:34.802250000 +0800
-+++ glib/gstrfuncs.c	2011-09-10 22:57:52.630375000 +0800
-@@ -1424,7 +1424,7 @@ g_strsignal (gint signum)
-   const char *msg_locale;
- 
- #if defined(G_OS_BEOS) || defined(G_WITH_CYGWIN)
--extern const char *strsignal(int);
-+extern char *strsignal(int);
- #else
-   /* this is declared differently (const) in string.h on BeOS */
-   extern char *strsignal (int sig);

component/slapos/cygwin/groupadd

-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
-# All Rights Reserved.
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly advised to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 3
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-# Simulate the command groupadd to add a group on the Windows
-#   
-ACTION=ADD
-GROUP_NAME="$1"
-NET LOCALGROUP ${GROUP_NAME} /${ACTION}
-mkgroup > /etc/group