# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1258032783 -3600
# Node ID 5e1bf64a718bf797d36bbccdfcfa820eb99befbe
# Parent  a5c246076469c12e3471c4fd5a7d679a31fcbe7c# Parent  a8603e0dbf27573f3a7c5095f3824b0869009f0f
merge

diff -r a5c246076469 -r 5e1bf64a718b src/curl.mk
--- a/src/curl.mk	Thu Nov 12 05:31:04 2009 +0100
+++ b/src/curl.mk	Thu Nov 12 14:33:03 2009 +0100
@@ -37,7 +37,7 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,-I@includedir@,-I@includedir@ -DCURL_STATICLIB,' -i '$(1)/curl-config.in'
+    $(SED) '/^#endif/ i#define CURL_STATICLIB' -i '$(1)/include/curl/curlbuild.h.in'
     $(SED) 's,GNUTLS_ENABLED = 1,GNUTLS_ENABLED=1,' -i '$(1)/configure'
     # wine confuses the cross-compiling detection, so set it explicitly
     $(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
diff -r a5c246076469 -r 5e1bf64a718b src/xerces.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xerces.mk	Thu Nov 12 14:33:03 2009 +0100
@@ -0,0 +1,68 @@
+# Copyright (C) 2009  Volker Grabsch
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject
+# to the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# Xerces-C++
+PKG             := xerces
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.0.1
+$(PKG)_CHECKSUM := 71e4efee5397dd45d6bafad34bf3bc766bc2a085
+$(PKG)_SUBDIR   := xerces-c-$($(PKG)_VERSION)
+$(PKG)_FILE     := xerces-c-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://xerces.apache.org/xerces-c/
+$(PKG)_URL      := http://apache.linux-mirror.org/xerces/c/$(word 1,$(subst ., ,$($(PKG)_VERSION)))/sources/$($(PKG)_FILE)
+$(PKG)_URL_2    := http://www.apache.org/dist/xerces/c/$(word 1,$(subst ., ,$($(PKG)_VERSION)))/sources/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libiconv curl
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://svn.apache.org/viewvc/xerces/c/tags/?sortby=date' | \
+    grep '<a name="' | \
+    $(SED) -n 's,.*<a name="Xerces-C_\([0-9][^"]*\)".*,\1,p' | \
+    $(SED) 's,_,.,g' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --enable-libtool-lock \
+        --disable-pretty-make \
+        --enable-threads \
+        --enable-network \
+        --enable-netaccessor-curl \
+        --disable-netaccessor-socket \
+        --disable-netaccessor-cfurl \
+        --disable-netaccessor-winsock \
+        --enable-transcoder-iconv \
+        --disable-transcoder-gnuiconv \
+        --disable-transcoder-icu \
+        --disable-transcoder-macosunicodeconverter \
+        --disable-transcoder-windows \
+        --enable-msgloader-inmemory \
+        --disable-msgloader-iconv \
+        --disable-msgloader-icu \
+        --with-curl='$(PREFIX)/$(TARGET)' \
+        --without-icu \
+        LIBS="-lws2_32 `$(TARGET)-pkg-config --libs libcurl`"
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef