# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1284941483 -7200
# Node ID 8ca3933f27cae73dab03bafc4ddebc3142f1e418
# Parent  782fbc14878465efa47f638cf11f543f3eb00446# Parent  89d84653adf6b53405a5eb059840d11fd3e7c0a3
merge

diff -r 89d84653adf6 -r 8ca3933f27ca Makefile
--- a/Makefile	Mon Sep 20 01:40:14 2010 +0200
+++ b/Makefile	Mon Sep 20 02:11:23 2010 +0200
@@ -50,6 +50,7 @@
     [ '$($(1)_CHECKSUM)' == "`$$(call PKG_CHECKSUM,$(1))`" ]
 
 DOWNLOAD_PKG_ARCHIVE = \
+    mkdir -p '$(PKG_DIR)' && \
     $(if $($(1)_URL_2), \
         wget -T 30 -t 3 -c -O '$(PKG_DIR)/$($(1)_FILE)' '$($(1)_URL)' \
         || wget -c -O '$(PKG_DIR)/$($(1)_FILE)' '$($(1)_URL_2)', \
@@ -71,7 +72,6 @@
 define PKG_RULE
 .PHONY: download-$(1)
 download-$(1): $(addprefix download-,$($(1)_DEPS))
-	[ -d '$(PKG_DIR)' ] || mkdir -p '$(PKG_DIR)'
 	if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \
 	    $(call DOWNLOAD_PKG_ARCHIVE,$(1)); \
 	    $(call CHECK_PKG_ARCHIVE,$(1)) || { echo 'Wrong checksum!'; exit 1; }; \
@@ -84,7 +84,6 @@
                           $(wildcard $(TOP_DIR)/src/$(1)-test*) \
                           $(addprefix $(PREFIX)/installed/,$($(1)_DEPS))
 	@[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)'
-	@[ -d '$(PKG_DIR)' ]              || mkdir -p '$(PKG_DIR)'
 	@if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \
 	    echo '[download] $(1)'; \
 	    rm -f '$(LOG_DIR)/$(1)-download'; \
diff -r 89d84653adf6 -r 8ca3933f27ca doc/index.html
--- a/doc/index.html	Mon Sep 20 01:40:14 2010 +0200
+++ b/doc/index.html	Mon Sep 20 02:11:23 2010 +0200
@@ -551,6 +551,10 @@
         <td></td>
     </tr>
     <tr>
+        <td><a href="http://search.cpan.org/dist/XML-Parser/Parser.pm">Perl XML::Parser</a></td>
+        <td></td>
+    </tr>
+    <tr>
         <td><a href="http://pkg-config.freedesktop.org/">Pkg-config</a></td>
         <td>≥ 0.16</td>
     </tr>
@@ -576,9 +580,9 @@
 
     <!-- http://www.debian.org/distrib/packages#search_packages -->
     <pre>aptitude install -R autoconf automake bash bison bzip2 \
-                    cmake flex g++ make sed libtool \
-                    openssl libssl-dev patch perl \
-                    pkg-config scons unzip wget xz</pre>
+                    cmake flex g++ make sed libtool openssl \
+                    libssl-dev libxml-parser-perl patch \
+                    perl pkg-config scons unzip wget xz</pre>
 
     <p>
     On 64-bit Debian, install also:
@@ -590,7 +594,7 @@
     <!-- http://www.freebsd.org/ports/ -->
     <pre>pkg_add -r automake110 autoconf262 bash bison cmake \
            flex gmake gsed libtool openssl patch perl \
-           pkg-config scons unzip wget</pre>
+           p5-XML-Parser pkg-config scons unzip wget</pre>
 
     <p>
     Ensure that /usr/local/bin preceeds /usr/bin in your $PATH:
@@ -616,7 +620,8 @@
     <!-- http://www.frugalware.org/packages -->
     <pre>pacman-g2 -S autoconf automake bash bzip2 bison cmake \
              flex gcc make sed libtool openssl patch \
-             perl pkgconfig scons unzip wget xz xz-lzma</pre>
+             perl perl-xml-parser pkgconfig scons unzip \
+             wget xz xz-lzma</pre>
 
     <p>
     On 64-bit Frugalware,
@@ -631,8 +636,9 @@
        dev-util/cmake sys-devel/flex sys-devel/gcc \
        sys-devel/make sys-apps/sed sys-devel/libtool \
        dev-libs/openssl sys-devel/patch dev-lang/perl \
-       dev-util/pkgconfig dev-util/scons app-arch/unzip \
-       net-misc/wget xz-utils</pre>
+       dev-perl/XML-Parser dev-util/pkgconfig \
+       dev-util/scons app-arch/unzip net-misc/wget \
+       app-arch/xz-utils</pre>
 
     <p>
     There are
@@ -650,8 +656,8 @@
     </p>
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
-                  gsed libtool openssl pkgconfig scons \
-                  wget xz-devel gcc_select
+                  gsed libtool openssl p5-xml-parser \
+                  pkgconfig scons wget xz-devel gcc_select
 sudo gcc_select gcc40</pre>
 
     <h3>MacOS X (≤ 10.5)</h3>
@@ -665,8 +671,8 @@
     </p>
     <!-- http://www.macports.org/ports.php -->
     <pre>sudo port install autoconf automake bison cmake flex \
-                  gmake gsed libtool openssl pkgconfig \
-                  scons wget xz-devel</pre>
+                  gmake gsed libtool openssl p5-xml-parser \
+                  pkgconfig scons wget xz-devel</pre>
 
     <h3 id="requirements-opensolaris">Open Solaris 2009.06</h3>
 
@@ -683,12 +689,11 @@
     that already ship with Solaris:
     </p>
     <!-- http://pkg.opensolaris.org/release/en/search.shtml -->
-    <pre>pfexec pkg install SUNWgnu-automake-110 SUNWbison \
-                   SUNWcmake SUNWflexlex SUNWgcc \
-                   SUNWgmake SUNWgsed SUNWgzip \
-                   SUNWlibtool SUNWlibm SUNWopenssl \
-                   SUNWgpch SUNWgnome-common-devel \
-                   SUNWunzip SUNWwget</pre>
+    <pre>pfexec pkg install SUNWgnu-automake-110 SUNWbison SUNWcmake \
+                   SUNWflexlex SUNWgcc SUNWgmake SUNWgsed \
+                   SUNWgzip SUNWlibtool SUNWlibm \
+                   SUNWopenssl SUNWgpch SUNWperl-xml-parser \
+                   SUNWgnome-common-devel SUNWunzip SUNWwget</pre>
 
     <p>
     and make Automake available:
@@ -741,9 +746,10 @@
 
     <!-- http://software.opensuse.org/113/en -->
     <pre>zypper install -R autoconf automake bash bison bzip2 \
-                  cmake flex gcc-c++ gettext-tools make sed libtool \
-                  openssl libopenssl-devel patch perl \
-                  pkg-config scons unzip wget xz</pre>
+                  cmake flex gcc-c++ gettext-tools libtool \
+                  make openssl libopenssl-devel patch perl \
+                  perl-XML-Parser pkg-config scons sed \
+                  unzip wget xz</pre>
 
     <h3 id="requirements-opensuse64">openSUSE 11.3 x86_64 (additional)</h3>
     <pre>zypper install -R gcc-32bit glibc-devel-32bit \
diff -r 89d84653adf6 -r 8ca3933f27ca src/atkmm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/atkmm.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,30 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# ATKmm
+PKG             := atkmm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.21.2
+$(PKG)_CHECKSUM := 5aa7ef7733bd614e5ef922d300a2559c59a5d9dc
+$(PKG)_SUBDIR   := atkmm-$($(PKG)_VERSION)
+$(PKG)_FILE     := atkmm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://www.gtkmm.org/
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/atkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc atk glibmm
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://git.gnome.org/browse/atkmm/refs/tags' | \
+    grep '<a href=' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 89d84653adf6 -r 8ca3933f27ca src/cairomm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/cairomm.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,29 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# cairomm
+PKG             := cairomm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.8.4
+$(PKG)_CHECKSUM := fdea579f406261881a0f4f6242a3980aecef382d
+$(PKG)_SUBDIR   := cairomm-$($(PKG)_VERSION)
+$(PKG)_FILE     := cairomm-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://cairographics.org/cairomm/
+$(PKG)_URL      := http://cairographics.org/releases/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc cairo libsigc++
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://cairographics.org/releases/' | \
+    grep 'LATEST-cairomm-' | \
+    $(SED) -n 's,.*"LATEST-cairomm-\([0-9][^"]*\)".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 89d84653adf6 -r 8ca3933f27ca src/glibmm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glibmm.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,35 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# GLibmm
+PKG             := glibmm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.24.2
+$(PKG)_CHECKSUM := df5f22d2c40ebdf097ecdb4a7dfeef70d1ca24e7
+$(PKG)_SUBDIR   := glibmm-$($(PKG)_VERSION)
+$(PKG)_FILE     := glibmm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://www.gtkmm.org/
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/glibmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libsigc++
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://git.gnome.org/browse/glibmm/refs/tags' | \
+    grep '<a href=' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # cross build
+    # wine confuses the cross-compiling detection, so set it explicitly
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        CXX='$(TARGET)-c++' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)/gio/src' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= MISC_STUFF=
+    $(MAKE) -C '$(1)'         -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 89d84653adf6 -r 8ca3933f27ca src/gtkmm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gtkmm.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,32 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# GTKMM
+PKG             := gtkmm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.20.3
+$(PKG)_CHECKSUM := ad53f52f18cc3021b7fd6cd06f965471039d5333
+$(PKG)_SUBDIR   := gtkmm-$($(PKG)_VERSION)
+$(PKG)_FILE     := gtkmm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://www.gtkmm.org/
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc gtk libsigc++ pangomm cairomm atkmm
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://git.gnome.org/browse/gtkmm/refs/tags' | \
+    grep '<a href=' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \
+    grep -v '^2\.9' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # wine confuses the cross-compiling detection, so set it explicitly
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 89d84653adf6 -r 8ca3933f27ca src/libsigc++.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libsigc++.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,34 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# libsigc++
+PKG             := libsigc++
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.2.8
+$(PKG)_CHECKSUM := c26f57110629c16c0b5a873346b7c1cf0edc9c5e
+$(PKG)_SUBDIR   := libsigc++-$($(PKG)_VERSION)
+$(PKG)_FILE     := libsigc++-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://libsigc.sourceforge.net/
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libsigc++/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://git.gnome.org/browse/libsigc++2/refs/tags' | \
+    grep '<a href=' | \
+    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # cross build
+    # wine confuses the cross-compiling detection, so set it explicitly
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        CXX='$(TARGET)-c++' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 89d84653adf6 -r 8ca3933f27ca src/pangomm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pangomm.mk	Mon Sep 20 02:11:23 2010 +0200
@@ -0,0 +1,31 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# Pangomm
+PKG             := pangomm
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.26.2
+$(PKG)_CHECKSUM := 67ebf73e36dc829ab3e7ff76c0e447dc0a031f14
+$(PKG)_SUBDIR   := pangomm-$($(PKG)_VERSION)
+$(PKG)_FILE     := pangomm-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://www.pango.org/
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/pangomm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc cairomm glibmm pango
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://git.gnome.org/browse/pangomm/refs/tags' | \
+    grep '<a href=' | \
+    $(SED) -n "s,.*<a href='[^']*/tag/?id=\\([0-9][^']*\\)'.*,\\1,p" | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # wine confuses the cross-compiling detection, so set it explicitly
+    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef