diff --git a/databases/poco-data-mysql/Makefile b/databases/poco-data-mysql/Makefile
index 8710b97c85816..96ec7515aaa55 100644
--- a/databases/poco-data-mysql/Makefile
+++ b/databases/poco-data-mysql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2014/02/12 23:17:40 tron Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/16 12:15:12 ryoon Exp $
 #
 
 PKGNAME=	poco-data-mysql-${POCO_VERSION}
-PKGREVISION=	3
 CATEGORIES=	databases
 
 COMMENT=	POCO C++ MySQL RDBMS Accessor libraries
diff --git a/databases/poco-data-mysql/PLIST b/databases/poco-data-mysql/PLIST
index 10c3d46eca5e8..971eeb8cd71a1 100644
--- a/databases/poco-data-mysql/PLIST
+++ b/databases/poco-data-mysql/PLIST
@@ -1,15 +1,14 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2016/01/16 12:15:12 ryoon Exp $
 include/Poco/Data/MySQL/Binder.h
-include/Poco/Data/MySQL/ResultMetadata.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
-lib/libPocoDataMySQLd.so.11
-lib/libPocoDataMySQL.so.11
-lib/libPocoDataMySQLd.so
+include/Poco/Data/MySQL/Utility.h
 lib/libPocoDataMySQL.so
+lib/libPocoDataMySQL.so.31
diff --git a/databases/poco-data-mysql/buildlink3.mk b/databases/poco-data-mysql/buildlink3.mk
index e6749ee013790..3eb522f006af2 100644
--- a/databases/poco-data-mysql/buildlink3.mk
+++ b/databases/poco-data-mysql/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/02/12 23:17:40 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2016/01/16 12:15:12 ryoon Exp $
 
 BUILDLINK_TREE+=	poco-data-mysql
 
 .if !defined(POCO_DATA_MYSQL_BUILDLINK3_MK)
 POCO_DATA_MYSQL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.poco-data-mysql+=	poco-data-mysql>=1.3.5
-BUILDLINK_ABI_DEPENDS.poco-data-mysql+=	poco-data-mysql>=1.4.2p1nb3
+BUILDLINK_API_DEPENDS.poco-data-mysql+=	poco-data-mysql>=1.6.1
+BUILDLINK_ABI_DEPENDS.poco-data-mysql+=	poco-data-mysql>=1.6.1
 BUILDLINK_PKGSRCDIR.poco-data-mysql?=	../../databases/poco-data-mysql
 
 .include "../../mk/mysql.buildlink3.mk"
diff --git a/databases/poco-data-odbc/Makefile b/databases/poco-data-odbc/Makefile
index 192188069dd49..b99318be7d652 100644
--- a/databases/poco-data-odbc/Makefile
+++ b/databases/poco-data-odbc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/04/26 11:52:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/16 12:15:12 ryoon Exp $
 #
 
 PKGNAME=	poco-data-odbc-${POCO_VERSION}
-PKGREVISION=	3
 CATEGORIES=	databases
 
 COMMENT=	POCO C++ ODBC RDBMS Accessor libraries
@@ -14,6 +13,8 @@ CONFIGURE_ARGS+=	--omit=Data/MySQL,Data/SQLite,Zip,XML
 CONFIGURE_ARGS+=	--omit=Foundation,Net,NetSSL_OpenSSL
 CONFIGURE_ARGS+=	--no-tests
 CONFIGURE_ARGS+=	--no-samples
+CONFIGURE_ARGS+=	--odbc-lib=${BUILDLINK_PREFIX.unixodbc}/lib
+CONFIGURE_ARGS+=	--odbc-include=${BUILDLINK_PREFIX.unixodbc}/include
 
 USE_TOOLS+=	pax
 
@@ -29,13 +30,6 @@ do-install:
 	cd ${WRKSRC}/Data/ODBC && \
 	    ${PAX} -rw -v -pp include ${DESTDIR}${PREFIX}
 
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	pkgsrc-izing paths
-SUBST_STAGE.paths=	post-patch
-SUBST_FILES.paths=	Data/ODBC/Makefile
-SUBST_SED.paths=    -e 's,@ODBCLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.unixodbc},g'
-SUBST_SED.paths+=   -e 's,@ODBCINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.unixodbc},g'
-
 # should make which odbc we use an option.. but.. :D
 .include "../../databases/unixodbc/buildlink3.mk"
 .include "../../databases/poco-data/buildlink3.mk"
diff --git a/databases/poco-data-odbc/PLIST b/databases/poco-data-odbc/PLIST
index df234d0041867..de5bf340a2f48 100644
--- a/databases/poco-data-odbc/PLIST
+++ b/databases/poco-data-odbc/PLIST
@@ -1,22 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/16 12:15:12 ryoon Exp $
 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/ODBCMetaColumn.h
 include/Poco/Data/ODBC/ODBCStatementImpl.h
 include/Poco/Data/ODBC/Parameter.h
-include/Poco/Data/ODBC/Preparation.h
+include/Poco/Data/ODBC/Preparator.h
 include/Poco/Data/ODBC/SessionImpl.h
+include/Poco/Data/ODBC/TypeInfo.h
+include/Poco/Data/ODBC/Unicode.h
+include/Poco/Data/ODBC/Unicode_UNIXODBC.h
+include/Poco/Data/ODBC/Unicode_WIN32.h
 include/Poco/Data/ODBC/Utility.h
 lib/libPocoDataODBC.so
-lib/libPocoDataODBC.so.11
-lib/libPocoDataODBCd.so
-lib/libPocoDataODBCd.so.11
+lib/libPocoDataODBC.so.31
diff --git a/databases/poco-data-sqlite/Makefile b/databases/poco-data-sqlite/Makefile
index 8a43efae0dccb..1362efac1c041 100644
--- a/databases/poco-data-sqlite/Makefile
+++ b/databases/poco-data-sqlite/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2015/10/10 01:57:51 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2016/01/16 12:15:12 ryoon Exp $
 #
 
 PKGNAME=	poco-data-sqlite-${POCO_VERSION}
-PKGREVISION=	11
 CATEGORIES=	databases
 
 COMMENT=	POCO C++ SQLite RDBMS Accessor libraries
diff --git a/databases/poco-data-sqlite/PLIST b/databases/poco-data-sqlite/PLIST
index cfe6b13fc386c..4217cdcc625f6 100644
--- a/databases/poco-data-sqlite/PLIST
+++ b/databases/poco-data-sqlite/PLIST
@@ -1,13 +1,12 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2016/01/16 12:15:12 ryoon Exp $
 include/Poco/Data/SQLite/Binder.h
-include/Poco/Data/SQLite/SQLiteException.h
+include/Poco/Data/SQLite/Connector.h
 include/Poco/Data/SQLite/Extractor.h
-include/Poco/Data/SQLite/Utility.h
+include/Poco/Data/SQLite/Notifier.h
 include/Poco/Data/SQLite/SQLite.h
+include/Poco/Data/SQLite/SQLiteException.h
 include/Poco/Data/SQLite/SQLiteStatementImpl.h
-lib/libPocoDataSQLited.so.11
-lib/libPocoDataSQLite.so.11
-lib/libPocoDataSQLited.so
+include/Poco/Data/SQLite/SessionImpl.h
+include/Poco/Data/SQLite/Utility.h
 lib/libPocoDataSQLite.so
+lib/libPocoDataSQLite.so.31
diff --git a/databases/poco-data-sqlite/buildlink3.mk b/databases/poco-data-sqlite/buildlink3.mk
index f73b2270416f1..c4c6dd82135e2 100644
--- a/databases/poco-data-sqlite/buildlink3.mk
+++ b/databases/poco-data-sqlite/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.13 2015/04/06 08:17:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2016/01/16 12:15:12 ryoon Exp $
 
 BUILDLINK_TREE+=	poco-data-sqlite
 
 .if !defined(POCO_DATA_SQLITE_BUILDLINK3_MK)
 POCO_DATA_SQLITE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.poco-data-sqlite+=	poco-data-sqlite>=1.3.5
-BUILDLINK_ABI_DEPENDS.poco-data-sqlite+=	poco-data-sqlite>=1.4.2p1nb10
+BUILDLINK_API_DEPENDS.poco-data-sqlite+=	poco-data-sqlite>=1.6.1
+BUILDLINK_ABI_DEPENDS.poco-data-sqlite+=	poco-data-sqlite>=1.6.1
 BUILDLINK_PKGSRCDIR.poco-data-sqlite?=	../../databases/poco-data-sqlite
 
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/databases/poco-data/Makefile b/databases/poco-data/Makefile
index 2092af33f5c8f..51cf5bdabc6b0 100644
--- a/databases/poco-data/Makefile
+++ b/databases/poco-data/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/02/12 23:17:40 tron Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/16 12:15:12 ryoon Exp $
 #
 
 PKGNAME=	poco-data-${POCO_VERSION}
-PKGREVISION=	2
 CATEGORIES=	databases
 
 COMMENT=	POCO C++ RDBMS Master Accessor libraries
diff --git a/databases/poco-data/PLIST b/databases/poco-data/PLIST
index 4dc67e4219477..c0a73fcfb6f40 100644
--- a/databases/poco-data/PLIST
+++ b/databases/poco-data/PLIST
@@ -1,36 +1,52 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $
-include/Poco/Data/AbstractPreparation.h
-include/Poco/Data/AbstractBinding.h
+@comment $NetBSD: PLIST,v 1.3 2016/01/16 12:15:12 ryoon Exp $
 include/Poco/Data/AbstractBinder.h
-include/Poco/Data/AbstractSessionImpl.h
+include/Poco/Data/AbstractBinding.h
 include/Poco/Data/AbstractExtraction.h
 include/Poco/Data/AbstractExtractor.h
-include/Poco/Data/PooledSessionHolder.h
-include/Poco/Data/AbstractPrepare.h
-include/Poco/Data/DataException.h
+include/Poco/Data/AbstractPreparation.h
+include/Poco/Data/AbstractPreparator.h
+include/Poco/Data/AbstractSessionImpl.h
+include/Poco/Data/ArchiveStrategy.h
+include/Poco/Data/AutoTransaction.h
 include/Poco/Data/Binding.h
-include/Poco/Data/BLOB.h
-include/Poco/Data/BLOBStream.h
+include/Poco/Data/Bulk.h
+include/Poco/Data/BulkBinding.h
+include/Poco/Data/BulkExtraction.h
 include/Poco/Data/Column.h
-include/Poco/Data/Common.h
 include/Poco/Data/Connector.h
+include/Poco/Data/Constants.h
 include/Poco/Data/Data.h
-include/Poco/Data/RecordSet.h
-include/Poco/Data/Range.h
+include/Poco/Data/DataException.h
+include/Poco/Data/Date.h
+include/Poco/Data/DynamicDateTime.h
+include/Poco/Data/DynamicLOB.h
 include/Poco/Data/Extraction.h
+include/Poco/Data/LOB.h
+include/Poco/Data/LOBStream.h
 include/Poco/Data/Limit.h
 include/Poco/Data/MetaColumn.h
+include/Poco/Data/PooledSessionHolder.h
 include/Poco/Data/PooledSessionImpl.h
-include/Poco/Data/Prepare.h
-include/Poco/Data/SessionFactory.h
+include/Poco/Data/Position.h
+include/Poco/Data/Preparation.h
+include/Poco/Data/Range.h
+include/Poco/Data/RecordSet.h
+include/Poco/Data/Row.h
+include/Poco/Data/RowFilter.h
+include/Poco/Data/RowFormatter.h
+include/Poco/Data/RowIterator.h
+include/Poco/Data/SQLChannel.h
 include/Poco/Data/Session.h
-include/Poco/Data/StatementCreator.h
+include/Poco/Data/SessionFactory.h
 include/Poco/Data/SessionImpl.h
 include/Poco/Data/SessionPool.h
+include/Poco/Data/SessionPoolContainer.h
+include/Poco/Data/SimpleRowFormatter.h
 include/Poco/Data/Statement.h
+include/Poco/Data/StatementCreator.h
 include/Poco/Data/StatementImpl.h
+include/Poco/Data/Time.h
+include/Poco/Data/Transaction.h
 include/Poco/Data/TypeHandler.h
-lib/libPocoDatad.so.11
-lib/libPocoData.so.11
-lib/libPocoDatad.so
 lib/libPocoData.so
+lib/libPocoData.so.31
diff --git a/databases/poco-data/buildlink3.mk b/databases/poco-data/buildlink3.mk
index 31e7f36768675..74e9db31bb238 100644
--- a/databases/poco-data/buildlink3.mk
+++ b/databases/poco-data/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.8 2014/02/12 23:17:40 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2016/01/16 12:15:12 ryoon Exp $
 
 BUILDLINK_TREE+=	poco-data
 
 .if !defined(POCO_DATA_BUILDLINK3_MK)
 POCO_DATA_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.poco-data+=	poco-data>=1.3.5
-BUILDLINK_ABI_DEPENDS.poco-data+=	poco-data>=1.4.2p1nb2
+BUILDLINK_API_DEPENDS.poco-data+=	poco-data>=1.6.1
+BUILDLINK_ABI_DEPENDS.poco-data+=	poco-data>=1.6.1
 BUILDLINK_PKGSRCDIR.poco-data?=	../../databases/poco-data
 
 .include "../../devel/poco/buildlink3.mk"
diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index 5bfd9edb6b482..b400728b2bc70 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/02/12 23:17:49 tron Exp $
+# $NetBSD: Makefile,v 1.11 2016/01/16 12:15:12 ryoon Exp $
 #
 
 PKGNAME=	poco-${POCO_VERSION}
-PKGREVISION=	4
 CATEGORIES=	devel
 
 COMMENT=	POCO C++ Foundation libraries
diff --git a/devel/poco/Makefile.common b/devel/poco/Makefile.common
index 4b8c0fc923d46..59ca11bb4d11d 100644
--- a/devel/poco/Makefile.common
+++ b/devel/poco/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2015/06/25 07:30:30 dholland Exp $
+# $NetBSD: Makefile.common,v 1.12 2016/01/16 12:15:12 ryoon Exp $
 #
 # used by devel/poco/Makefile
 # used by databases/poco-data/Makefile
@@ -6,10 +6,10 @@
 # used by databases/poco-data-mysql/Makefile
 # used by databases/poco-data-odbc/Makefile
 
-POCO_VERSION=1.4.2p1
+POCO_VERSION=1.6.1
 
 DISTNAME=	poco-${POCO_VERSION}-all
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=poco/}
+MASTER_SITES=	http://pocoproject.org/releases/poco-${POCO_VERSION}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pocoproject.org/
@@ -27,7 +27,10 @@ USE_TOOLS+=	gmake
 # error: unable to open output file '.../poco-1.4.2p1-all/Foundation/obj/NetBSD/amd64/debug_shared/Ascii.o'
 MAKE_JOBS_SAFE=	no
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --omit=Data
+# Fix Net/sample build at least.
+BUILDLINK_TRANSFORM+=	l:PocoUtil:PocoUtil:PocoJSON
+
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --omit=Data,MongoDB
 # don't use the bundled versions of SQLite, zlib, etc..
 CONFIGURE_ARGS+=	--unbundled
 
diff --git a/devel/poco/PLIST b/devel/poco/PLIST
index 009cbb748ed65..458508956ecd4 100644
--- a/devel/poco/PLIST
+++ b/devel/poco/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/17 02:10:31 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/01/16 12:15:12 ryoon Exp $
 bin/cpspc
-bin/cpspcd
 bin/f2cpsp
-bin/f2cpspd
 include/Poco/ASCIIEncoding.h
 include/Poco/AbstractCache.h
 include/Poco/AbstractDelegate.h
@@ -20,13 +18,17 @@ include/Poco/ActiveResult.h
 include/Poco/ActiveRunnable.h
 include/Poco/ActiveStarter.h
 include/Poco/Activity.h
+include/Poco/Alignment.h
 include/Poco/Any.h
 include/Poco/ArchiveStrategy.h
+include/Poco/Array.h
 include/Poco/Ascii.h
 include/Poco/AsyncChannel.h
 include/Poco/AtomicCounter.h
 include/Poco/AutoPtr.h
 include/Poco/AutoReleasePool.h
+include/Poco/Base32Decoder.h
+include/Poco/Base32Encoder.h
 include/Poco/Base64Decoder.h
 include/Poco/Base64Encoder.h
 include/Poco/BasicEvent.h
@@ -42,6 +44,7 @@ include/Poco/Channel.h
 include/Poco/Checksum.h
 include/Poco/ClassLibrary.h
 include/Poco/ClassLoader.h
+include/Poco/Clock.h
 include/Poco/Condition.h
 include/Poco/Config.h
 include/Poco/Configurable.h
@@ -55,6 +58,7 @@ include/Poco/Crypto/CipherKeyImpl.h
 include/Poco/Crypto/Crypto.h
 include/Poco/Crypto/CryptoStream.h
 include/Poco/Crypto/CryptoTransform.h
+include/Poco/Crypto/DigestEngine.h
 include/Poco/Crypto/OpenSSLInitializer.h
 include/Poco/Crypto/RSACipherImpl.h
 include/Poco/Crypto/RSADigestEngine.h
@@ -113,13 +117,21 @@ include/Poco/Delegate.h
 include/Poco/DigestEngine.h
 include/Poco/DigestStream.h
 include/Poco/DirectoryIterator.h
+include/Poco/DirectoryIteratorStrategy.h
 include/Poco/DirectoryIterator_UNIX.h
 include/Poco/DirectoryIterator_VMS.h
 include/Poco/DirectoryIterator_WIN32.h
 include/Poco/DirectoryIterator_WIN32U.h
+include/Poco/DirectoryWatcher.h
+include/Poco/Dynamic/Pair.h
+include/Poco/Dynamic/Struct.h
+include/Poco/Dynamic/Var.h
+include/Poco/Dynamic/VarHolder.h
+include/Poco/Dynamic/VarIterator.h
 include/Poco/DynamicAny.h
 include/Poco/DynamicAnyHolder.h
 include/Poco/DynamicFactory.h
+include/Poco/DynamicStruct.h
 include/Poco/Environment.h
 include/Poco/Environment_UNIX.h
 include/Poco/Environment_VMS.h
@@ -127,6 +139,7 @@ include/Poco/Environment_VX.h
 include/Poco/Environment_WIN32.h
 include/Poco/Environment_WIN32U.h
 include/Poco/Environment_WINCE.h
+include/Poco/Error.h
 include/Poco/ErrorHandler.h
 include/Poco/Event.h
 include/Poco/EventArgs.h
@@ -140,6 +153,8 @@ include/Poco/Expire.h
 include/Poco/ExpireCache.h
 include/Poco/ExpireLRUCache.h
 include/Poco/ExpireStrategy.h
+include/Poco/FIFOBuffer.h
+include/Poco/FIFOBufferStream.h
 include/Poco/FIFOEvent.h
 include/Poco/FIFOStrategy.h
 include/Poco/FPEnvironment.h
@@ -178,13 +193,27 @@ include/Poco/HexBinaryDecoder.h
 include/Poco/HexBinaryEncoder.h
 include/Poco/InflatingStream.h
 include/Poco/Instantiator.h
+include/Poco/JSON/Array.h
+include/Poco/JSON/Handler.h
+include/Poco/JSON/JSON.h
+include/Poco/JSON/JSONException.h
+include/Poco/JSON/Object.h
+include/Poco/JSON/ParseHandler.h
+include/Poco/JSON/Parser.h
+include/Poco/JSON/PrintHandler.h
+include/Poco/JSON/Query.h
+include/Poco/JSON/Stringifier.h
+include/Poco/JSON/Template.h
+include/Poco/JSON/TemplateCache.h
 include/Poco/KeyValueArgs.h
 include/Poco/LRUCache.h
 include/Poco/LRUStrategy.h
 include/Poco/Latin1Encoding.h
+include/Poco/Latin2Encoding.h
 include/Poco/Latin9Encoding.h
 include/Poco/LineEndingConverter.h
 include/Poco/LinearHashTable.h
+include/Poco/ListMap.h
 include/Poco/LocalDateTime.h
 include/Poco/LogFile.h
 include/Poco/LogFile_STD.h
@@ -237,12 +266,15 @@ include/Poco/Net/FTPClientSession.h
 include/Poco/Net/FTPStreamFactory.h
 include/Poco/Net/FilePartSource.h
 include/Poco/Net/HTMLForm.h
+include/Poco/Net/HTTPAuthenticationParams.h
 include/Poco/Net/HTTPBasicCredentials.h
 include/Poco/Net/HTTPBasicStreamBuf.h
 include/Poco/Net/HTTPBufferAllocator.h
 include/Poco/Net/HTTPChunkedStream.h
 include/Poco/Net/HTTPClientSession.h
 include/Poco/Net/HTTPCookie.h
+include/Poco/Net/HTTPCredentials.h
+include/Poco/Net/HTTPDigestCredentials.h
 include/Poco/Net/HTTPFixedLengthStream.h
 include/Poco/Net/HTTPHeaderStream.h
 include/Poco/Net/HTTPIOStream.h
@@ -277,6 +309,7 @@ include/Poco/Net/ICMPSocket.h
 include/Poco/Net/ICMPSocketImpl.h
 include/Poco/Net/ICMPv4PacketImpl.h
 include/Poco/Net/IPAddress.h
+include/Poco/Net/IPAddressImpl.h
 include/Poco/Net/InvalidCertificateHandler.h
 include/Poco/Net/KeyConsoleHandler.h
 include/Poco/Net/KeyFileHandler.h
@@ -288,15 +321,23 @@ include/Poco/Net/MessageHeader.h
 include/Poco/Net/MulticastSocket.h
 include/Poco/Net/MultipartReader.h
 include/Poco/Net/MultipartWriter.h
+include/Poco/Net/NTPClient.h
+include/Poco/Net/NTPEventArgs.h
+include/Poco/Net/NTPPacket.h
 include/Poco/Net/NameValueCollection.h
 include/Poco/Net/Net.h
 include/Poco/Net/NetException.h
 include/Poco/Net/NetSSL.h
 include/Poco/Net/NetworkInterface.h
 include/Poco/Net/NullPartHandler.h
+include/Poco/Net/OAuth10Credentials.h
+include/Poco/Net/OAuth20Credentials.h
 include/Poco/Net/POP3ClientSession.h
+include/Poco/Net/ParallelSocketAcceptor.h
+include/Poco/Net/ParallelSocketReactor.h
 include/Poco/Net/PartHandler.h
 include/Poco/Net/PartSource.h
+include/Poco/Net/PartStore.h
 include/Poco/Net/PrivateKeyFactory.h
 include/Poco/Net/PrivateKeyFactoryMgr.h
 include/Poco/Net/PrivateKeyPassphraseHandler.h
@@ -307,6 +348,7 @@ include/Poco/Net/RawSocketImpl.h
 include/Poco/Net/RejectCertificateHandler.h
 include/Poco/Net/RemoteSyslogChannel.h
 include/Poco/Net/RemoteSyslogListener.h
+include/Poco/Net/SMTPChannel.h
 include/Poco/Net/SMTPClientSession.h
 include/Poco/Net/SSLException.h
 include/Poco/Net/SSLManager.h
@@ -322,6 +364,7 @@ include/Poco/Net/Session.h
 include/Poco/Net/Socket.h
 include/Poco/Net/SocketAcceptor.h
 include/Poco/Net/SocketAddress.h
+include/Poco/Net/SocketAddressImpl.h
 include/Poco/Net/SocketConnector.h
 include/Poco/Net/SocketDefs.h
 include/Poco/Net/SocketImpl.h
@@ -339,6 +382,8 @@ include/Poco/Net/TCPServerDispatcher.h
 include/Poco/Net/TCPServerParams.h
 include/Poco/Net/Utility.h
 include/Poco/Net/VerificationErrorArgs.h
+include/Poco/Net/WebSocket.h
+include/Poco/Net/WebSocketImpl.h
 include/Poco/Net/X509Certificate.h
 include/Poco/Notification.h
 include/Poco/NotificationCenter.h
@@ -349,8 +394,12 @@ include/Poco/NullStream.h
 include/Poco/Nullable.h
 include/Poco/NumberFormatter.h
 include/Poco/NumberParser.h
+include/Poco/NumericString.h
+include/Poco/ObjectPool.h
 include/Poco/Observer.h
 include/Poco/OpcomChannel.h
+include/Poco/Optional.h
+include/Poco/PBKDF2Engine.h
 include/Poco/Path.h
 include/Poco/Path_UNIX.h
 include/Poco/Path_VMS.h
@@ -391,8 +440,11 @@ include/Poco/RWLock_WIN32.h
 include/Poco/RWLock_WINCE.h
 include/Poco/Random.h
 include/Poco/RandomStream.h
+include/Poco/RecursiveDirectoryIterator.h
+include/Poco/RecursiveDirectoryIteratorImpl.h
 include/Poco/RefCountedObject.h
 include/Poco/RegularExpression.h
+include/Poco/RegularExpression.h.orig
 include/Poco/RotateStrategy.h
 include/Poco/Runnable.h
 include/Poco/RunnableAdapter.h
@@ -439,6 +491,7 @@ include/Poco/SignalHandler.h
 include/Poco/SimpleFileChannel.h
 include/Poco/SimpleHashTable.h
 include/Poco/SingletonHolder.h
+include/Poco/SortedDirectoryIterator.h
 include/Poco/SplitterChannel.h
 include/Poco/Stopwatch.h
 include/Poco/StrategyCollection.h
@@ -481,8 +534,10 @@ include/Poco/URI.h
 include/Poco/URIStreamFactory.h
 include/Poco/URIStreamOpener.h
 include/Poco/UTF16Encoding.h
+include/Poco/UTF32Encoding.h
 include/Poco/UTF8Encoding.h
 include/Poco/UTF8String.h
+include/Poco/UTFString.h
 include/Poco/UUID.h
 include/Poco/UUIDGenerator.h
 include/Poco/UnWindows.h
@@ -503,6 +558,7 @@ include/Poco/Util/FilesystemConfiguration.h
 include/Poco/Util/HelpFormatter.h
 include/Poco/Util/IniFileConfiguration.h
 include/Poco/Util/IntValidator.h
+include/Poco/Util/JSONConfiguration.h
 include/Poco/Util/LayeredConfiguration.h
 include/Poco/Util/LoggingConfigurator.h
 include/Poco/Util/LoggingSubsystem.h
@@ -530,6 +586,8 @@ include/Poco/Util/XMLConfiguration.h
 include/Poco/ValidArgs.h
 include/Poco/Version.h
 include/Poco/Void.h
+include/Poco/Windows1250Encoding.h
+include/Poco/Windows1251Encoding.h
 include/Poco/Windows1252Encoding.h
 include/Poco/WindowsConsoleChannel.h
 include/Poco/XML/Name.h
@@ -569,30 +627,18 @@ include/Poco/Zip/ZipUtil.h
 include/Poco/zconf.h
 include/Poco/zlib.h
 lib/libPocoCrypto.so
-lib/libPocoCrypto.so.11
-lib/libPocoCryptod.so
-lib/libPocoCryptod.so.11
+lib/libPocoCrypto.so.31
 lib/libPocoFoundation.so
-lib/libPocoFoundation.so.11
-lib/libPocoFoundationd.so
-lib/libPocoFoundationd.so.11
+lib/libPocoFoundation.so.31
+lib/libPocoJSON.so
+lib/libPocoJSON.so.31
 lib/libPocoNet.so
-lib/libPocoNet.so.11
+lib/libPocoNet.so.31
 lib/libPocoNetSSL.so
-lib/libPocoNetSSL.so.11
-lib/libPocoNetSSLd.so
-lib/libPocoNetSSLd.so.11
-lib/libPocoNetd.so
-lib/libPocoNetd.so.11
+lib/libPocoNetSSL.so.31
 lib/libPocoUtil.so
-lib/libPocoUtil.so.11
-lib/libPocoUtild.so
-lib/libPocoUtild.so.11
+lib/libPocoUtil.so.31
 lib/libPocoXML.so
-lib/libPocoXML.so.11
-lib/libPocoXMLd.so
-lib/libPocoXMLd.so.11
+lib/libPocoXML.so.31
 lib/libPocoZip.so
-lib/libPocoZip.so.11
-lib/libPocoZipd.so
-lib/libPocoZipd.so.11
+lib/libPocoZip.so.31
diff --git a/devel/poco/buildlink3.mk b/devel/poco/buildlink3.mk
index af2a088097ed5..4ba62b00fdd25 100644
--- a/devel/poco/buildlink3.mk
+++ b/devel/poco/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/02/12 23:17:49 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2016/01/16 12:15:12 ryoon Exp $
 
 BUILDLINK_TREE+=	poco
 
 .if !defined(POCO_BUILDLINK3_MK)
 POCO_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.poco+=	poco>=1.3.5
-BUILDLINK_ABI_DEPENDS.poco+=	poco>=1.4.2p1nb4
+BUILDLINK_API_DEPENDS.poco+=	poco>=1.6.1
+BUILDLINK_ABI_DEPENDS.poco+=	poco>=1.6.1
 BUILDLINK_PKGSRCDIR.poco?=	../../devel/poco
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/devel/poco/distinfo b/devel/poco/distinfo
index ea578824c38ad..062bc955b04bc 100644
--- a/devel/poco/distinfo
+++ b/devel/poco/distinfo
@@ -1,22 +1,23 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.11 2016/01/16 12:15:12 ryoon Exp $
 
-SHA1 (poco-1.4.2p1-all.tar.gz) = ef1bc69812179b7856c88aa4b5c157747c0a0e48
-RMD160 (poco-1.4.2p1-all.tar.gz) = 8288c10e3e96de26f56296da0bbbebff58b8b424
-SHA512 (poco-1.4.2p1-all.tar.gz) = 7ebd95af29fa6f638505f96a1b204e3c387318bdb800250bafa3c4e119b710a1d881f3d5706a44d4f31cd723322db668a0302d829db8540e7c660dcce5feb38e
-Size (poco-1.4.2p1-all.tar.gz) = 3922854 bytes
+SHA1 (poco-1.6.1-all.tar.gz) = 38841212a6893d4290909a62b4f310450230fb6d
+RMD160 (poco-1.6.1-all.tar.gz) = a7ab9429db5b4b5fc02c194a208f11f296deb90b
+SHA512 (poco-1.6.1-all.tar.gz) = 6c68f3f2692bad8ad4a111e541e8da6376246517b2dca73f429539e9ceaa107e791c3673261467cf8a2e2efabd0dd2a5160d9d412e71af114b4a6b700c9c2393
+Size (poco-1.6.1-all.tar.gz) = 5636597 bytes
+SHA1 (patch-Foundation_Makefile) = 492b55268b6b848bfb0d5c255b59ae2745eb4f72
 SHA1 (patch-Foundation_include_Poco_Platform.h) = a7d81c20902af7e23ce8a10eb90fc1a98d7cc412
-SHA1 (patch-Foundation_src_SharedMemory.cpp) = d0821acd31888369cb2d58cc78f02b061515a8da
+SHA1 (patch-Foundation_include_Poco_RegularExpression.h) = a113fdcfdd25a4d98deba6b32f9be7ae675450d6
+SHA1 (patch-Foundation_src_pcre__internal.h) = 1ef08cc22b6205056f5373b6470de95d775bf087
 SHA1 (patch-Foundation_testsuite_src_DynamicFactoryTest.cpp) = 78b40b8d2f8214be4cd435ad531cdee4ff9bee0b
 SHA1 (patch-Net_testsuite_src_DNSTest.cpp) = 21a1a650e43d87e2b9590b1f047f12aa944b5077
 SHA1 (patch-Net_testsuite_src_SocketAddressTest.cpp) = b4cf7a7631ed8b00b346d7303f872f727ab015ca
 SHA1 (patch-aa) = be1c72c9c63b65e8d4211abab9dd036255ed6233
-SHA1 (patch-ab) = 0709ba35fe938f7efc94650dde4afd84c427de0f
-SHA1 (patch-ac) = e3ee4b43e458f1ab1227aa029a00fcebf5f53541
+SHA1 (patch-ab) = a5ebcc44e9ab728d9812cefd01188622bfea172f
+SHA1 (patch-ac) = 08fa398b76935082dccbfb81bb69877d10996f6f
 SHA1 (patch-ad) = f6eeb9dc9b3a85525f264edbd1587bc4f124b9e1
 SHA1 (patch-ae) = a13a01901b3df6df7d5e5ad7a0639086b0897566
-SHA1 (patch-af) = 50a86be83634ede278f7a8463423e2f88a1741a7
-SHA1 (patch-ag) = 945a594376393462e1cc0f881532d2294adf5816
-SHA1 (patch-ah) = f8debbf7b416fc562f5af321be739e0d4481a130
-SHA1 (patch-ai) = 9feef00a05372578d957c68b53657e6468f65f6a
-SHA1 (patch-build_config_Linux) = ba79d12efeea09e0e24e0d95a457dcbce265cd75
-SHA1 (patch-build_config_SunOS-GCC) = f9d7ecc44db9335882814c0a072af29fb4c8fd1d
+SHA1 (patch-ag) = e1ef2677c25d445cdae97c832211e2407fae9af3
+SHA1 (patch-ah) = a4ba890ab2501552bf18b2778f3f3593e4b0abcb
+SHA1 (patch-build_config_Linux) = 39a42f82fcac9415208af28a05ab2faf0558667b
+SHA1 (patch-build_config_SunOS-GCC) = e8e6cc78e4f099c32c75561f554c3faeef7f6828
+SHA1 (patch-build_rules_compile) = 9db52d6c83c3e26ea421d960af2b8a1fb412201f
diff --git a/devel/poco/patches/patch-Foundation_Makefile b/devel/poco/patches/patch-Foundation_Makefile
new file mode 100644
index 0000000000000..a30b2565f824b
--- /dev/null
+++ b/devel/poco/patches/patch-Foundation_Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Foundation_Makefile,v 1.1 2016/01/16 12:15:12 ryoon Exp $
+
+Fix build with unbundled PCRE.
+https://github.com/buildroot/buildroot/blob/master/package/poco/0004-fix-unbundled-pcre-usage.patch
+
+--- Foundation/Makefile.orig	2015-08-04 05:20:56.000000000 +0000
++++ Foundation/Makefile
+@@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+ 	SYSLIBS += -lpcre -lz
++	objects += $(pcre_utf8_objects)
+ else
+ 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
+ endif
diff --git a/devel/poco/patches/patch-Foundation_include_Poco_RegularExpression.h b/devel/poco/patches/patch-Foundation_include_Poco_RegularExpression.h
new file mode 100644
index 0000000000000..7b18b0ac30834
--- /dev/null
+++ b/devel/poco/patches/patch-Foundation_include_Poco_RegularExpression.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-Foundation_include_Poco_RegularExpression.h,v 1.1 2016/01/16 12:15:12 ryoon Exp $
+
+Fix build with unbundled PCRE.
+https://github.com/pocoproject/poco/commit/30cb89acd2f8aba4e40bec2335246336a5cccf7d
+
+--- Foundation/include/Poco/RegularExpression.h.orig	2015-08-04 05:20:55.000000000 +0000
++++ Foundation/include/Poco/RegularExpression.h
+@@ -26,6 +26,9 @@
+ #include "Poco/Foundation.h"
+ #include <vector>
+ 
++#if defined(POCO_UNBUNDLED)
++#include <pcre.h>
++#else
+ 
+ //
+ // Copy these definitions from pcre.h
+@@ -37,7 +40,7 @@ extern "C"
+ 	typedef struct real_pcre8_or_16 pcre;
+ 	struct pcre_extra;
+ }
+-
++#endif
+ 
+ namespace Poco {
+ 
diff --git a/devel/poco/patches/patch-Foundation_src_SharedMemory.cpp b/devel/poco/patches/patch-Foundation_src_SharedMemory.cpp
deleted file mode 100644
index 734904ef802e1..0000000000000
--- a/devel/poco/patches/patch-Foundation_src_SharedMemory.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-Foundation_src_SharedMemory.cpp,v 1.2 2012/07/29 11:26:54 fhajny Exp $
-
-Do not mangle _XOPEN_SOURCE when GCC is used, rely on CXXFLAGS instead.
---- Foundation/src/SharedMemory.cpp.orig	2011-09-24 08:07:00.000000000 +0000
-+++ Foundation/src/SharedMemory.cpp
-@@ -34,7 +34,7 @@
- //
- 
- 
--#if defined(__sun)
-+#if defined(__sun) && !defined(__GNUC__)
- #undef _XOPEN_SOURCE
- #define _XOPEN_SOURCE 500
- #endif
diff --git a/devel/poco/patches/patch-Foundation_src_pcre__internal.h b/devel/poco/patches/patch-Foundation_src_pcre__internal.h
new file mode 100644
index 0000000000000..df8e036fc3371
--- /dev/null
+++ b/devel/poco/patches/patch-Foundation_src_pcre__internal.h
@@ -0,0 +1,37 @@
+$NetBSD: patch-Foundation_src_pcre__internal.h,v 1.1 2016/01/16 12:15:12 ryoon Exp $
+
+Fix build with unbundled PCRE
+https://github.com/buildroot/buildroot/blob/master/package/poco/0004-fix-unbundled-pcre-usage.patch
+
+--- Foundation/src/pcre_internal.h.orig	2015-08-04 05:20:56.000000000 +0000
++++ Foundation/src/pcre_internal.h
+@@ -2635,6 +2635,16 @@ typedef struct {
+   pcre_uint16 value;
+ } ucp_type_table;
+ 
++/* renamed to avoid clashes with system pcre */
++#define _pcre_utf8_table1      _poco__pcre_utf8_table1
++#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
++#define _pcre_utf8_table2      _poco__pcre_utf8_table2
++#define _pcre_utf8_table3      _poco__pcre_utf8_table3
++#define _pcre_utf8_table4      _poco__pcre_utf8_table4
++#define _pcre_utt              _poco__pcre_utt
++#define _pcre_utt_size         _poco__pcre_utt_size
++#define _pcre_utt_names        _poco__pcre_utt_names
++#define _pcre_OP_lengths       _poco__pcre_OP_lengths
+ 
+ /* Internal shared data tables. These are tables that are used by more than one
+ of the exported public functions. They have to be "external" in the C sense,
+@@ -2749,6 +2759,12 @@ typedef struct {
+   pcre_int32 other_case; /* offset to other case, or zero if none */
+ } ucd_record;
+ 
++/* renamed to avoid clashes with system pcre */
++#define _pcre_ucd_records _poco__pcre_ucd_records
++#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
++#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
++#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
++
+ extern const pcre_uint32 PRIV(ucd_caseless_sets)[];
+ extern const ucd_record  PRIV(ucd_records)[];
+ extern const pcre_uint8  PRIV(ucd_stage1)[];
diff --git a/devel/poco/patches/patch-ab b/devel/poco/patches/patch-ab
index 919c80f600bf8..6a05a46cfea23 100644
--- a/devel/poco/patches/patch-ab
+++ b/devel/poco/patches/patch-ab
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $
+$NetBSD: patch-ab,v 1.2 2016/01/16 12:15:12 ryoon Exp $
 
 # include NetBSD with the HP-UX portion of the event handling
 
---- Foundation/src/NamedEvent_UNIX.cpp.orig	2008-10-09 18:14:00.000000000 +0200
+--- Foundation/src/NamedEvent_UNIX.cpp.orig	2015-08-04 05:20:55.000000000 +0000
 +++ Foundation/src/NamedEvent_UNIX.cpp
-@@ -60,7 +60,7 @@ namespace Poco {
+@@ -41,7 +41,7 @@ namespace Poco {
  		unsigned short int* array;
  		struct seminfo*     __buf;
  	};
--#elif defined(__hpux)
-+#elif defined(__hpux) || defined(__NetBSD__)
+-#elif (POCO_OS == POCO_OS_HPUX)
++#elif (POCO_OS == POCO_OS_HPUX) || (POCO_OS == POCO_OS_NET_BSD)
  	union semun
  	{
  		int              val;
diff --git a/devel/poco/patches/patch-ac b/devel/poco/patches/patch-ac
index c819bbb6c6eb7..e8483c1822181 100644
--- a/devel/poco/patches/patch-ac
+++ b/devel/poco/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $
+$NetBSD: patch-ac,v 1.2 2016/01/16 12:15:12 ryoon Exp $
 
-# handle a POSIX mutex on NetBSD as they do on HP-UX
-
---- Foundation/src/NamedMutex_UNIX.cpp.orig	2008-10-09 18:14:00.000000000 +0200
+--- Foundation/src/NamedMutex_UNIX.cpp.orig	2015-08-04 05:20:55.000000000 +0000
 +++ Foundation/src/NamedMutex_UNIX.cpp
-@@ -60,7 +60,7 @@ namespace Poco {
+@@ -41,7 +41,7 @@ namespace Poco {
  		unsigned short int* array;
  		struct seminfo*     __buf;
  	};
--#elif defined(__hpux)
-+#elif defined(__hpux) || defined(__NetBSD__)
+-#elif (POCO_OS == POCO_OS_HPUX)
++#elif (POCO_OS == POCO_OS_HPUX) || (POCO_OS == POCO_OS_NET_BSD)
  	union semun
  	{
  		int              val;
diff --git a/devel/poco/patches/patch-af b/devel/poco/patches/patch-af
deleted file mode 100644
index a0bba2f6f0ec9..0000000000000
--- a/devel/poco/patches/patch-af
+++ /dev/null
@@ -1,83 +0,0 @@
-$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	2011-02-09 09:12:55.000000000 +0000
-+++ configure
-@@ -250,50 +250,52 @@ else
- 	linkmode=""
- 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.make
-+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
- if [ "$unbundled" != "" ] ; then
--	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
--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
- if [ "$unbundled" != "" ] ; then
--	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
-+echo '.PHONY: poco' >>$build/config.make
- echo "poco: libexecs $tests $samples" >>$build/config.make
- 
- echo "Configured for $config"
diff --git a/devel/poco/patches/patch-ag b/devel/poco/patches/patch-ag
index f11db445acff5..02115dad6ab55 100644
--- a/devel/poco/patches/patch-ag
+++ b/devel/poco/patches/patch-ag
@@ -1,15 +1,15 @@
-$NetBSD: patch-ag,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $
+$NetBSD: patch-ag,v 1.2 2016/01/16 12:15:12 ryoon Exp $
 
 # Only include only the non-omitted components 
 
---- Makefile.orig	2010-12-16 05:43:33.000000000 +0000
+--- Makefile.orig	2015-08-04 05:21:07.000000000 +0000
 +++ Makefile
-@@ -24,7 +24,9 @@ endif
+@@ -27,7 +27,9 @@ poco: libexecs $(if $(TESTS),tests) $(if
  all: libexecs tests samples
  
  INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
--COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page
-+Master_COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page
+-COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Zip PageCompiler PageCompiler/File2Page
++Master_COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Zip PageCompiler PageCompiler/File2Page
 +
 +COMPONENTS=$(filter-out $(foreach f,$(OMIT),$f%),$(Master_COMPONENTS))
  
diff --git a/devel/poco/patches/patch-ah b/devel/poco/patches/patch-ah
index 4d2f60ddda3ae..8a8ac6e8e6e02 100644
--- a/devel/poco/patches/patch-ah
+++ b/devel/poco/patches/patch-ah
@@ -1,18 +1,18 @@
-$NetBSD: patch-ah,v 1.1.1.1 2011/02/06 05:55:15 schnoebe Exp $
+$NetBSD: patch-ah,v 1.2 2016/01/16 12:15:12 ryoon Exp $
 
 # simplify the search for the MySQL components, since we know
 # where they are..
 
---- Data/MySQL/Makefile.orig	2009-05-12 13:22:14.000000000 -0500
+--- Data/MySQL/Makefile.orig	2015-08-04 05:21:04.000000000 +0000
 +++ 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/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -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@ 
++INCLUDE += -I@MYSQLINCDIR@
  SYSFLAGS += -DTHREADSAFE -DNO_TCL
  
  objects = Binder Extractor SessionImpl Connector \
diff --git a/devel/poco/patches/patch-build_config_Linux b/devel/poco/patches/patch-build_config_Linux
index 7aafe1744326d..f369c8b22589c 100644
--- a/devel/poco/patches/patch-build_config_Linux
+++ b/devel/poco/patches/patch-build_config_Linux
@@ -1,18 +1,18 @@
-$NetBSD: patch-build_config_Linux,v 1.1 2011/10/17 07:56:57 sbd Exp $
+$NetBSD: patch-build_config_Linux,v 1.2 2016/01/16 12:15:12 ryoon Exp $
 
 # Build a full set of shared library search paths, rather than
 # *assuming* everything is under PREFIX.
 
---- build/config/Linux.orig	2010-12-16 05:43:24.000000000 +0000
+--- build/config/Linux.orig	2015-08-04 05:20:55.000000000 +0000
 +++ build/config/Linux
 @@ -21,6 +21,8 @@ LINK    = $(CXX)
- LIB     = ar -cr
- RANLIB  = ranlib
+ LIB     = ${CROSS_COMPILE}ar -cr
+ RANLIB  = ${CROSS_COMPILE}ranlib
  SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
 +SHLIBFLAGS = $(LDFLAGS) -Wl,-R$(POCO_PREFIX)/lib \
 +		$(foreach p,$(sort $(POCO_ADD_LIBRARY)),-L$(p) -Wl,-R$(p))
  SHLIBLN = $(POCO_BASE)/build/script/shlibln
- STRIP   = strip
+ STRIP   = ${CROSS_COMPILE}strip
  DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
 @@ -44,7 +46,7 @@ CFLAGS64        =
  CXXFLAGS        = -Wall -Wno-sign-compare
diff --git a/devel/poco/patches/patch-build_config_SunOS-GCC b/devel/poco/patches/patch-build_config_SunOS-GCC
index 1238d94945e0a..52d2102223339 100644
--- a/devel/poco/patches/patch-build_config_SunOS-GCC
+++ b/devel/poco/patches/patch-build_config_SunOS-GCC
@@ -1,8 +1,8 @@
-$NetBSD: patch-build_config_SunOS-GCC,v 1.3 2012/07/29 11:26:54 fhajny Exp $
+$NetBSD: patch-build_config_SunOS-GCC,v 1.4 2016/01/16 12:15:12 ryoon Exp $
 
 Resolve a conflict on SunOS, where GCC>=4.6 will force C99 with C++
 and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++.
---- build/config/SunOS-GCC.orig	2011-09-24 08:06:59.000000000 +0000
+--- build/config/SunOS-GCC.orig	2015-08-04 05:20:55.000000000 +0000
 +++ build/config/SunOS-GCC
 @@ -21,6 +21,8 @@ LINK    = $(CXX)
  LIB     = ar -cr
@@ -45,5 +45,5 @@ and require _XOPEN_SOURCE=600, whereas GCC<4.6 will reject C99 with C++.
  #
  # System Specific Libraries
  #
--SYSLIBS  = -lpthread -ldl -lrt
+-SYSLIBS  = -lpthread -lrt -lxnet -lsocket -lnsl -lresolv -ldl
 +SYSLIBS  = -lpthread -ldl -lrt -lxnet -lsocket -lnsl -lresolv -ldl
diff --git a/devel/poco/patches/patch-build_rules_compile b/devel/poco/patches/patch-build_rules_compile
new file mode 100644
index 0000000000000..12112cd86f89d
--- /dev/null
+++ b/devel/poco/patches/patch-build_rules_compile
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_rules_compile,v 1.1 2016/01/16 12:15:12 ryoon Exp $
+
+Do not build debug binaries.
+
+--- build/rules/compile.orig	2015-08-04 05:20:55.000000000 +0000
++++ build/rules/compile
+@@ -14,7 +14,7 @@
+ 
+ all: $(DEFAULT_TARGET)
+ all_static: static_debug static_release
+-all_shared: shared_debug shared_release
++all_shared: shared_release
+ all_debug: static_debug shared_debug
+ all_release: static_release shared_release
+