kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bring up to date with Poco 1.3.5, make some of the modules more configurable.

Browse source
This commit is contained in:
Eric Schnoebelen 2009-11-03 00:19:28 +00:00 committed by Thomas Klausner
parent a05d58e06f
commit 45601f9cd6
10 changed files with 153 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
poco/Makefile
View file

@ -1,14 +1,15 @@
# $NetBSD: Makefile,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
# $NetBSD: Makefile,v 1.2 2009/11/03 00:19:28 schnoebe Exp $
#
DISTNAME= poco-1.3.3p1-all
PKGNAME= poco-1.3.3p1
DISTNAME= poco-1.3.5-all
PKGNAME= poco-1.3.5
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.pocoproject.org/
COMMENT= POCO C++ libraries
# LICENSE= boost
PKG_DESTDIR_SUPPORT= user-destdir

105
poco/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:06 thomasklausner Exp $
@comment $NetBSD: PLIST,v 1.3 2009/11/03 00:19:28 schnoebe Exp $
include/Poco/ASCIIEncoding.h
include/Poco/AbstractCache.h
include/Poco/AbstractDelegate.h
@ -19,6 +19,7 @@ include/Poco/Activity.h
include/Poco/Any.h
include/Poco/ArchiveStrategy.h
include/Poco/AsyncChannel.h
include/Poco/AtomicCounter.h
include/Poco/AutoPtr.h
include/Poco/AutoReleasePool.h
include/Poco/Base64Decoder.h
@ -50,10 +51,12 @@ include/Poco/Crypto/CipherKeyImpl.h
include/Poco/Crypto/Crypto.h
include/Poco/Crypto/CryptoStream.h
include/Poco/Crypto/CryptoTransform.h
include/Poco/Crypto/OpenSSLInitializer.h
include/Poco/Crypto/RSACipherImpl.h
include/Poco/Crypto/RSADigestEngine.h
include/Poco/Crypto/RSAKey.h
include/Poco/Crypto/RSAKeyImpl.h
include/Poco/Crypto/X509Certificate.h
include/Poco/DOM/AbstractContainerNode.h
include/Poco/DOM/AbstractNode.h
include/Poco/DOM/Attr.h
@ -95,72 +98,6 @@ include/Poco/DOM/Notation.h
include/Poco/DOM/ProcessingInstruction.h
include/Poco/DOM/Text.h
include/Poco/DOM/TreeWalker.h
include/Poco/Data/AbstractBinder.h
include/Poco/Data/AbstractBinding.h
include/Poco/Data/AbstractExtraction.h
include/Poco/Data/AbstractExtractor.h
include/Poco/Data/AbstractPreparation.h
include/Poco/Data/AbstractPrepare.h
include/Poco/Data/AbstractSessionImpl.h
include/Poco/Data/BLOB.h
include/Poco/Data/BLOBStream.h
include/Poco/Data/Binding.h
include/Poco/Data/Column.h
include/Poco/Data/Common.h
include/Poco/Data/Connector.h
include/Poco/Data/Data.h
include/Poco/Data/DataException.h
include/Poco/Data/Extraction.h
include/Poco/Data/Limit.h
include/Poco/Data/MetaColumn.h
include/Poco/Data/MySQL/Binder.h
include/Poco/Data/MySQL/Connector.h
include/Poco/Data/MySQL/Extractor.h
include/Poco/Data/MySQL/MySQL.h
include/Poco/Data/MySQL/MySQLException.h
include/Poco/Data/MySQL/MySQLStatementImpl.h
include/Poco/Data/MySQL/ResultMetadata.h
include/Poco/Data/MySQL/SessionHandle.h
include/Poco/Data/MySQL/SessionImpl.h
include/Poco/Data/MySQL/StatementExecutor.h
include/Poco/Data/ODBC/Binder.h
include/Poco/Data/ODBC/ConnectionHandle.h
include/Poco/Data/ODBC/Connector.h
include/Poco/Data/ODBC/DataTypes.h
include/Poco/Data/ODBC/Diagnostics.h
include/Poco/Data/ODBC/EnvironmentHandle.h
include/Poco/Data/ODBC/Error.h
include/Poco/Data/ODBC/Extractor.h
include/Poco/Data/ODBC/Handle.h
include/Poco/Data/ODBC/ODBC.h
include/Poco/Data/ODBC/ODBCColumn.h
include/Poco/Data/ODBC/ODBCException.h
include/Poco/Data/ODBC/ODBCStatementImpl.h
include/Poco/Data/ODBC/Parameter.h
include/Poco/Data/ODBC/Preparation.h
include/Poco/Data/ODBC/SessionImpl.h
include/Poco/Data/ODBC/Utility.h
include/Poco/Data/PooledSessionHolder.h
include/Poco/Data/PooledSessionImpl.h
include/Poco/Data/Prepare.h
include/Poco/Data/Range.h
include/Poco/Data/RecordSet.h
include/Poco/Data/SQLite/Binder.h
include/Poco/Data/SQLite/Connector.h
include/Poco/Data/SQLite/Extractor.h
include/Poco/Data/SQLite/SQLite.h
include/Poco/Data/SQLite/SQLiteException.h
include/Poco/Data/SQLite/SQLiteStatementImpl.h
include/Poco/Data/SQLite/SessionImpl.h
include/Poco/Data/SQLite/Utility.h
include/Poco/Data/Session.h
include/Poco/Data/SessionFactory.h
include/Poco/Data/SessionImpl.h
include/Poco/Data/SessionPool.h
include/Poco/Data/Statement.h
include/Poco/Data/StatementCreator.h
include/Poco/Data/StatementImpl.h
include/Poco/Data/TypeHandler.h
include/Poco/DateTime.h
include/Poco/DateTimeFormat.h
include/Poco/DateTimeFormatter.h
@ -358,7 +295,6 @@ include/Poco/Net/RemoteSyslogChannel.h
include/Poco/Net/RemoteSyslogListener.h
include/Poco/Net/SMTPClientSession.h
include/Poco/Net/SSLException.h
include/Poco/Net/SSLInitializer.h
include/Poco/Net/SSLManager.h
include/Poco/Net/SecureServerSocket.h
include/Poco/Net/SecureServerSocketImpl.h
@ -418,6 +354,7 @@ include/Poco/Poco.h
include/Poco/PriorityDelegate.h
include/Poco/PriorityEvent.h
include/Poco/PriorityExpire.h
include/Poco/PriorityNotificationQueue.h
include/Poco/Process.h
include/Poco/Process_UNIX.h
include/Poco/Process_VMS.h
@ -501,6 +438,7 @@ include/Poco/ThreadPool.h
include/Poco/ThreadTarget.h
include/Poco/Thread_POSIX.h
include/Poco/Thread_WIN32.h
include/Poco/TimedNotificationQueue.h
include/Poco/Timer.h
include/Poco/Timespan.h
include/Poco/Timestamp.h
@ -549,6 +487,9 @@ include/Poco/Util/RegExpValidator.h
include/Poco/Util/ServerApplication.h
include/Poco/Util/Subsystem.h
include/Poco/Util/SystemConfiguration.h
include/Poco/Util/Timer.h
include/Poco/Util/TimerTask.h
include/Poco/Util/TimerTaskAdapter.h
include/Poco/Util/Util.h
include/Poco/Util/Validator.h
include/Poco/Util/WinRegistryConfiguration.h
@ -596,30 +537,30 @@ include/Poco/Zip/ZipUtil.h
include/Poco/zconf.h
include/Poco/zlib.h
lib/libPocoCrypto.so
lib/libPocoCrypto.so.6
lib/libPocoCrypto.so.8
lib/libPocoCryptod.so
lib/libPocoCryptod.so.6
lib/libPocoCryptod.so.8
lib/libPocoFoundation.so
lib/libPocoFoundation.so.6
lib/libPocoFoundation.so.8
lib/libPocoFoundationd.so
lib/libPocoFoundationd.so.6
lib/libPocoFoundationd.so.8
lib/libPocoNet.so
lib/libPocoNet.so.6
lib/libPocoNet.so.8
lib/libPocoNetSSL.so
lib/libPocoNetSSL.so.6
lib/libPocoNetSSL.so.8
lib/libPocoNetSSLd.so
lib/libPocoNetSSLd.so.6
lib/libPocoNetSSLd.so.8
lib/libPocoNetd.so
lib/libPocoNetd.so.6
lib/libPocoNetd.so.8
lib/libPocoUtil.so
lib/libPocoUtil.so.6
lib/libPocoUtil.so.8
lib/libPocoUtild.so
lib/libPocoUtild.so.6
lib/libPocoUtild.so.8
lib/libPocoXML.so
lib/libPocoXML.so.6
lib/libPocoXML.so.8
lib/libPocoXMLd.so
lib/libPocoXMLd.so.6
lib/libPocoXMLd.so.8
lib/libPocoZip.so
lib/libPocoZip.so.6
lib/libPocoZip.so.8
lib/libPocoZipd.so
lib/libPocoZipd.so.6
lib/libPocoZipd.so.8

4
poco/buildlink3.mk
View file

@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:51 jsonn Exp $
# $NetBSD: buildlink3.mk,v 1.3 2009/11/03 00:19:28 schnoebe Exp $
BUILDLINK_TREE+= poco
.if !defined(POCO_BUILDLINK3_MK)
POCO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.poco+= poco>=1.3.3p1
BUILDLINK_API_DEPENDS.poco+= poco>=1.3.5
BUILDLINK_PKGSRCDIR.poco?= ../../wip/poco
.include "../../security/openssl/buildlink3.mk"

17
poco/distinfo
View file

@ -1,10 +1,13 @@
$NetBSD: distinfo,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
$NetBSD: distinfo,v 1.2 2009/11/03 00:19:28 schnoebe Exp $
SHA1 (poco-1.3.3p1-all.tar.gz) = 3301863d887d9f4cf2ea05313fa198b7aedc64a3
RMD160 (poco-1.3.3p1-all.tar.gz) = ea3d21644014763498a2b113e4f6c06bcd891e3d
Size (poco-1.3.3p1-all.tar.gz) = 2604884 bytes
SHA1 (poco-1.3.5-all.tar.gz) = c1a7e144286445d9e76f283fd16e4ab357950707
RMD160 (poco-1.3.5-all.tar.gz) = 39970fd38ec31007ef746e3c1d0f8b30620bbb7c
Size (poco-1.3.5-all.tar.gz) = 2934920 bytes
SHA1 (patch-aa) = cc45ce4f9b4c436480118add580ec128a9fe0777
SHA1 (patch-ab) = 08b95cfdce9a91119f26bacfacc32894de01bf11
SHA1 (patch-ac) = 8aca5d55d04edcbf8f06cf7a1c82be1a26eac166
SHA1 (patch-ab) = f4f3f7f1c6628ad5d6e77e836f6eaa1f9e97bcbd
SHA1 (patch-ac) = 7e0009dc20e4f2591b1fb3dd13e2f1fa607069fd
SHA1 (patch-ad) = 1e748455375209135f94f0e5b153b6f2ef246e60
SHA1 (patch-ae) = 3a704f0aaa7adeaece52a63685adfa26db8c5fff
SHA1 (patch-ae) = 3537d14d8d2955f1d9320967d2605ccbda20dc7c
SHA1 (patch-af) = e98622ea895a8ea714a7289b7d5785bcd0202809
SHA1 (patch-ag) = f405cec78d54e8de2fb5a6c7af7d4af010003716
SHA1 (patch-ah) = 883125e6d613c8f42463b200eab729e2c15f7070

6
poco/patches/patch-ab
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ab,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
$NetBSD: patch-ab,v 1.2 2009/11/03 00:19:28 schnoebe Exp $
--- Foundation/src/NamedEvent_UNIX.cpp.orig 2008-10-09 18:14:00.000000000 +0200
+++ Foundation/src/NamedEvent_UNIX.cpp
@ -6,8 +6,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
unsigned short int* array;
struct seminfo* __buf;
};
-#elif defined(hpux)
+#elif defined(hpux) || defined(__NetBSD__)
-#elif defined(__hpux)
+#elif defined(__hpux) || defined(__NetBSD__)
union semun
{
int val;

6
poco/patches/patch-ac
View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
$NetBSD: patch-ac,v 1.2 2009/11/03 00:19:28 schnoebe Exp $
--- Foundation/src/NamedMutex_UNIX.cpp.orig 2008-10-09 18:14:00.000000000 +0200
+++ Foundation/src/NamedMutex_UNIX.cpp
@ -6,8 +6,8 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
unsigned short int* array;
struct seminfo* __buf;
};
-#elif defined(hpux)
+#elif defined(hpux) || defined(__NetBSD__)
-#elif defined(__hpux)
+#elif defined(__hpux) || defined(__NetBSD__)
union semun
{
int val;

18
poco/patches/patch-ae
View file

@ -1,13 +1,23 @@
$NetBSD: patch-ae,v 1.1.1.1 2009/01/10 16:05:32 tnn2 Exp $
$NetBSD: patch-ae,v 1.2 2009/11/03 00:19:28 schnoebe Exp $
--- build/config/FreeBSD.orig 2008-10-09 18:14:00.000000000 +0200
--- build/config/FreeBSD.orig 2009-05-12 13:22:09.000000000 -0500
+++ build/config/FreeBSD
@@ -20,7 +20,7 @@ CXX = g++
@@ -20,7 +20,8 @@ CXX = g++
LINK = $(CXX)
LIB = ar -cr
RANLIB = ranlib
-SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIB = $(CXX) -Wl,-R$(PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@
+SHLIBFLAGS = -L$(POCO_PREFIX)/lib -Wl,-R$(POCO_PREFIX)/lib
+SHLIB = $(CXX) -Wl,-R$(POCO_PREFIX)/lib -shared -Wl,-soname,$(notdir $@) -o $@
SHLIBLN = $(POCO_BASE)/build/script/shlibln
DEP = $(POCO_BASE)/build/script/makedepend.gcc
STRIP = strip
@@ -52,7 +53,7 @@ STATICOPT_CXX =
STATICOPT_LINK = -static
SHAREDOPT_CC = -fPIC
SHAREDOPT_CXX = -fPIC
-SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH)
+SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) -L$(POCO_PREFIX)/lib
DEBUGOPT_CC = -g -D_DEBUG
DEBUGOPT_CXX = -g -D_DEBUG
DEBUGOPT_LINK = -g

