6 files changed, 206 insertions, 24 deletions

diff --git a/devel/poco-ssl/Makefile b/devel/poco-ssl/Makefile
index c1170dc93950..ca4744a1c90a 100644
--- a/devel/poco-ssl/Makefile
+++ b/devel/poco-ssl/Makefile
@@ -7,18 +7,23 @@
 #
 
 PORTNAME=	poco
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.6
 CATEGORIES=	devel net
 MASTER_SITES=	SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	-ssl
-DISTNAME=	poco-${PORTVERSION}-ssl
+DISTNAME=	poco-${PORTVERSION}-all
 
 MAINTAINER=	wes@FreeBSD.org
 COMMENT=	C++ Portable Components library with NetSSL library
+CONFLICTS=	poco-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 
+USE_MYSQL=	yes
+USE_SQLITE=	yes
+LIB_DEPENDS=	odbc:${PORTSDIR}/databases/unixODBC
+
 .include <bsd.port.mk>
diff --git a/devel/poco-ssl/distinfo b/devel/poco-ssl/distinfo
index 2b991d2d85da..d14dddd6290c 100644
--- a/devel/poco-ssl/distinfo
+++ b/devel/poco-ssl/distinfo
@@ -1,3 +1,3 @@
-MD5 (poco-1.3.2-ssl.tar.bz2) = 109651aff48d93994282ee667e77088f
-SHA256 (poco-1.3.2-ssl.tar.bz2) = 238f9d89163c89cd9242871c9a218226468b717d11c3fb87b27e255b45f0a505
-SIZE (poco-1.3.2-ssl.tar.bz2) = 1051615
+MD5 (poco-1.3.6-all.tar.bz2) = c8ad7aacf9470da0181bbcca3eb7aff0
+SHA256 (poco-1.3.6-all.tar.bz2) = 6f45d4e0cea23cd7c2e90fd74d14c51c9d38f489541947b7a0048d56c98218d4
+SIZE (poco-1.3.6-all.tar.bz2) = 2320273
diff --git a/devel/poco-ssl/files/patch-Data-ODBC-Makefile.in b/devel/poco-ssl/files/patch-Data-ODBC-Makefile.in
new file mode 100644
index 000000000000..3b1b8acc976a
--- /dev/null
+++ b/devel/poco-ssl/files/patch-Data-ODBC-Makefile.in
@@ -0,0 +1,11 @@
+--- Data/ODBC/Makefile.orig	2009-12-05 19:57:41.000000000 -0800
++++ Data/ODBC/Makefile	2009-12-05 19:57:50.000000000 -0800
+@@ -9,7 +9,7 @@
+ include $(POCO_BASE)/build/rules/global
+ 
+ # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
+-ODBCLIBDIR = /usr/lib
++ODBCLIBDIR = /usr/local/lib
+ 
+ INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
+ SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
diff --git a/devel/poco-ssl/files/patch-Data-ODBC-testsuite-Makefile.in b/devel/poco-ssl/files/patch-Data-ODBC-testsuite-Makefile.in
new file mode 100644
index 000000000000..d196ea2cf9d4
--- /dev/null
+++ b/devel/poco-ssl/files/patch-Data-ODBC-testsuite-Makefile.in
@@ -0,0 +1,11 @@
+--- Data/ODBC/testsuite/Makefile.orig	2009-12-05 20:50:45.000000000 -0800
++++ Data/ODBC/testsuite/Makefile	2009-12-05 20:50:54.000000000 -0800
+@@ -9,7 +9,7 @@
+ include $(POCO_BASE)/build/rules/global
+ 
+ # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
+-ODBCLIBDIR = /usr/lib
++ODBCLIBDIR = /usr/local/lib
+ 
+ INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
+ SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
diff --git a/devel/poco-ssl/pkg-descr b/devel/poco-ssl/pkg-descr
index 986d7cef3151..4526481e99ce 100644
--- a/devel/poco-ssl/pkg-descr
+++ b/devel/poco-ssl/pkg-descr
@@ -4,14 +4,18 @@ The Foundation library contains a platform abstraction layer
 (including classes for multithreading, file system access, logging,
 etc.), as well as a large number of useful utility classes, such
 various stream buffer and stream classes, URI handling, and many
-more.
+more.  The remaining libraries include:
 
-The XML library contains an XML parser with SAX2 and DOM interfaces,
-as well as an XMLWriter.
+ o Crypto - Encrypt/decrypt data or I/O streams
+ o Data - database access ODBC, SQLite, MySQL client
+ o Net - network classes (sockets, HTTP, etc.)
+ o NetSSL - SSL/TLS protocol sockets based on OpenSSL
+ o PageCompiler - C++ Server Page Compiler, for dynamic HTML in C++ apps
+ o XML - parser with SAX2 and DOM interfaces and an XMLWriter
+ o Util - config files and command line arguments, various utility classes
+ o Zip classes for (de)compressing data or I/O streams
 
-The Util library contains classes for working with configuration
-files and command line arguments, as well as various utility classes.
+This is now known as the '-all' distribution by the Poco project,
+but the FreeBSD port remains named -ssl for hysterical raisins.
 
-The Net library contains network classes (sockets, HTTP, etc.)
-
-WWW: http://poco.appinf.com/
+WWW: http://pocoproject.org
diff --git a/devel/poco-ssl/pkg-plist b/devel/poco-ssl/pkg-plist
index ba342698331d..65604e98663c 100644
--- a/devel/poco-ssl/pkg-plist
+++ b/devel/poco-ssl/pkg-plist
@@ -1,3 +1,5 @@
+bin/cpspc
+bin/cpspcd
 include/Poco/ASCIIEncoding.h
 include/Poco/AbstractCache.h
 include/Poco/AbstractDelegate.h
@@ -5,6 +7,10 @@ include/Poco/AbstractEvent.h
 include/Poco/AbstractObserver.h
 include/Poco/AbstractPriorityDelegate.h
 include/Poco/AbstractStrategy.h
+include/Poco/AccessExpirationDecorator.h
+include/Poco/AccessExpireCache.h
+include/Poco/AccessExpireLRUCache.h
+include/Poco/AccessExpireStrategy.h
 include/Poco/ActiveDispatcher.h
 include/Poco/ActiveMethod.h
 include/Poco/ActiveResult.h
@@ -14,6 +20,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
@@ -37,6 +44,20 @@ include/Poco/Config.h
 include/Poco/Configurable.h
 include/Poco/ConsoleChannel.h
 include/Poco/CountingStream.h
+include/Poco/Crypto/Cipher.h
+include/Poco/Crypto/CipherFactory.h
+include/Poco/Crypto/CipherImpl.h
+include/Poco/Crypto/CipherKey.h
+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
@@ -78,6 +99,72 @@ 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
@@ -135,6 +222,8 @@ include/Poco/Format.h
 include/Poco/Formatter.h
 include/Poco/FormattingChannel.h
 include/Poco/Foundation.h
+include/Poco/FunctionDelegate.h
+include/Poco/FunctionPriorityDelegate.h
 include/Poco/Glob.h
 include/Poco/HMACEngine.h
 include/Poco/Hash.h
@@ -169,6 +258,7 @@ include/Poco/MD4Engine.h
 include/Poco/MD5Engine.h
 include/Poco/Manifest.h
 include/Poco/MemoryPool.h
+include/Poco/MemoryStream.h
 include/Poco/Message.h
 include/Poco/MetaObject.h
 include/Poco/MetaProgramming.h
@@ -273,7 +363,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
@@ -333,6 +422,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
@@ -413,8 +503,10 @@ include/Poco/TextIterator.h
 include/Poco/Thread.h
 include/Poco/ThreadLocal.h
 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
@@ -435,6 +527,9 @@ include/Poco/UnWindows.h
 include/Poco/UnbufferedStreamBuf.h
 include/Poco/Unicode.h
 include/Poco/UnicodeConverter.h
+include/Poco/UniqueAccessExpireCache.h
+include/Poco/UniqueAccessExpireLRUCache.h
+include/Poco/UniqueAccessExpireStrategy.h
 include/Poco/UniqueExpireCache.h
 include/Poco/UniqueExpireLRUCache.h
 include/Poco/UniqueExpireStrategy.h
@@ -460,6 +555,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
@@ -481,31 +579,84 @@ include/Poco/XML/XMLString.h
 include/Poco/XML/XMLWriter.h
 include/Poco/XML/expat.h
 include/Poco/XML/expat_external.h
+include/Poco/Zip/Add.h
+include/Poco/Zip/AutoDetectStream.h
+include/Poco/Zip/Compress.h
+include/Poco/Zip/Decompress.h
+include/Poco/Zip/Delete.h
+include/Poco/Zip/Keep.h
+include/Poco/Zip/ParseCallback.h
+include/Poco/Zip/PartialStream.h
+include/Poco/Zip/Rename.h
+include/Poco/Zip/Replace.h
+include/Poco/Zip/SkipCallback.h
+include/Poco/Zip/Zip.h
+include/Poco/Zip/ZipArchive.h
+include/Poco/Zip/ZipArchiveInfo.h
+include/Poco/Zip/ZipCommon.h
+include/Poco/Zip/ZipDataInfo.h
+include/Poco/Zip/ZipException.h
+include/Poco/Zip/ZipFileInfo.h
+include/Poco/Zip/ZipLocalFileHeader.h
+include/Poco/Zip/ZipManipulator.h
+include/Poco/Zip/ZipOperation.h
+include/Poco/Zip/ZipStream.h
+include/Poco/Zip/ZipUtil.h
 include/Poco/zconf.h
 include/Poco/zlib.h
+lib/libPocoCrypto.so
+lib/libPocoCrypto.so.9
+lib/libPocoCryptod.so
+lib/libPocoCryptod.so.9
+lib/libPocoData.so
+lib/libPocoData.so.9
+lib/libPocoDatad.so
+lib/libPocoDatad.so.9
 lib/libPocoFoundation.so
-lib/libPocoFoundation.so.5
+lib/libPocoFoundation.so.9
 lib/libPocoFoundationd.so
-lib/libPocoFoundationd.so.5
+lib/libPocoFoundationd.so.9
+lib/libPocoMySQL.so
+lib/libPocoMySQL.so.9
+lib/libPocoMySQLd.so
+lib/libPocoMySQLd.so.9
 lib/libPocoNet.so
-lib/libPocoNet.so.5
+lib/libPocoNet.so.9
 lib/libPocoNetSSL.so
-lib/libPocoNetSSL.so.5
+lib/libPocoNetSSL.so.9
 lib/libPocoNetSSLd.so
-lib/libPocoNetSSLd.so.5
+lib/libPocoNetSSLd.so.9
 lib/libPocoNetd.so
-lib/libPocoNetd.so.5
+lib/libPocoNetd.so.9
+lib/libPocoODBC.so
+lib/libPocoODBC.so.9
+lib/libPocoODBCd.so
+lib/libPocoODBCd.so.9
+lib/libPocoSQLite.so
+lib/libPocoSQLite.so.9
+lib/libPocoSQLited.so
+lib/libPocoSQLited.so.9
 lib/libPocoUtil.so
-lib/libPocoUtil.so.5
+lib/libPocoUtil.so.9
 lib/libPocoUtild.so
-lib/libPocoUtild.so.5
+lib/libPocoUtild.so.9
 lib/libPocoXML.so
-lib/libPocoXML.so.5
+lib/libPocoXML.so.9
 lib/libPocoXMLd.so
-lib/libPocoXMLd.so.5
+lib/libPocoXMLd.so.9
+lib/libPocoZip.so
+lib/libPocoZip.so.9
+lib/libPocoZipd.so
+lib/libPocoZipd.so.9
 @dirrmtry include/Poco/DOM
 @dirrmtry include/Poco/Net
 @dirrmtry include/Poco/SAX
 @dirrmtry include/Poco/Util
 @dirrmtry include/Poco/XML
+@dirrmtry include/Poco/Crypto
+@dirrmtry include/Poco/Data/SQLite
+@dirrmtry include/Poco/Data/ODBC
+@dirrmtry include/Poco/Data/MySQL
+@dirrmtry include/Poco/Data
+@dirrmtry include/Poco/Zip
 @dirrmtry include/Poco