# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1226311799 -3600
# Node ID 11829aaff7d3047249054f4842a6386a565a81fb
# Parent  b68f52494bd62f75b2dda1777c95a24905f91c76
new package: expat

diff -r b68f52494bd6 -r 11829aaff7d3 src/expat.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/expat.mk	Mon Nov 10 11:09:59 2008 +0100
@@ -0,0 +1,24 @@
+# Expat XML Parser
+# http://expat.sourceforge.net/
+
+PKG            := expat
+$(PKG)_VERSION := 2.0.1
+$(PKG)_SUBDIR  := expat-$($(PKG)_VERSION)
+$(PKG)_FILE    := expat-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL     := http://$(SOURCEFORGE_MIRROR)/expat/$($(PKG)_FILE)
+$(PKG)_DEPS    := gcc
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/project/showfiles.php?group_id=10127&package_id=10780' | \
+    grep 'expat-' | \
+    $(SED) -n 's,.*expat-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r b68f52494bd6 -r 11829aaff7d3 src/fontconfig.mk
--- a/src/fontconfig.mk	Mon Nov 10 11:08:01 2008 +0100
+++ b/src/fontconfig.mk	Mon Nov 10 11:09:59 2008 +0100
@@ -6,7 +6,7 @@
 $(PKG)_SUBDIR  := fontconfig-$($(PKG)_VERSION)
 $(PKG)_FILE    := fontconfig-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL     := http://fontconfig.org/release/$($(PKG)_FILE)
-$(PKG)_DEPS    := gcc freetype libxml2
+$(PKG)_DEPS    := gcc freetype expat
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://fontconfig.org/release/' | \
@@ -26,8 +26,6 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-arch='$(TARGET)' \
         --with-freetype-config='$(PREFIX)/$(TARGET)/bin/freetype-config' \
-        --enable-libxml2 \
-        LIBXML2_CFLAGS="`$(PREFIX)/$(TARGET)/bin/xml2-config --cflags`" \
-        LIBXML2_LIBS="`$(PREFIX)/$(TARGET)/bin/xml2-config --libs`"
+        --with-expat='$(PREFIX)/$(TARGET)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
diff -r b68f52494bd6 -r 11829aaff7d3 src/gdal.mk
--- a/src/gdal.mk	Mon Nov 10 11:08:01 2008 +0100
+++ b/src/gdal.mk	Mon Nov 10 11:09:59 2008 +0100
@@ -6,7 +6,7 @@
 $(PKG)_SUBDIR  := gdal-$($(PKG)_VERSION)
 $(PKG)_FILE    := gdal-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL     := http://www.gdal.org/dl/$($(PKG)_FILE)
-$(PKG)_DEPS    := gcc zlib libpng tiff libgeotiff jpeg giflib curl geos
+$(PKG)_DEPS    := gcc zlib libpng tiff libgeotiff jpeg giflib expat curl geos
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://trac.osgeo.org/gdal/wiki/DownloadSource' | \
@@ -27,9 +27,9 @@
         --with-geotiff='$(PREFIX)/$(TARGET)' \
         --with-jpeg='$(PREFIX)/$(TARGET)' \
         --with-gif='$(PREFIX)/$(TARGET)' \
+        --with-expat='$(PREFIX)/$(TARGET)' \
         --with-curl='$(PREFIX)/$(TARGET)/bin/curl-config' \
         --with-geos='$(PREFIX)/$(TARGET)/bin/geos-config' \
-        --with-expat=no \
         --without-python \
         --without-ngpython
     $(MAKE) -C '$(1)'       -j 1 lib-target
diff -r b68f52494bd6 -r 11829aaff7d3 src/gettext.mk
--- a/src/gettext.mk	Mon Nov 10 11:08:01 2008 +0100
+++ b/src/gettext.mk	Mon Nov 10 11:09:59 2008 +0100
@@ -20,6 +20,7 @@
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
+        --without-libexpat-prefix \
         --enable-threads=win32
     $(MAKE) -C '$(1)/intl' -j '$(JOBS)' SHELL=bash install
 endef