Mercurial > mxe-octave

changeset 815:4bce5054926c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Volker Grabsch <vog@notjusthosting.com>
date Tue, 23 Feb 2010 18:51:51 +0100
parents 9a0f75190980 (current diff) 64db10989f7d (diff)
children 6dbd5d406e4e
files doc/index.html src/glib-win32.patch src/libgsf-win32.patch
diffstat 23 files changed, 616 insertions(+), 383 deletions(-) [+]
line wrap: on
line diff
--- a/doc/index.html	Tue Feb 23 18:51:14 2010 +0100
+++ b/doc/index.html	Tue Feb 23 18:51:51 2010 +0100
@@ -409,23 +409,15 @@
 
     <dl>
 
-    <dt>2010-02-21 &ndash; Release <span id="latest-version">2.12</span></dt>
+    <dt>2010-xx-xx &ndash; Release <span id="latest-version">2.13</span></dt>
     <dd>
         <p>
-        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.12.tar.gz">Download</a> |
-        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.12">Changelog</a>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.13.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.13">Changelog</a>
         </p>
 
         <p>
-        This release fixes some minor build issues,
-        and contains a first small set of test programs
-        to check the package builds.
-        </p>
-
-        <p>
-        The build rules are simplified
-        by calling generators like Autotools and Flex,
-        instead of patching the generated files.
+        This release ...
         </p>
 
         <p>
@@ -433,10 +425,8 @@
         </p>
 
         <p>
-        Many new packages are supported:
-        aubio, devil, directx, exiv2, fftw, freeimage, gsoap,
-        id3lib, liblo, libpano13, librsvg, libsamplerate,
-        muparser, openscenegraph, portaudio and sdl_pango.
+        Some new packages are supported:
+        liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
         </p>
     </dd>
 
@@ -866,6 +856,37 @@
 
     <dl>
 
+    <dt>2010-02-21 &ndash; Release 2.12</dt>
+    <dd>
+        <p>
+        <a href="http://download.savannah.nongnu.org/releases/mingw-cross-env/mingw-cross-env-2.12.tar.gz">Download</a> |
+        <a href="http://hg.savannah.nongnu.org/hgweb/mingw-cross-env/log/2.12">Changelog</a>
+        </p>
+
+        <p>
+        This release fixes some minor build issues,
+        and contains a first small set of test programs
+        to check the package builds.
+        </p>
+
+        <p>
+        The build rules are simplified
+        by calling generators like Autotools and Flex,
+        instead of patching the generated files.
+        </p>
+
+        <p>
+        Almost all packages are updated to their latest version.
+        </p>
+
+        <p>
+        Many new packages are supported:
+        aubio, devil, directx, exiv2, fftw, freeimage, gsoap,
+        id3lib, liblo, libpano13, librsvg, libsamplerate,
+        muparser, openscenegraph, portaudio and sdl_pango.
+        </p>
+    </dd>
+
     <dt>2010-02-20 &ndash; Release 2.11</dt>
     <dd>
         <p>
--- a/src/cairo.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/cairo.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -4,8 +4,8 @@
 # cairo
 PKG             := cairo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.8.8
-$(PKG)_CHECKSUM := e4b8b219427d1ca3dc95f5f44914dce1ae0c3766
+$(PKG)_VERSION  := 1.8.10
+$(PKG)_CHECKSUM := fd5e8ca82ff0e8542ea4c51612cad387f2a49df3
 $(PKG)_SUBDIR   := cairo-$($(PKG)_VERSION)
 $(PKG)_FILE     := cairo-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://cairographics.org/
--- a/src/gdal.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/gdal.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -44,7 +44,7 @@
         --with-sqlite3='$(PREFIX)/$(TARGET)' \
         --with-curl='$(PREFIX)/$(TARGET)/bin/curl-config' \
         --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \
-        --with-pg='$(PREFIX)/$(TARGET)/bin/pg_config' \
+        --with-pg='$(PREFIX)/bin/$(TARGET)-pg_config' \
         --with-odbc='$(PREFIX)/$(TARGET)' \
         --without-static-proj4 \
         --without-xerces \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-1-win32.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,29 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -ru glib-2.23.4.orig/configure.in glib-2.23.4/configure.in
+--- glib-2.23.4.orig/configure.in	2010-02-21 21:54:55.000000000 +0100
++++ glib-2.23.4/configure.in	2010-02-23 17:44:18.000000000 +0100
+@@ -476,13 +476,6 @@
+ AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
+ GLIB_GNU_GETTEXT
+ 
+-if test "$gt_cv_have_gettext" != "yes" ; then
+-  AC_MSG_ERROR([
+-*** You must have either have gettext support in your C library, or use the 
+-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
+-])
+-fi
+-
+ LIBS="$INTLLIBS $LIBS"
+ 
+ GETTEXT_PACKAGE=glib20
+@@ -2748,8 +2741,6 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
+-GTK_DOC_CHECK([1.11])
+-
+ AC_ARG_ENABLE(man,
+               [AC_HELP_STRING([--enable-man],
+                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/glib-2-fix-tool-paths.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,19 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in
+--- glib-2.23.2.orig/glib-2.0.pc.in	2009-04-01 01:04:20.000000000 +0200
++++ glib-2.23.2/glib-2.0.pc.in	2010-02-07 23:58:08.000000000 +0100
+@@ -3,9 +3,9 @@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-glib_genmarshal=glib-genmarshal
+-gobject_query=gobject-query
+-glib_mkenums=glib-mkenums
++glib_genmarshal=@bindir@/glib-genmarshal
++gobject_query=@bindir@/gobject-query
++glib_mkenums=@bindir@/glib-mkenums
+ 
+ Name: GLib
+ Description: C Utility Library
--- a/src/glib-win32.patch	Tue Feb 23 18:51:14 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -ru glib-2.23.2.orig/configure.in glib-2.23.2/configure.in
---- glib-2.23.2.orig/configure.in	2010-01-25 02:50:02.000000000 +0100
-+++ glib-2.23.2/configure.in	2010-02-07 14:29:02.000000000 +0100
-@@ -2735,8 +2735,6 @@
- dnl *** Checks for gtk-doc ***
- dnl **************************
- 
--GTK_DOC_CHECK([1.11])
--
- AC_ARG_ENABLE(man,
-               [AC_HELP_STRING([--enable-man],
-                               [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-diff -ru glib-2.23.2.orig/m4macros/glib-gettext.m4 glib-2.23.2/m4macros/glib-gettext.m4
---- glib-2.23.2.orig/m4macros/glib-gettext.m4	2009-04-01 01:04:20.000000000 +0200
-+++ glib-2.23.2/m4macros/glib-gettext.m4	2010-02-07 15:37:34.000000000 +0100
-@@ -246,8 +246,6 @@
- 	    esac])
-           LIBS="$glib_save_LIBS"
- 	  INSTOBJEXT=.mo
--	else
--	  gt_cv_have_gettext=no
- 	fi
-       fi
-     ])
-diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in
---- glib-2.23.2.orig/glib-2.0.pc.in	2009-04-01 01:04:20.000000000 +0200
-+++ glib-2.23.2/glib-2.0.pc.in	2010-02-07 23:58:08.000000000 +0100
-@@ -3,9 +3,9 @@
- libdir=@libdir@
- includedir=@includedir@
- 
--glib_genmarshal=glib-genmarshal
--gobject_query=gobject-query
--glib_mkenums=glib-mkenums
-+glib_genmarshal=@bindir@/glib-genmarshal
-+gobject_query=@bindir@/gobject-query
-+glib_mkenums=@bindir@/glib-mkenums
- 
- Name: GLib
- Description: C Utility Library
--- a/src/glib.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/glib.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -4,8 +4,8 @@
 # GLib
 PKG             := glib
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.23.3
-$(PKG)_CHECKSUM := 9ba908954fbcab7f8b74faf483f83b7ef8d28cf9
+$(PKG)_VERSION  := 2.23.4
+$(PKG)_CHECKSUM := a2ba4fac49acc09cca457b20feec178c02075cf1
 $(PKG)_SUBDIR   := glib-$($(PKG)_VERSION)
 $(PKG)_FILE     := glib-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.gtk.org/
@@ -21,8 +21,10 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib)
-    mv '$(1)/$(glib_SUBDIR)' '$(1).native'
+    cd '$(1)' && aclocal
+    cd '$(1)' && $(LIBTOOLIZE) --force
+    cd '$(1)' && autoconf
+    cp -Rp '$(1)' '$(1).native'
 
     # native build of libiconv (used by glib-genmarshal)
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
@@ -32,9 +34,6 @@
     $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
 
     # native build for glib-genmarshal, without pkg-config, gettext and zlib
-    $(SED) -i 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,'     '$(1).native/configure'
-    $(SED) -i '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' '$(1).native/configure'
-    $(SED) -i 's,found_zlib=no,found_zlib=yes,'                     '$(1).native/configure'
     cd '$(1).native' && ./configure \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
@@ -52,9 +51,6 @@
     $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
 
     # cross build
-    cd '$(1)' && aclocal
-    cd '$(1)' && $(LIBTOOLIZE) --force
-    cd '$(1)' && autoconf
     $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gst-plugins-base.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,37 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# gst-plugins-base
+PKG             := gst-plugins-base
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.10.26
+$(PKG)_CHECKSUM := 33f6be03b4baf199dbb13f12d8a4f4749f79843f
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
+$(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2 gstreamer liboil pango
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-base/refs/tags' | \
+    $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    find '$(1)' -name Makefile.in \
+        -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g'       {} \; \
+        -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-debug \
+        --disable-check \
+        --disable-tests \
+        --disable-examples \
+        --mandir='$(1)/sink' \
+        --docdir='$(1)/sink' \
+        --with-html-dir='$(1)/sink'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gst-plugins-good-fix-pkgconfig.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,15 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -ru gst-plugins-good-0.10.18.orig/configure.ac gst-plugins-good-0.10.18/configure.ac
+--- gst-plugins-good-0.10.18.orig/configure.ac	2010-02-10 23:46:02.000000000 +0100
++++ gst-plugins-good-0.10.18/configure.ac	2010-02-23 16:53:57.000000000 +0100
+@@ -216,7 +216,7 @@
+ AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no)
+ AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes)
+ 
+-GST_TOOLS_DIR=`pkg-config --variable=toolsdir gstreamer-$GST_MAJORMINOR`
++GST_TOOLS_DIR=`$PKG_CONFIG --variable=toolsdir gstreamer-$GST_MAJORMINOR`
+ if test -z $GST_TOOLS_DIR; then
+   AC_MSG_ERROR([no tools dir defined in GStreamer pkg-config file; core upgrade needed.])
+ fi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gst-plugins-good.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,40 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# gst-plugins-good
+PKG             := gst-plugins-good
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.10.18
+$(PKG)_CHECKSUM := 74a463ed6e300598bd14f3f8915f2765f5420bd5
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
+$(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2 gstreamer gst-plugins-base liboil libshout cairo directx flac gtk jpeg libpng speex taglib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gst-plugins-good/refs/tags' | \
+    $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && aclocal -I m4 -I common/m4
+    cd '$(1)' && automake
+    cd '$(1)' && autoconf
+    find '$(1)' -name Makefile.in \
+        -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g'       {} \; \
+        -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \;
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-debug \
+        --disable-check \
+        --disable-tests \
+        --disable-examples \
+        --mandir='$(1)/sink' \
+        --docdir='$(1)/sink' \
+        --with-html-dir='$(1)/sink'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gstreamer.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,36 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# gstreamer
+PKG             := gstreamer
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.10.26
+$(PKG)_CHECKSUM := 868dccf7d2a844af88fd2fcf05c92822285fd9ab
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
+$(PKG)_WEBSITE  := http://gstreamer.freedesktop.org/
+$(PKG)_URL      := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://cgit.freedesktop.org/gstreamer/gstreamer/refs/tags' | \
+    $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g'       '$(1)'/gst/Makefile.in
+    $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-debug \
+        --disable-check \
+        --disable-tests \
+        --disable-examples \
+        --mandir='$(1)/sink' \
+        --docdir='$(1)/sink' \
+        --with-html-dir='$(1)/sink'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgsf-no-gettext.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,17 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -ru libgsf-1.14.17.orig/configure.in libgsf-1.14.17/configure.in
+--- libgsf-1.14.17.orig/configure.in	2009-11-19 01:52:56.000000000 +0100
++++ libgsf-1.14.17/configure.in	2010-02-23 16:17:17.000000000 +0100
+@@ -53,10 +53,6 @@
+ 
+ dnl Gettext/i18n stuff
+ 
+-IT_PROG_INTLTOOL([0.35.0])
+-
+-AM_GLIB_GNU_GETTEXT
+-
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
--- a/src/libgsf-win32.patch	Tue Feb 23 18:51:14 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-diff -ru libgsf-1.14.16.orig/configure.in libgsf-1.14.16/configure.in
---- libgsf-1.14.16.orig/configure.in	2009-09-26 01:19:36.000000000 +0200
-+++ libgsf-1.14.16/configure.in	2010-02-07 16:21:58.000000000 +0100
-@@ -51,8 +51,6 @@
- 
- dnl Gettext/i18n stuff
- 
--IT_PROG_INTLTOOL([0.35.0])
--
- AM_GLIB_GNU_GETTEXT
- 
- GETTEXT_PACKAGE=AC_PACKAGE_NAME
--- a/src/libgsf.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/libgsf.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -4,8 +4,8 @@
 # libgsf
 PKG             := libgsf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.14.16
-$(PKG)_CHECKSUM := 9461d816c283e977d88916932def678560f9c8d5
+$(PKG)_VERSION  := 1.14.17
+$(PKG)_CHECKSUM := a1ea6d5e02b7f68cdc61977ec8eaf169e3b8abaf
 $(PKG)_SUBDIR   := libgsf-$($(PKG)_VERSION)
 $(PKG)_FILE     := libgsf-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://ftp.gnome.org/pub/gnome/sources/libgsf/
@@ -22,6 +22,7 @@
 define $(PKG)_BUILD
     $(SED) -i 's,^\(Requires:.*\),\1 gio-2.0,' '$(1)'/libgsf-1.pc.in
     echo 'Libs.private: -lz -lbz2'          >> '$(1)'/libgsf-1.pc.in
+    cd '$(1)' && aclocal -I m4
     cd '$(1)' && autoconf
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/liboil.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,34 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# liboil
+PKG             := liboil
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 0.3.17
+$(PKG)_CHECKSUM := f9d7103a3a4a4089f56197f81871ae9129d229ed
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://$(PKG).freedesktop.org/
+$(PKG)_URL      := http://$(PKG).freedesktop.org/download/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc 
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://cgit.freedesktop.org/liboil/refs/tags' | \
+    $(SED) -n "s,.*<a href='[^']*/tag/?id=[^0-9]*\\([0-9][^']*\\)'.*,\\1,p" | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-debug \
+        --disable-check \
+        --disable-tests \
+        --disable-examples \
+        --mandir='$(1)/sink' \
+        --docdir='$(1)/sink' \
+        --with-html-dir='$(1)/sink'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libshout-1-fixes.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,45 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -urN a/examples/nonblocking.c b/examples/nonblocking.c
+--- a/examples/nonblocking.c	2006-06-19 19:54:05.000000000 +0200
++++ b/examples/nonblocking.c	2010-02-21 19:55:04.834952292 +0100
+@@ -68,7 +68,11 @@
+ 
+ 	while (ret == SHOUTERR_BUSY) {
+ 	  printf("Connection pending. Sleeping...\n");
++#ifdef __MINGW32__
++	  Sleep(1000);
++#else
+ 	  sleep(1);
++#endif
+ 	  ret = shout_get_connected(shout);
+ 	}
+ 	
+diff -urN a/include/os.h b/include/os.h
+--- a/include/os.h	2005-06-27 23:33:22.000000000 +0200
++++ b/include/os.h	2010-02-21 19:55:04.834952292 +0100
+@@ -1,7 +1,9 @@
+ #ifdef _WIN32
++#ifndef __MINGW32__
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
+ typedef unsigned __int32 uint32_t;
+ typedef __int32 int32_t;
+ typedef int  ssize_t;
+ #endif
++#endif
+diff -urN a/include/shout/shout.h.in b/include/shout/shout.h.in
+--- a/include/shout/shout.h.in	2005-06-27 23:33:21.000000000 +0200
++++ b/include/shout/shout.h.in	2010-02-21 20:14:04.762887368 +0100
+@@ -23,8 +23,10 @@
+ 
+ #include <sys/types.h>
+ #ifdef WIN32
++#ifndef __MINGW32__
+ #include <os.h>
+ #endif
++#endif
+ 
+ #define SHOUTERR_SUCCESS	(0)
+ #define SHOUTERR_INSANE		(-1)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libshout.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,30 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# libshout
+PKG             := libshout
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 2.2.2
+$(PKG)_CHECKSUM := cabc409e63f55383f4d85fac26d3056bf0365aac
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://www.icecast.org/
+$(PKG)_URL      := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc vorbis ogg theora speex
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://www.icecast.org/download.php' | \
+    $(SED) -n 's,.*libshout-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-debug \
+        --infodir='$(1)/sink' \
+        --mandir='$(1)/sink'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
+endef
--- a/src/pango.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/pango.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -4,8 +4,8 @@
 # Pango
 PKG             := pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.26.2
-$(PKG)_CHECKSUM := 051b6f7b5f98a4c8083ef6a5178cb5255a992b98
+$(PKG)_VERSION  := 1.27.1
+$(PKG)_CHECKSUM := e01daee61a8bc0afa863be364b03e73f8d9214c1
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.pango.org/
--- a/src/postgresql.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/postgresql.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -80,5 +80,6 @@
         --without-zlib \
         --with-system-tzdata=/dev/null
     $(MAKE) -C '$(1).native'/src/port          -j '$(JOBS)'
-    $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)' install
+    $(MAKE) -C '$(1).native'/src/bin/pg_config -j '$(JOBS)'
+    $(INSTALL) -m755 '$(1).native'/src/bin/pg_config/pg_config '$(PREFIX)/bin/$(TARGET)-pg_config'
 endef
--- a/src/qt-win32.patch	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/qt-win32.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -1,11 +1,192 @@
 This file is part of mingw-cross-env.
 See doc/index.html for further information.
 
+diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
+index 67a4636..824b54a 100755
+--- a/config.tests/unix/compile.test
++++ b/config.tests/unix/compile.test
+@@ -74,7 +74,7 @@ else
+     $MAKE >/dev/null 2>&1
+ fi
+ 
+-[ -x "$EXE" ] && SUCCESS=yes
++[ -x "$EXE" ] || [ -x "release/${EXE}.exe" ] && SUCCESS=yes
+ 
+ # done
+ if [ "$SUCCESS" != "yes" ]; then
+diff --git a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
+index a00bf15..cb562fe 100644
+--- a/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
++++ b/config.tests/unix/getaddrinfo/getaddrinfotest.cpp
+@@ -42,9 +42,16 @@
+ /* Sample program for configure to test for getaddrinfo on the unix
+      platform. we check for all structures and functions required. */
+ 
++#include <stdio.h>
++#include <stdlib.h>
++#ifdef __MINGW32__
++#include <winsock2.h>
++#include <ws2tcpip.h>
++#else
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
++#endif
+ 
+ int main()
+ {
+diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro
+index 8cdc776..bf4f2e0 100644
+--- a/config.tests/unix/iconv/iconv.pro
++++ b/config.tests/unix/iconv/iconv.pro
+@@ -1,3 +1,4 @@
+ SOURCES = iconv.cpp
+ CONFIG -= qt dylib app_bundle
+ mac:LIBS += -liconv
++win32-g++:LIBS += -liconv
+diff --git a/config.tests/unix/ipv6/ipv6test.cpp b/config.tests/unix/ipv6/ipv6test.cpp
+index 3dc30c3..5783a85 100644
+--- a/config.tests/unix/ipv6/ipv6test.cpp
++++ b/config.tests/unix/ipv6/ipv6test.cpp
+@@ -46,9 +46,14 @@ platforms. We check for the required IPv6 data structures. */
+ #define _HPUX_SOURCE
+ #endif
+ 
++#ifdef __MINGW32__
++#include <winsock2.h>
++#include <ws2tcpip.h>
++#else
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#endif
+ 
+ int main()
+ {
+diff --git a/config.tests/unix/largefile/largefiletest.cpp b/config.tests/unix/largefile/largefiletest.cpp
+index a5d7313..3a8924c 100644
+--- a/config.tests/unix/largefile/largefiletest.cpp
++++ b/config.tests/unix/largefile/largefiletest.cpp
+@@ -51,6 +51,9 @@ platforms.
+ #include <sys/stat.h>
+ #include <assert.h>
+ #include <stdio.h>
++#ifdef __MINGW32__
++#define ftello ftello64
++#endif
+ 
+ int main( int, char **argv )
+ {
+diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
+index 7092c58..f28712e 100644
+--- a/config.tests/unix/odbc/odbc.cpp
++++ b/config.tests/unix/odbc/odbc.cpp
+@@ -38,7 +38,9 @@
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
+-
++#ifdef __MINGW32__
++#include <windows.h>
++#endif
+ #include <sql.h>
+ #include <sqlext.h>
+ 
+diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
+index c588ede..44bb23b 100644
+--- a/config.tests/unix/odbc/odbc.pro
++++ b/config.tests/unix/odbc/odbc.pro
+@@ -1,4 +1,5 @@
+ SOURCES = odbc.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -lodbc
++!win32-g++:LIBS += -lodbc
++win32-g++:LIBS += -lodbc32
+diff --git a/config.tests/unix/rtti/rtti.cpp b/config.tests/unix/rtti/rtti.cpp
+new file mode 100644
+index 0000000..e78103c
+--- /dev/null
++++ b/config.tests/unix/rtti/rtti.cpp
+@@ -0,0 +1,45 @@
++/****************************************************************************
++**
++** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
++** All rights reserved.
++** Contact: Nokia Corporation (qt-info@nokia.com)
++**
++** This file is part of the config.tests of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial Usage
++** Licensees holding valid Qt Commercial licenses may use this file in
++** accordance with the Qt Commercial License Agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and Nokia.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU Lesser General Public License version 2.1 requirements
++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** In addition, as a special exception, Nokia gives you certain additional
++** rights.  These rights are described in the Nokia Qt LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++** If you have questions regarding the use of this file, please contact
++** Nokia at qt-info@nokia.com.
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++int main(int, char**)
++{
++    return 0;
++}
+diff --git a/config.tests/unix/rtti/rtti.pro b/config.tests/unix/rtti/rtti.pro
+new file mode 100644
+index 0000000..d0aae30
+--- /dev/null
++++ b/config.tests/unix/rtti/rtti.pro
+@@ -0,0 +1,3 @@
++SOURCES = rtti.cpp
++CONFIG -= x11 qt
++mac:CONFIG -= app_bundle
+diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro
+index 432bd8d..428dc73 100644
+--- a/config.tests/x11/opengl/opengl.pro
++++ b/config.tests/x11/opengl/opengl.pro
+@@ -7,4 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) {
+ }
+ 
+ CONFIG -= qt
+-LIBS += -lGL -lGLU
++!win32-g++:LIBS += -lGL -lGLU
++win32-g++:LIBS += -lopengl32
 diff --git a/configure b/configure
-index ed5891f..3873d7f 100755
+index ed5891f..0e8cd9f 100755
 --- a/configure
 +++ b/configure
-@@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests"
+@@ -178,6 +178,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ # window system detection
+ #-------------------------------------------------------------------------------
+ 
++# XPLATFROM win32-g++ is treated as a subcase of PLATFORM_X11 for convenience
+ PLATFORM_X11=no
+ PLATFORM_MAC=no
+ PLATFORM_QWS=no
+@@ -605,7 +606,7 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
@@ -14,7 +195,7 @@
  QMakeVar add decorations "default windows styled"
  QMakeVar add mouse-drivers "pc"
  if [ "$UNAME_SYSTEM" = "Linux" ] ; then
-@@ -733,6 +733,7 @@ CFG_MMX=auto
+@@ -733,6 +734,7 @@ CFG_MMX=auto
  CFG_3DNOW=auto
  CFG_SSE=auto
  CFG_SSE2=auto
@@ -22,277 +203,67 @@
  CFG_REDUCE_RELOCATIONS=no
  CFG_IPV6=auto
  CFG_NAS=no
-@@ -4466,7 +4467,10 @@ fi # Build qmake
- #-------------------------------------------------------------------------------
- 
- # detect availability of float math.h functions
--if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
-+if [ "$XPLATFORM" = "win32-g++" ]; then
-+    echo "Using FLOATMATH for win32-g++ target"
-+    CFG_USE_FLOATMATH=yes
-+elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/floatmath "floatmath" $L_FLAGS $I_FLAGS $l_FLAGS; then
-     CFG_USE_FLOATMATH=yes
- else
-     CFG_USE_FLOATMATH=no
-@@ -4474,7 +4478,10 @@ fi
- 
- # detect mmx support
- if [ "${CFG_MMX}" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+      echo "Using MMX for win32-g++ target"
-+      CFG_MMX=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mmx "mmx" $L_FLAGS $I_FLAGS $l_FLAGS "-mmmx"; then
- 	CFG_MMX=yes
-     else
- 	CFG_MMX=no
-@@ -4483,7 +4490,10 @@ fi
+@@ -1602,6 +1604,13 @@ while [ "$#" -gt 0 ]; do
+             UNKNOWN_OPT=yes
+         fi
+         ;;
++    rtti)
++        if [ "$VAL" = "no" ]; then
++            CFG_RTTI="$VAL"
++        else
++            UNKNOWN_OPT=yes
++        fi
++        ;;
+     iwmmxt)
+ 	CFG_IWMMXT="yes"
+ 	;;
+@@ -3482,6 +3491,7 @@ cat << EOF
+     -no-3dnow .......... Do not compile with use of 3DNOW instructions.
+     -no-sse ............ Do not compile with use of SSE instructions.
+     -no-sse2 ........... Do not compile with use of SSE2 instructions.
++    -no-rtti ........... Do not compile with RTTI.
  
- # detect 3dnow support
- if [ "${CFG_3DNOW}" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "Using SSE for win32-g++ target"
-+        CFG_3DNOW=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/3dnow "3dnow" $L_FLAGS $I_FLAGS $l_FLAGS "-m3dnow"; then
- 	CFG_3DNOW=yes
-     else
- 	CFG_3DNOW=no
-@@ -4492,7 +4502,10 @@ fi
- 
- # detect sse support
- if [ "${CFG_SSE}" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "Using SSE for win32-g++ target"
-+        CFG_SSE=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse "sse" $L_FLAGS $I_FLAGS $l_FLAGS "-msse"; then
- 	CFG_SSE=yes
-     else
- 	CFG_SSE=no
-@@ -4501,13 +4514,26 @@ fi
- 
- # detect sse2 support
- if [ "${CFG_SSE2}" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+      echo "Using SSE2 for win32-g++ target"
-+      CFG_SSE2=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sse2 "sse2" $L_FLAGS $I_FLAGS $l_FLAGS "-msse2"; then
-        CFG_SSE2=yes
-     else
-        CFG_SSE2=no
+     -qtnamespace <name>  Wraps all Qt library code in 'namespace <name> {...}'.
+     -qtlibinfix <infix>  Renames all libQt*.so to libQt*<infix>.so.
+@@ -4508,6 +4518,17 @@ if [ "${CFG_SSE2}" = "auto" ]; then
      fi
  fi
  
 +# detect rtti support
 +if [ "${CFG_RTTI}" = "auto" ]; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+      echo "Using RTTI for win32-g++ target"
-+      CFG_RTTI=yes
++    if [ "$XPLATFORM" != "win32-g++" ]; then
++        CFG_RTTI=no
++    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/rtti "rtti" $L_FLAGS $I_FLAGS $l_FLAGS "-frtti"; then
++        CFG_RTTI=yes
 +    else
-+      CFG_RTTI=no
++        CFG_RTTI=no
 +    fi
 +fi
 +
  # check iWMMXt support
  if [ "$CFG_IWMMXT" = "yes" ]; then
      "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
-@@ -4542,7 +4568,10 @@ if [ "$CFG_ZLIB" = "no" ]; then
-     ZLIB_FORCED=yes
- fi
- if [ "$CFG_ZLIB" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+       echo "We cannot test for system ZLIB since we are cross building for win32-g++, so we assume it is there."
-+       CFG_ZLIB=system
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/zlib "zlib" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-        CFG_ZLIB=system
-     else
-        CFG_ZLIB=yes
-@@ -4559,7 +4588,10 @@ if [ "$CFG_JPEG" = "auto" ]; then
- fi
- # detect jpeg
- if [ "$CFG_LIBJPEG" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+       echo "We cannot test for system LIBJPEG since we are cross building for win32-g++, so we assume it is there."
-+       CFG_LIBJPEG=system
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libjpeg "libjpeg" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-        CFG_LIBJPEG=system
-     else
-        CFG_LIBJPEG=qt
-@@ -4586,7 +4618,10 @@ fi
- 
- # detect tiff
- if [ "$CFG_LIBTIFF" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "We cannot test for system LIBTIFF since we are cross building for win32-g++, so we assume it is there."
-+        CFG_LIBTIFF=system
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-         CFG_LIBTIFF=system
-     else
-         CFG_LIBTIFF=qt
-@@ -4603,7 +4638,10 @@ if [ "$CFG_MNG" = "auto" ]; then
- fi
- # detect mng
- if [ "$CFG_LIBMNG" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+       echo "We cannot test for system LIBMNG since we are cross building for win32-g++, so we assume it is there."
-+       CFG_LIBMNG=system
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-        CFG_LIBMNG=system
-     else
-        CFG_LIBMNG=qt
-@@ -4612,7 +4650,10 @@ fi
- 
- # detect png
- if [ "$CFG_LIBPNG" = "auto" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+       echo "We cannot test for system LIBPNG since we are cross building for win32-g++, so we assume it is there."
-+       CFG_LIBPNG=system
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-        CFG_LIBPNG=system
-     else
-        CFG_LIBPNG=qt
-@@ -4679,7 +4720,11 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
-             fi
-             ;;
-         psql)
--            if [ "$CFG_SQL_psql" != "no" ]; then
-+            if [ "$XPLATFORM" = "win32-g++" ]; then
-+                echo "We cannot test for PostgreSQL support since we are cross building for win32-g++, so we assume it is there."
-+                CFG_SQL_psql=plugin
-+                QT_LFLAGS_PSQL="-lpq -lsecur32 `$PKG_CONFIG --libs openssl`"
-+            elif [ "$CFG_SQL_psql" != "no" ]; then
+@@ -4683,6 +4704,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
                  if "$WHICH" pg_config >/dev/null 2>&1; then
                      QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
                      QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
-@@ -4707,7 +4752,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
-         ;;
-         odbc)
-             if [ "$CFG_SQL_odbc" != "no" ]; then
--                if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+                if [ "$XPLATFORM" = "win32-g++" ]; then
-+                    echo "We cannot test for ODBC support since we are cross building for win32-g++, so we assume it is there."
-+                    CFG_SQL_odbc=plugin
-+                elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-                     if [ "$CFG_SQL_odbc" = "auto" ]; then
-                         CFG_SQL_odbc=plugin
-                     fi
-@@ -4752,7 +4800,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
-             ;;
-         tds)
-             if [ "$CFG_SQL_tds" != "no" ]; then
--                if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+                if [ "$XPLATFORM" = "win32-g++" ]; then
-+                    echo "We cannot test for TDS since we are cross building for win32-g++, so we assume it is there."
-+                    if [ "CFG_SQL_tds" = "auto" ]; then
-+                        CFG_SQL_tds=plugin
-+                    fi
-+                elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-                     if [ "$CFG_SQL_tds" = "auto" ]; then
-                         CFG_SQL_tds=plugin
-                     fi
-@@ -4834,7 +4887,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
-                         QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
-                         QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
-                     fi
--                    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+                    if [ "$XPLATFORM" = "win32-g++" ]; then
-+                        echo "We cannot test for system sqlite since we are cross building for win32-g++, so we assume it is there."
-+                        if [ "$CFG_SQL_sqlite" = "auto" ]; then
-+                            CFG_SQL_sqlite=plugin
-+                        fi
-+                        QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
-+                    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-                         if [ "$CFG_SQL_sqlite" = "auto" ]; then
-                             CFG_SQL_sqlite=plugin
-                         fi
-@@ -4905,7 +4964,9 @@ fi
++                    QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS"
+                 fi
+                 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
+                 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
+@@ -5060,8 +5082,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
+     fi
  
- # auto-detect iconv(3) support
- if [ "$CFG_ICONV" != "no" ]; then
--    if [ "$PLATFORM_QWS" = "yes" ]; then
+     # Check we actually have X11 :-)
+-    "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS
+-    if [ $? != "0" ]; then
 +    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        CFG_ICONV=no
-+    elif [ "$PLATFORM_QWS" = "yes" ]; then
- 	CFG_ICONV=no
-     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-         CFG_ICONV=yes
-@@ -5065,7 +5126,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
++        echo "Skipping XLib test for win32-g++"
++    elif ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
          echo "Basic XLib functionality test failed!"
          echo " You might need to modify the include and library search paths by editing"
          echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
--        exit 1
-+echo NOTICE: This is a specially modifed configure script!
-+echo For our purposes we do not want X11.
-+#        exit 1
-     fi
- 
-     # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
-@@ -5139,7 +5202,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
-             echo " You might need to modify the include and library search paths by editing"
-             echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
-             echo " ${XQMAKESPEC}."
--            exit 1
-+echo NOTICE: This is a specially modifed configure script!
-+echo For our purposes we do not want the OpenGL functionality test.
-+#            exit 1
-         fi
-         case "$PLATFORM" in
-         hpux*)
-@@ -5640,7 +5705,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
- fi
- 
- HAVE_STL=no
--if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
-+if [ "$XPLATFORM" = "win32-g++" ]; then
-+    echo "Using STL for win32-g++ target"
-+    HAVE_STL=yes
-+elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
-     HAVE_STL=yes
- fi
- 
-@@ -5662,7 +5730,10 @@ fi
- 
- # find if the platform supports IPv6
- if [ "$CFG_IPV6" != "no" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "Using IPV6 for win32-g++ target"
-+        CFG_IPV6=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-         CFG_IPV6=yes
-     else
-         if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-@@ -5776,7 +5847,10 @@ fi
- 
- # find if the platform supports X/Open Large File compilation environment
- if [ "$CFG_LARGEFILE" != "no" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "Using LARGEFILE for win32-g++ target"
-+        CFG_LARGEFILE=yes
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
-         CFG_LARGEFILE=yes
-     else
-         if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-@@ -5793,7 +5867,9 @@ fi
- 
- # detect OpenSSL
- if [ "$CFG_OPENSSL" != "no" ]; then
--    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-+    if [ "$XPLATFORM" = "win32-g++" ]; then
-+        echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there."
-+    elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-         if [ "$CFG_OPENSSL" = "auto" ]; then
-             CFG_OPENSSL=yes
-         fi
-@@ -6141,6 +6217,7 @@ fi
+@@ -6141,6 +6164,7 @@ fi
  [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
  [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
  [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
@@ -300,25 +271,16 @@
  [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
  [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
  [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
-@@ -6222,11 +6299,12 @@ else
+@@ -6222,7 +6246,7 @@ else
      QT_CONFIG="$QT_CONFIG freetype"
  fi
  
 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
--    #On Mac we implicitly link against libz, so we
--    #never use the 3rdparty stuff.
--    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
--fi
-+# We're cross compiling, so we respect the user setting.
-+#if [ "x$PLATFORM_MAC" = "xyes" ]; then
-+#    #On Mac we implicitly link against libz, so we
-+#    #never use the 3rdparty stuff.
-+#    [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
-+#fi
- if [ "$CFG_ZLIB" = "yes" ]; then
-     QT_CONFIG="$QT_CONFIG zlib"
- elif [ "$CFG_ZLIB" = "system" ]; then
-@@ -7161,7 +7239,7 @@ fi
++if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM" != "win32-g++" ]; then
+     #On Mac we implicitly link against libz, so we
+     #never use the 3rdparty stuff.
+     [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
+@@ -7161,7 +7185,7 @@ fi
  
  cat >>"$QTCONFIG.tmp" <<EOF
  #configuration
@@ -327,16 +289,7 @@
  QT_ARCH = $CFG_ARCH
  QT_EDITION = $Edition
  QT_CONFIG += $QT_CONFIG
-@@ -7253,7 +7331,7 @@ fi
- if [ '!' -z "$OPENSSL_LIBS" ]; then
-     echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$CACHEFILE.tmp"
- elif [ "$CFG_OPENSSL" = "linked" ]; then
--    echo "OPENSSL_LIBS = -lssl -lcrypto" >> "$CACHEFILE.tmp"
-+    echo "OPENSSL_LIBS = `$PKG_CONFIG --libs openssl`" >> "$CACHEFILE.tmp"
- fi
- 
- #dump in the SDK info
-@@ -7434,7 +7512,7 @@ fi
+@@ -7434,7 +7458,7 @@ fi
  echo "Declarative module .. $CFG_DECLARATIVE"
  echo "STL support ......... $CFG_STL"
  echo "PCH support ......... $CFG_PRECOMPILE"
@@ -345,7 +298,7 @@
  if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
      echo "iWMMXt support ...... ${CFG_IWMMXT}"
      echo "NEON support ........ ${CFG_NEON}"
-@@ -7752,7 +7830,11 @@ for file in .projects .projects.3; do
+@@ -7752,7 +7776,11 @@ for file in .projects .projects.3; do
          [ "$IN_ROOT" = "no" ] && continue
  
          case $a in
@@ -548,20 +501,17 @@
 +    win32:!win32-g++:LIBS += zdll.lib
  }
 diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
-index 72ea80f..899aa30 100644
+index 72ea80f..cf31a5b 100644
 --- a/src/network/ssl/ssl.pri
 +++ b/src/network/ssl/ssl.pri
-@@ -35,5 +35,11 @@ symbian {
+@@ -34,6 +34,7 @@ symbian {
+     # Include Qt's default CA bundle
      RESOURCES += network.qrc
  
-     # Add optional SSL libs
-+    !contains(QT_CONFIG, system-zlib):contains(OPENSSL_LIBS, -lz) {
-+        # Use the zlib in QtCore
-+        OPENSSL_LIBS -= -lz
-+        OPENSSL_LIBS += -lQtCore4
-+    }
+-    # Add optional SSL libs
++    # Add optional SSL libs, but not accidently system zlib
++    !contains(QT_CONFIG, system-zlib):OPENSSL_LIBS -= -lz
      LIBS_PRIVATE += $$OPENSSL_LIBS
-+
  }
 diff --git a/src/plugins/imageformats/jpeg/jpeg.pro b/src/plugins/imageformats/jpeg/jpeg.pro
 index ebc79cc..30a19c6 100644
--- a/src/qt.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/qt.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://qt.nokia.com/
 $(PKG)_URL      := http://get.qt.nokia.com/qt/source/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl libgcrypt zlib libpng jpeg libmng tiff sqlite
+$(PKG)_DEPS     := gcc libodbc++ postgresql freetds openssl libgcrypt zlib libpng jpeg libmng tiff sqlite libiconv glib
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://qt.gitorious.org/qt/qt/commits' | \
@@ -86,11 +86,19 @@
     find '$(1)'/src -name '*.pr[oi]' -exec \
         $(SED) -i 's,\(^\|[^_/]\)win32\([^-]\|$$\),\1unix\2,g' {} \;
 
+    # Use the correct pg_config tool
+    $(SED) -i 's,pg_config,$(TARGET)-pg_config,g;' '$(1)'/configure
+
     # Configure Qt for MinGW target
     # We prefer static mingw-cross-env system libs for static build:
     # -system-zlib -system-libpng -system-libjpeg -system-libtiff -system-libmng -system-sqlite
     # There is no -system-gif option. NB -system-libmng will not link in shared build.
-    cd '$(1)' && ./configure \
+    # Linking QtNetwork4.dll requires OPENSSL_LIBS. Harmless for static build.
+    # QtCore4 provides qt-zlib to openssl. Harmless for system-zlib.
+    # Linking qsqlpsql4.dll plugin requires PSQL_LIBS. Harmless for static build.
+    cd '$(1)' && \
+        OPENSSL_LIBS="`'$(TARGET)-pkg-config' --libs-only-l openssl` -lQtCore4" \
+        PSQL_LIBS="-lpq -lsecur32 `'$(TARGET)-pkg-config' --libs-only-l openssl`" ./configure \
         -opensource \
         -confirm-license \
         -xplatform win32-g++ \
@@ -129,6 +137,7 @@
         -system-sqlite \
         -qt-gif \
         -openssl-linked \
+        -no-fontconfig \
         -v
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/vmime-0.9.1-svn-r534-20100218.patch	Tue Feb 23 18:51:51 2010 +0100
@@ -0,0 +1,12 @@
+This file is part of mingw-cross-env.
+See doc/index.html for further information.
+
+diff -urN a/bootstrap b/bootstrap
+--- a/bootstrap	2010-02-18 02:25:13.325568851 +0100
++++ b/bootstrap	2010-02-18 02:26:04.310693246 +0100
+@@ -1,4 +1,5 @@
+ #! /bin/bash
++#! /usr/bin/env bash
+ #
+ # Bootstrap file for 'autotools' build
+ #
--- a/src/vmime.mk	Tue Feb 23 18:51:14 2010 +0100
+++ b/src/vmime.mk	Tue Feb 23 18:51:51 2010 +0100
@@ -33,7 +33,6 @@
          sendmail_path=/sbin/sendmail
 
     $(SED) -i 's,libtoolize ,$(LIBTOOLIZE) ,' '$(1)'/bootstrap
-    $(SED) -i 's,/bin/bash,/usr/bin/env bash,' '$(1)'/bootstrap
     cd '$(1)' && ./bootstrap
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \