summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2008-11-23 10:27:26 +0000
committerTiziano Müller <dev-zero@gentoo.org>2008-11-23 10:27:26 +0000
commit175819b5d4ec4b3ee3ef5596324afedb9d79cc9a (patch)
treebe2a37b78db26d7f4e465b798dee45d58a489b98 /dev-libs/poco/files
parentManifest fix. Sorry :) (diff)
downloadhistorical-175819b5d4ec4b3ee3ef5596324afedb9d79cc9a.tar.gz
historical-175819b5d4ec4b3ee3ef5596324afedb9d79cc9a.tar.bz2
historical-175819b5d4ec4b3ee3ef5596324afedb9d79cc9a.zip
Version bump, unbundled libs (bug #247242). Dropped old version.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27.5 x86_64
Diffstat (limited to 'dev-libs/poco/files')
-rw-r--r--dev-libs/poco/files/1.3.2-gentoo.patch71
-rw-r--r--dev-libs/poco/files/1.3.2-missing_includes.patch57
-rw-r--r--dev-libs/poco/files/1.3.3_p1-gentoo.patch80
-rw-r--r--dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch197
4 files changed, 277 insertions, 128 deletions
diff --git a/dev-libs/poco/files/1.3.2-gentoo.patch b/dev-libs/poco/files/1.3.2-gentoo.patch
deleted file mode 100644
index bed364c524fa..000000000000
--- a/dev-libs/poco/files/1.3.2-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur poco-1.3.2-data.orig/components poco-1.3.2-data/components
---- poco-1.3.2-data.orig/components 2008-05-29 16:54:08.000000000 +0200
-+++ poco-1.3.2-data/components 2008-05-29 16:58:26.000000000 +0200
-@@ -2,8 +2,4 @@
- XML
- Util
- Net
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--CppUnit
-diff -Naur poco-1.3.2-data.orig/Data/ODBC/Makefile poco-1.3.2-data/Data/ODBC/Makefile
---- poco-1.3.2-data.orig/Data/ODBC/Makefile 2008-05-29 16:54:08.000000000 +0200
-+++ poco-1.3.2-data/Data/ODBC/Makefile 2008-05-29 16:56:05.000000000 +0200
-@@ -8,11 +8,11 @@
-
- include $(POCO_BASE)/build/rules/global
-
--ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
-diff -Naur poco-1.3.2-data.orig/Makefile poco-1.3.2-data/Makefile
---- poco-1.3.2-data.orig/Makefile 2008-05-29 16:54:08.000000000 +0200
-+++ poco-1.3.2-data/Makefile 2008-05-29 20:32:35.000000000 +0200
-@@ -17,17 +17,17 @@
-
- .PHONY: all libexecs cppunit tests samples install
-
--all: libexecs tests samples
-+all: libexecs
-
- INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
--COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC
-+COMPONENTS = Foundation XML Util Net Data
-
- cppunit:
- $(MAKE) -C $(POCO_BASE)/CppUnit
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -37,14 +37,14 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -Rf {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
- .PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec
- .PHONY: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests
- .PHONY: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples
-
--libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec
--tests: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests
-+libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec
-+tests: Foundation-tests XML-tests Util-tests Net-tests Data-tests
- samples: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples
-
- Foundation-libexec:
diff --git a/dev-libs/poco/files/1.3.2-missing_includes.patch b/dev-libs/poco/files/1.3.2-missing_includes.patch
deleted file mode 100644
index afcbe57560ff..000000000000
--- a/dev-libs/poco/files/1.3.2-missing_includes.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
---- poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:47:39.000000000 +0200
-+++ poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:49:09.000000000 +0200
-@@ -42,6 +42,7 @@
-
- #include "Poco/Data/ODBC/ODBC.h"
- #include <vector>
-+#include <cstring>
- #ifdef POCO_OS_FAMILY_WINDOWS
- #include <windows.h>
- #endif
-diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h
---- poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 20:47:40.000000000 +0200
-+++ poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 22:01:36.000000000 +0200
-@@ -42,7 +42,7 @@
- #include "Poco/NotificationStrategy.h"
- #include <map>
- #include <list>
--
-+#include <memory>
-
- namespace Poco {
-
-diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h poco-1.3.2-data/Foundation/include/Poco/HashTable.h
---- poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h 2008-05-29 20:47:40.000000000 +0200
-+++ poco-1.3.2-data/Foundation/include/Poco/HashTable.h 2008-05-29 22:08:33.000000000 +0200
-@@ -47,7 +47,7 @@
- #include <vector>
- #include <map>
- #include <cstddef>
--
-+#include <cstring>
-
- namespace Poco {
-
-diff -Naur poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp poco-1.3.2-data/Foundation/src/BinaryWriter.cpp
---- poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp 2008-05-29 20:47:40.000000000 +0200
-+++ poco-1.3.2-data/Foundation/src/BinaryWriter.cpp 2008-05-29 20:48:05.000000000 +0200
-@@ -33,6 +33,7 @@
- // DEALINGS IN THE SOFTWARE.
- //
-
-+#include <cstring>
-
- #include "Poco/BinaryWriter.h"
- #include "Poco/ByteOrder.h"
-diff -Naur poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp poco-1.3.2-data/Foundation/src/File_UNIX.cpp
---- poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp 2008-05-29 20:47:40.000000000 +0200
-+++ poco-1.3.2-data/Foundation/src/File_UNIX.cpp 2008-05-29 20:48:05.000000000 +0200
-@@ -33,6 +33,7 @@
- // DEALINGS IN THE SOFTWARE.
- //
-
-+#include <cstring>
-
- #include "Poco/File_UNIX.h"
- #include "Poco/Buffer.h"
diff --git a/dev-libs/poco/files/1.3.3_p1-gentoo.patch b/dev-libs/poco/files/1.3.3_p1-gentoo.patch
new file mode 100644
index 000000000000..f162cd1d222e
--- /dev/null
+++ b/dev-libs/poco/files/1.3.3_p1-gentoo.patch
@@ -0,0 +1,80 @@
+diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components
+--- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200
++++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200
+@@ -1,12 +1,6 @@
+-CppUnit
+ Foundation
+ XML
+ Util
+ Net
+-NetSSL_OpenSSL
+ Data
+-Data/SQLite
+-Data/ODBC
+-Data/MySQL
+-Crypto
+ Zip
+diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile
+--- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200
++++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200
+@@ -11,19 +11,19 @@
+ ifeq ($(POCO_CONFIG),MinGW)
+ # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
+ else
+-ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -lodbc -lodbcinst
+ COMMONFLAGS += -DPOCO_UNIXODBC
+ else
+-ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -lodbc -lodbcinst
+ COMMONFLAGS += -DPOCO_UNIXODBC
+ else
+-ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (iodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+ else
+-ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (iodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+ else
+diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile
+--- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200
++++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200
+@@ -21,7 +21,7 @@
+
+ .PHONY: all libexecs cppunit tests samples clean distclean install
+
+-all: libexecs tests samples
++all: libexecs
+
+ INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
+ COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip
+@@ -31,7 +31,7 @@
+
+ install: libexecs
+ mkdir -p $(INSTALLDIR)/include/Poco
+- mkdir -p $(INSTALLDIR)/lib
++ mkdir -p $(INSTALLDIR)/$(LIBDIR)
+ mkdir -p $(INSTALLDIR)/bin
+ for comp in $(COMPONENTS) ; do \
+ if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
+@@ -41,11 +41,11 @@
+ find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
+ fi ; \
+ done
+- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
+- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
++ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
++ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
+
+-libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Crypto-libexec Zip-libexec
+-tests = Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Crypto-tests Zip-tests
++libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec
++tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
+ samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples
+
+ .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch b/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch
new file mode 100644
index 000000000000..2ec2067b318a
--- /dev/null
+++ b/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch
@@ -0,0 +1,197 @@
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile
+--- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100
+@@ -9,10 +9,10 @@
+ include $(POCO_BASE)/build/rules/global
+
+ SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS
++SYSLIBS += -lsqlite3
+
+ objects = Binder Extractor SessionImpl Connector \
+- SQLiteException SQLiteStatementImpl Utility \
+- sqlite3
++ SQLiteException SQLiteStatementImpl Utility
+
+ target = PocoSQLite
+ target_version = $(LIBVERSION)
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100
+@@ -38,7 +38,7 @@
+ #include "Poco/Data/SQLite/Utility.h"
+ #include "Poco/Data/BLOB.h"
+ #include "Poco/Exception.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <cstdlib>
+
+
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "Poco/Data/SQLite/Connector.h"
+ #include "Poco/Data/SQLite/SessionImpl.h"
+ #include "Poco/Data/SessionFactory.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100
+@@ -39,7 +39,7 @@
+ #include "Poco/Data/BLOB.h"
+ #include "Poco/Data/DataException.h"
+ #include "Poco/Exception.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <cstdlib>
+
+
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "Poco/Data/SQLite/SessionImpl.h"
+ #include "Poco/Data/SQLite/Utility.h"
+ #include "Poco/Data/SQLite/SQLiteStatementImpl.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ #include <cstdlib>
+
+
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100
+@@ -40,7 +40,7 @@
+ #include "Poco/String.h"
+ #include <cstdlib>
+ #include <cstring>
+-#include "sqlite3.h"
++#include <sqlite3.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp
+--- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100
+@@ -41,7 +41,7 @@
+ #include "Poco/NumberFormatter.h"
+ #include "Poco/String.h"
+ #include "Poco/Exception.h"
+-#include "sqlite3.h"
++#include <sqlite3.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h
+--- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100
+@@ -44,7 +44,7 @@
+ #include "Poco/BufferedStreamBuf.h"
+ #include <istream>
+ #include <ostream>
+-#include "Poco/zlib.h"
++#include <zlib.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h
+--- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100
+@@ -44,7 +44,7 @@
+ #include "Poco/BufferedStreamBuf.h"
+ #include <istream>
+ #include <ostream>
+-#include "Poco/zlib.h"
++#include <zlib.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile
+--- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100
+@@ -8,6 +8,8 @@
+
+ include $(POCO_BASE)/build/rules/global
+
++SYSLIBS += -lpcre -lz
++
+ objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \
+ BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
+ CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
+@@ -30,12 +32,7 @@
+ FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
+ UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
+ Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
+- FileStream Unicode UTF8String \
+- adler32 compress crc32 deflate gzio infback inffast inflate inftrees \
+- trees zutil \
+- pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \
+- pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \
+- pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass
++ FileStream Unicode UTF8String
+
+ ifeq ($(POCO_CONFIG),MinGW)
+ objects += EventLogChannel WindowsConsoleChannel
+diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp
+--- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100
+@@ -35,7 +35,7 @@
+
+
+ #include "Poco/Checksum.h"
+-#include "Poco/zlib.h"
++#include <zlib.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp
+--- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100
+@@ -37,7 +37,7 @@
+ #include "Poco/RegularExpression.h"
+ #include "Poco/Exception.h"
+ #include <sstream>
+-#include "pcre.h"
++#include <pcre.h>
+
+
+ namespace Poco {
+diff -Naur poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h
+--- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100
+@@ -40,7 +40,7 @@
+
+
+ #include "Poco/XML/XML.h"
+-#include "Poco/XML/expat.h"
++#include <expat.h>
+ #include "Poco/XML/XMLString.h"
+ #include "Poco/XML/XMLStream.h"
+ #include "Poco/SAX/Locator.h"
+diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile
+--- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100
++++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100
+@@ -8,7 +8,9 @@
+
+ include $(POCO_BASE)/build/rules/global
+
+-COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H
++COMMONFLAGS += -DXML_NS -DXML_DTD
++
++SYSLIBS += -lexpat
+
+ objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \
+ AttributesImpl CDATASection CharacterData ChildNodesList Comment \
+@@ -22,7 +24,7 @@
+ NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \
+ ParserEngine ProcessingInstruction SAXException SAXParser Text \
+ TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \
+- XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok
++ XMLString XMLWriter NodeAppender
+
+ target = PocoXML
+ target_version = $(LIBVERSION)