64
poco/patches/patch-af Normal file
View file

@ -0,0 +1,64 @@
$NetBSD: patch-af,v 1.1 2009/11/03 00:19:28 schnoebe Exp $
--- configure.orig 2009-05-12 13:22:09.000000000 -0500
+++ configure
@@ -184,38 +184,40 @@ if [ "$base" != "$build" ] ; then
cp $base/Makefile $build
fi
-# create config.make
-echo '# config.make generated by configure script' >$build/config.make
-echo "POCO_CONFIG = $config" >>$build/config.make
-echo "POCO_BASE = $base" >>$build/config.make
-echo "POCO_BUILD = $build" >>$build/config.make
-echo "POCO_PREFIX = $prefix" >>$build/config.make
-echo "POCO_FLAGS = $flags" >>$build/config.make
-echo "OMIT = $omit" >>$build/config.make
+# create config.build
+echo '# config.build generated by configure script' >$build/config.build
+echo "POCO_CONFIG = $config" >>$build/config.build
+echo "POCO_BASE = $base" >>$build/config.build
+echo "POCO_BUILD = $build" >>$build/config.build
+echo "POCO_PREFIX = $prefix" >>$build/config.build
+echo "POCO_FLAGS = $flags" >>$build/config.build
+echo "OMIT = $omit" >>$build/config.build
if [ "$stdcxx_base" != "" ] ; then
- echo "STDCXX_BASE = $stdcxx_base" >>$build/config.make
+ echo "STDCXX_BASE = $stdcxx_base" >>$build/config.build
fi
if [ "$includepath" != "" ] ; then
- echo "POCO_ADD_INCLUDE = $includepath" >>$build/config.make
+ echo "POCO_ADD_INCLUDE = $includepath" >>$build/config.build
fi
if [ "$librarypath" != "" ] ; then
- echo "POCO_ADD_LIBRARY = $librarypath" >>$build/config.make
+ echo "POCO_ADD_LIBRARY = $librarypath" >>$build/config.build
fi
-echo "export POCO_CONFIG" >>$build/config.make
-echo "export POCO_BASE" >>$build/config.make
-echo "export POCO_BUILD" >>$build/config.make
-echo "export POCO_PREFIX" >>$build/config.make
-echo "export POCO_FLAGS" >>$build/config.make
+echo "export POCO_CONFIG" >>$build/config.build
+echo "export POCO_BASE" >>$build/config.build
+echo "export POCO_BUILD" >>$build/config.build
+echo "export POCO_PREFIX" >>$build/config.build
+echo "export POCO_FLAGS" >>$build/config.build
if [ "$stdcxx_base" != "" ] ; then
- echo "export STDCXX_BASE" >>$build/config.make
+ echo "export STDCXX_BASE" >>$build/config.build
fi
if [ "$includepath" != "" ] ; then
- echo "export POCO_ADD_INCLUDE" >>$build/config.make
+ echo "export POCO_ADD_INCLUDE" >>$build/config.build
fi
if [ "$librarypath" != "" ] ; then
- echo "export POCO_ADD_LIBRARY" >>$build/config.make
+ echo "export POCO_ADD_LIBRARY" >>$build/config.build
fi
+echo '# config.make generated by configure script' >$build/config.make
+echo 'sinclude config.build' >> $build/config.make
echo ".PHONY: poco" >>$build/config.make
echo "poco: libexecs $tests $samples" >>$build/config.make

15
poco/patches/patch-ag Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-ag,v 1.1 2009/11/03 00:19:28 schnoebe Exp $
--- Makefile.orig 2009-05-12 13:22:15.000000000 -0500
+++ Makefile
@@ -24,7 +24,9 @@ endif
all: libexecs tests samples
INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
-COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip
+Master_COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip
+
+COMPONENTS = $(filter-out $(foreach f,$(OMIT),$f%),$(Master_COMPONENTS))
cppunit:
$(MAKE) -C $(POCO_BASE)/CppUnit

15
poco/patches/patch-ah Normal file
View file

@ -0,0 +1,15 @@
$NetBSD: patch-ah,v 1.1 2009/11/03 00:19:28 schnoebe Exp $
--- Data/MySQL/Makefile.orig 2009-05-12 13:22:14.000000000 -0500
+++ Data/MySQL/Makefile
@@ -8,8 +8,8 @@
include $(POCO_BASE)/build/rules/global
-SYSLIBS += -L/usr/local/lib/mysql -L/usr/lib/mysql -L/usr/mysql/lib/mysql -L/usr/local/mysql/lib -lmysqlclient
-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
+SYSLIBS += -L@MYSQLLIBDIR@ -lmysqlclient
+INCLUDE += -I@MYSQLINCDIR@
SYSFLAGS += -DTHREADSAFE -DNO_TCL
objects = Binder Extractor SessionImpl Connector \