diff options
-rw-r--r-- | databases/poco-data-mysql/PLIST | 10 | ||||
-rw-r--r-- | databases/poco-data-odbc/PLIST | 10 | ||||
-rw-r--r-- | databases/poco-data-sqlite/PLIST | 10 | ||||
-rw-r--r-- | databases/poco-data/PLIST | 6 | ||||
-rw-r--r-- | devel/poco/Makefile.common | 5 | ||||
-rw-r--r-- | devel/poco/PLIST | 46 | ||||
-rw-r--r-- | devel/poco/distinfo | 12 | ||||
-rw-r--r-- | devel/poco/patches/patch-ad | 6 | ||||
-rw-r--r-- | devel/poco/patches/patch-af | 23 | ||||
-rw-r--r-- | doc/CHANGES-2011 | 7 |
10 files changed, 80 insertions, 55 deletions
diff --git a/databases/poco-data-mysql/PLIST b/databases/poco-data-mysql/PLIST index 801141adb51..10c3d46eca5 100644 --- a/databases/poco-data-mysql/PLIST +++ b/databases/poco-data-mysql/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 06:02:02 schnoebe Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ include/Poco/Data/MySQL/MySQLException.h include/Poco/Data/MySQL/Connector.h include/Poco/Data/MySQL/Binder.h @@ -9,7 +9,7 @@ include/Poco/Data/MySQL/MySQLStatementImpl.h include/Poco/Data/MySQL/SessionHandle.h include/Poco/Data/MySQL/SessionImpl.h include/Poco/Data/MySQL/StatementExecutor.h -lib/libPocoMySQLd.so.10 -lib/libPocoMySQL.so.10 -lib/libPocoMySQLd.so -lib/libPocoMySQL.so +lib/libPocoDataMySQLd.so.11 +lib/libPocoDataMySQL.so.11 +lib/libPocoDataMySQLd.so +lib/libPocoDataMySQL.so diff --git a/databases/poco-data-odbc/PLIST b/databases/poco-data-odbc/PLIST index 1f67977aff9..df234d00418 100644 --- a/databases/poco-data-odbc/PLIST +++ b/databases/poco-data-odbc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 06:02:52 schnoebe Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ include/Poco/Data/ODBC/Binder.h include/Poco/Data/ODBC/ConnectionHandle.h include/Poco/Data/ODBC/Connector.h @@ -16,7 +16,7 @@ include/Poco/Data/ODBC/Parameter.h include/Poco/Data/ODBC/Preparation.h include/Poco/Data/ODBC/SessionImpl.h include/Poco/Data/ODBC/Utility.h -lib/libPocoODBC.so -lib/libPocoODBC.so.10 -lib/libPocoODBCd.so -lib/libPocoODBCd.so.10 +lib/libPocoDataODBC.so +lib/libPocoDataODBC.so.11 +lib/libPocoDataODBCd.so +lib/libPocoDataODBCd.so.11 diff --git a/databases/poco-data-sqlite/PLIST b/databases/poco-data-sqlite/PLIST index 941e77e2099..cfe6b13fc38 100644 --- a/databases/poco-data-sqlite/PLIST +++ b/databases/poco-data-sqlite/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 06:01:15 schnoebe Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ include/Poco/Data/SQLite/SessionImpl.h include/Poco/Data/SQLite/Connector.h include/Poco/Data/SQLite/Binder.h @@ -7,7 +7,7 @@ include/Poco/Data/SQLite/Extractor.h include/Poco/Data/SQLite/Utility.h include/Poco/Data/SQLite/SQLite.h include/Poco/Data/SQLite/SQLiteStatementImpl.h -lib/libPocoSQLited.so.10 -lib/libPocoSQLite.so.10 -lib/libPocoSQLited.so -lib/libPocoSQLite.so +lib/libPocoDataSQLited.so.11 +lib/libPocoDataSQLite.so.11 +lib/libPocoDataSQLited.so +lib/libPocoDataSQLite.so diff --git a/databases/poco-data/PLIST b/databases/poco-data/PLIST index cda81196cd1..4dc67e42194 100644 --- a/databases/poco-data/PLIST +++ b/databases/poco-data/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 06:00:08 schnoebe Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ include/Poco/Data/AbstractPreparation.h include/Poco/Data/AbstractBinding.h include/Poco/Data/AbstractBinder.h @@ -30,7 +30,7 @@ include/Poco/Data/SessionPool.h include/Poco/Data/Statement.h include/Poco/Data/StatementImpl.h include/Poco/Data/TypeHandler.h -lib/libPocoDatad.so.10 -lib/libPocoData.so.10 +lib/libPocoDatad.so.11 +lib/libPocoData.so.11 lib/libPocoDatad.so lib/libPocoData.so diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common index ff039bbf721..0da2377fcd9 100644 --- a/devel/poco/Makefile.common +++ b/devel/poco/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2011/10/16 08:18:52 obache Exp $ +# $NetBSD: Makefile.common,v 1.5 2011/10/17 02:10:31 schnoebe Exp $ # # used by devel/poco/Makefile # used by databases/poco-data/Makefile @@ -6,7 +6,7 @@ # used by databases/poco-data-mysql/Makefile # used by databases/poco-data-odbc/Makefile -POCO_VERSION=1.4.0 +POCO_VERSION=1.4.2p1 DISTNAME= poco-${POCO_VERSION}-all MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=poco/} @@ -37,4 +37,5 @@ CONFIGURE_ARGS+= --config=FreeBSD .if ${OPSYS} == "NetBSD" # NetBSD doesn't have fenv.h. We should add one. CONFIGURE_ARGS+= --no-fpenvironment +CONFIGURE_ARGS+= --no-shaedmemory .endif diff --git a/devel/poco/PLIST b/devel/poco/PLIST index 5a8eaed6e09..009cbb748ed 100644 --- a/devel/poco/PLIST +++ b/devel/poco/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ +@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ bin/cpspc bin/cpspcd bin/f2cpsp @@ -42,7 +42,6 @@ include/Poco/Channel.h include/Poco/Checksum.h include/Poco/ClassLibrary.h include/Poco/ClassLoader.h -include/Poco/CompareFunctions.h include/Poco/Condition.h include/Poco/Config.h include/Poco/Configurable.h @@ -124,6 +123,7 @@ include/Poco/DynamicFactory.h include/Poco/Environment.h include/Poco/Environment_UNIX.h include/Poco/Environment_VMS.h +include/Poco/Environment_VX.h include/Poco/Environment_WIN32.h include/Poco/Environment_WIN32U.h include/Poco/Environment_WINCE.h @@ -132,6 +132,7 @@ include/Poco/Event.h include/Poco/EventArgs.h include/Poco/EventLogChannel.h include/Poco/Event_POSIX.h +include/Poco/Event_VX.h include/Poco/Event_WIN32.h include/Poco/Exception.h include/Poco/ExpirationDecorator.h @@ -155,6 +156,7 @@ include/Poco/FileStream_POSIX.h include/Poco/FileStream_WIN32.h include/Poco/File_UNIX.h include/Poco/File_VMS.h +include/Poco/File_VX.h include/Poco/File_WIN32.h include/Poco/File_WIN32U.h include/Poco/File_WINCE.h @@ -193,7 +195,6 @@ include/Poco/LogStream.h include/Poco/Logger.h include/Poco/LoggingFactory.h include/Poco/LoggingRegistry.h -include/Poco/MD2Engine.h include/Poco/MD4Engine.h include/Poco/MD5Engine.h include/Poco/Manifest.h @@ -204,15 +205,18 @@ include/Poco/MetaObject.h include/Poco/MetaProgramming.h include/Poco/Mutex.h include/Poco/Mutex_POSIX.h +include/Poco/Mutex_VX.h include/Poco/Mutex_WIN32.h include/Poco/Mutex_WINCE.h include/Poco/NObserver.h include/Poco/NamedEvent.h +include/Poco/NamedEvent_Android.h include/Poco/NamedEvent_UNIX.h include/Poco/NamedEvent_VMS.h include/Poco/NamedEvent_WIN32.h include/Poco/NamedEvent_WIN32U.h include/Poco/NamedMutex.h +include/Poco/NamedMutex_Android.h include/Poco/NamedMutex_UNIX.h include/Poco/NamedMutex_VMS.h include/Poco/NamedMutex_WIN32.h @@ -363,21 +367,26 @@ include/Poco/PipeStream.h include/Poco/Platform.h include/Poco/Platform_POSIX.h include/Poco/Platform_VMS.h +include/Poco/Platform_VX.h include/Poco/Platform_WIN32.h include/Poco/Poco.h include/Poco/PriorityDelegate.h include/Poco/PriorityEvent.h include/Poco/PriorityExpire.h include/Poco/PriorityNotificationQueue.h +include/Poco/PriorityStrategy.h include/Poco/Process.h include/Poco/Process_UNIX.h include/Poco/Process_VMS.h +include/Poco/Process_VX.h include/Poco/Process_WIN32.h include/Poco/Process_WIN32U.h include/Poco/Process_WINCE.h include/Poco/PurgeStrategy.h include/Poco/RWLock.h +include/Poco/RWLock_Android.h include/Poco/RWLock_POSIX.h +include/Poco/RWLock_VX.h include/Poco/RWLock_WIN32.h include/Poco/RWLock_WINCE.h include/Poco/Random.h @@ -412,11 +421,13 @@ include/Poco/ScopedLock.h include/Poco/ScopedUnlock.h include/Poco/Semaphore.h include/Poco/Semaphore_POSIX.h +include/Poco/Semaphore_VX.h include/Poco/Semaphore_WIN32.h include/Poco/SharedLibrary.h include/Poco/SharedLibrary_HPUX.h include/Poco/SharedLibrary_UNIX.h include/Poco/SharedLibrary_VMS.h +include/Poco/SharedLibrary_VX.h include/Poco/SharedLibrary_WIN32.h include/Poco/SharedLibrary_WIN32U.h include/Poco/SharedMemory.h @@ -454,6 +465,7 @@ include/Poco/ThreadLocal.h include/Poco/ThreadPool.h include/Poco/ThreadTarget.h include/Poco/Thread_POSIX.h +include/Poco/Thread_VX.h include/Poco/Thread_WIN32.h include/Poco/Thread_WINCE.h include/Poco/TimedNotificationQueue.h @@ -557,30 +569,30 @@ include/Poco/Zip/ZipUtil.h include/Poco/zconf.h include/Poco/zlib.h lib/libPocoCrypto.so -lib/libPocoCrypto.so.10 +lib/libPocoCrypto.so.11 lib/libPocoCryptod.so -lib/libPocoCryptod.so.10 +lib/libPocoCryptod.so.11 lib/libPocoFoundation.so -lib/libPocoFoundation.so.10 +lib/libPocoFoundation.so.11 lib/libPocoFoundationd.so -lib/libPocoFoundationd.so.10 +lib/libPocoFoundationd.so.11 lib/libPocoNet.so -lib/libPocoNet.so.10 +lib/libPocoNet.so.11 lib/libPocoNetSSL.so -lib/libPocoNetSSL.so.10 +lib/libPocoNetSSL.so.11 lib/libPocoNetSSLd.so -lib/libPocoNetSSLd.so.10 +lib/libPocoNetSSLd.so.11 lib/libPocoNetd.so -lib/libPocoNetd.so.10 +lib/libPocoNetd.so.11 lib/libPocoUtil.so -lib/libPocoUtil.so.10 +lib/libPocoUtil.so.11 lib/libPocoUtild.so -lib/libPocoUtild.so.10 +lib/libPocoUtild.so.11 lib/libPocoXML.so -lib/libPocoXML.so.10 +lib/libPocoXML.so.11 lib/libPocoXMLd.so -lib/libPocoXMLd.so.10 +lib/libPocoXMLd.so.11 lib/libPocoZip.so -lib/libPocoZip.so.10 +lib/libPocoZip.so.11 lib/libPocoZipd.so -lib/libPocoZipd.so.10 +lib/libPocoZipd.so.11 diff --git a/devel/poco/distinfo b/devel/poco/distinfo index 993a07cc2da..09a32cb1900 100644 --- a/devel/poco/distinfo +++ b/devel/poco/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.3 2011/10/16 08:18:52 obache Exp $ +$NetBSD: distinfo,v 1.4 2011/10/17 02:10:31 schnoebe Exp $ -SHA1 (poco-1.4.0-all.tar.gz) = 6e7dbf895d76227047974ba7b3390d5452a0a7c7 -RMD160 (poco-1.4.0-all.tar.gz) = ee3ddbe0311b7aaca61046e964ef6550e52634d5 -Size (poco-1.4.0-all.tar.gz) = 3858463 bytes +SHA1 (poco-1.4.2p1-all.tar.gz) = ef1bc69812179b7856c88aa4b5c157747c0a0e48 +RMD160 (poco-1.4.2p1-all.tar.gz) = 8288c10e3e96de26f56296da0bbbebff58b8b424 +Size (poco-1.4.2p1-all.tar.gz) = 3922854 bytes SHA1 (patch-Foundation_include_Poco_Platform.h) = a7d81c20902af7e23ce8a10eb90fc1a98d7cc412 SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233 SHA1 (patch-ab) = 0709ba35fe938f7efc94650dde4afd84c427de0f SHA1 (patch-ac) = e3ee4b43e458f1ab1227aa029a00fcebf5f53541 -SHA1 (patch-ad) = cb9ec4df286227121f7f93a5695a18c1c1665317 +SHA1 (patch-ad) = f6eeb9dc9b3a85525f264edbd1587bc4f124b9e1 SHA1 (patch-ae) = a13a01901b3df6df7d5e5ad7a0639086b0897566 -SHA1 (patch-af) = 6d76f0b116e4b1f5333940737c9a9df80178441f +SHA1 (patch-af) = 50a86be83634ede278f7a8463423e2f88a1741a7 SHA1 (patch-ag) = 945a594376393462e1cc0f881532d2294adf5816 SHA1 (patch-ah) = f8debbf7b416fc562f5af321be739e0d4481a130 SHA1 (patch-ai) = 9feef00a05372578d957c68b53657e6468f65f6a diff --git a/devel/poco/patches/patch-ad b/devel/poco/patches/patch-ad index 7d1d2e682d0..4f92a408f9a 100644 --- a/devel/poco/patches/patch-ad +++ b/devel/poco/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ +$NetBSD: patch-ad,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ # comment out the atttempts at shared memory (at least for NetBSD) ---- Foundation/src/SharedMemory_POSIX.cpp.orig 2010-12-16 05:43:25.000000000 +0000 +--- Foundation/src/SharedMemory_POSIX.cpp.orig 2011-02-09 09:12:55.000000000 +0000 +++ Foundation/src/SharedMemory_POSIX.cpp @@ -69,7 +69,8 @@ SharedMemoryImpl::SharedMemoryImpl(const flags |= O_RDONLY; @@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ map(addrHint); @@ -148,7 +149,7 @@ void SharedMemoryImpl::close() } - if (!_fileMapped && !_server) + if (!_fileMapped && _server) { - ::shm_unlink(_name.c_str()); + //::shm_unlink(_name.c_str()); diff --git a/devel/poco/patches/patch-af b/devel/poco/patches/patch-af index d1b1fef2a96..a0bba2f6f0e 100644 --- a/devel/poco/patches/patch-af +++ b/devel/poco/patches/patch-af @@ -1,11 +1,11 @@ -$NetBSD: patch-af,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ +$NetBSD: patch-af,v 1.2 2011/10/17 02:10:31 schnoebe Exp $ # place the configuration into the file where the build system expects it ---- configure.orig 2010-01-15 12:13:34.000000000 +0000 +--- configure.orig 2011-02-09 09:12:55.000000000 +0000 +++ configure -@@ -194,45 +194,47 @@ if [ "$base" != "$build" ] ; then - cp $base/Makefile $build +@@ -250,50 +250,52 @@ else + linkmode="" fi -# create config.make @@ -17,7 +17,7 @@ $NetBSD: patch-af,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ -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 '# config.build generated by configure script' >$build/config.make +echo "POCO_CONFIG = $config" >>$build/config.build +echo "POCO_BASE = $base" >>$build/config.build +echo "POCO_BUILD = $build" >>$build/config.build @@ -40,6 +40,10 @@ $NetBSD: patch-af,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ - echo "POCO_UNBUNDLED = 1" >>$build/config.make + echo "POCO_UNBUNDLED = 1" >>$build/config.build fi + if [ "$linkmode" != "" ] ; then +- echo "LINKMODE = $linkmode" >>$build/config.make ++ echo "LINKMODE = $linkmode" >>$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 @@ -63,10 +67,13 @@ $NetBSD: patch-af,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $ + echo "export POCO_ADD_LIBRARY" >>$build/config.build fi if [ "$unbundled" != "" ] ; then -- echo "export POCO_UNBUNDLED " >>$build/config.make -+ echo "export POCO_UNBUNDLED " >>$build/config.build +- echo "export POCO_UNBUNDLED" >>$build/config.make ++ echo "export POCO_UNBUNDLED" >>$build/config.build + fi + if [ "$linkmode" != "" ] ; then +- echo "export LINKMODE" >>$build/config.make ++ echo "export LINKMODE" >>$build/config.build fi - -echo ".PHONY: poco" >>$build/config.make +echo '# config.make generated by configure script' > $build/config.make +echo 'sinclude config.build' >> $build/config.make diff --git a/doc/CHANGES-2011 b/doc/CHANGES-2011 index 72dff372f71..afd2e8e82eb 100644 --- a/doc/CHANGES-2011 +++ b/doc/CHANGES-2011 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2011,v 1.2544 2011/10/17 01:44:13 obache Exp $ +$NetBSD: CHANGES-2011,v 1.2545 2011/10/17 02:10:31 schnoebe Exp $ Changes to the packages collection and infrastructure in 2011: @@ -4046,3 +4046,8 @@ Changes to the packages collection and infrastructure in 2011: Updated x11/xextproto to 7.2.0 [cheusov 2011-10-16] Updated graphics/vigra to 1.8.0 [adam 2011-10-16] Updated www/ruby-httpclient to 2.2.2 [obache 2011-10-17] + Updated devel/poco to 1.4.2p1 [schnoebelen 2011-10-17] + Updated databases/poco-data to 1.4.2p1 [schnoebelen 2011-10-17] + Updated databases/poco-data-sqlite to 1.4.2p1 [schnoebelen 2011-10-17] + Updated databases/poco-data-mysql to 1.4.2p1 [schnoebelen 2011-10-17] + Updated databases/poco-data-odbc to 1.4.2p1 [schnoebelen 2011-10-17] |