Update to 6.3.1. Two patches aren't needed anymore.

patch-commoncpp_address.cpp breaks the build. I'm not seeing how bitset
would use the C++ stdlib version, since <bitset> isn't included.
OpenSSL and GNUTLS are package options, defaulting to openssl. Set
PKG_BUILD_OPTIONS.ucommon accordingly. Major shared library change, so
update buildlink3.mk accordinly. Updates to dependant packages coming
shortly. From ChangeLog:

Changes from 6.3.0 to 6.3.1
- copyright assignment to Cherokees of Idaho
- introduction of ucommon cmake hosted macros
- simplified doxygen doc support
- convergence of automake and cmake builds
- make utils easier for source introspection
- converted for cmake builds on debian
- count for String::check should be size_t
- string bounds checking

Changes from 6.2.3 to 6.3.0
- remove legacy cmodel support
- modernize library usage
- simplify autoconf and cmake
- introduce sysruntime...
- cleanup memory operators....

Changes from 6.2.2 to 6.2.3
- a few socket fixes, mostly windows related...

Changes from 6.2.1 to 6.2.2
- bumped gnutls to 3.0.0 or later...
- lots of bug fixes and general cleanup
- socket endian issues and other things for ccrtp
- templated newp and freep handle management

Changes from 6.2.0 to 6.2.1
- datetime: fix const inconsistency
- fsys: cached error variable must be mutable
- replacment new/delete cannot be declared inline
- fix exception specifier clash for c++11

Changes from 6.1.11 to 6.2.0
- standardized cmake paths and stand-alone usages
- gnutls support in cmake
- unified openssl checks, even works for windows
- improved openssl support, new static crypto option
- pkgconfig usable in win32, other win32 fixes
- fixes for mac build & optional disable of utils
- upticked abi version to 7, should have happened with 10/11?

Changes from 6.1.10 to 6.1.11
- any addr and overloads in commoncpp
- cmake abi fix and other apple specific issues
- stream fixes, sflphone recommended changes, and other updates
- key protocol added
- cleaner build for binding without resolver
- cleanup and fixes for commoncpp peering...
- UDPSocket: use ucommon::Socket::address
- Socket::address: add setAny(sockaddr*), setLoopback(sockaddr*)

Changes from 6.1.9 to 6.1.10
- for next release
- iso cleaness
- Fix memory leak in DateTime ctor
- Fix utf8::count()
- secure::erase() should be more secure

Changes from 6.1.8 to 6.1.9
- ost::Socket: use ucommon::Socket for join(), drop() implementations
- back to native threading model for mingw
- Socket::store: use existing len method
- Socket::address: allow printing to std::ostream
- Socket::address: use in_port_t for port numbers
- Socket::join, ::drop: allow to set interface index for IPv6

Changes from 6.1.7 to 6.1.8
- mingw libstdc++ c++11 support now requires winpthread
- more android related updates

Changes from 6.1.6 to 6.1.7
- lots of android related updates

Changes from 6.1.5 to 6.1.6
- some windows and mingw fixes
- Socket::address::print(): minor fixes
- Socket::address: fix constructor documentation
- Socket::address: add unit tests for print()
- Socket::address: add print() method
- Socket::address: add withPort()
- Socket::address: add constructors from standard addr types
- Socket::address: use existing len() method.

Changes from 6.1.4 to 6.1.5
- key merge on load for 6.1.5

Changes from 6.1.3 to 6.1.4
- lots of namespace usage cleanup
- Socket::address: add unit tests for new features
- Socket::address: add isAny, setAny, isLoopback, setLoopback, any, loopback
- Socket::address: convert port to network byte order
- ost::Socket: add compatibility with ucommon::Socket::address
- we don't want commoncpp configs if no lib made
- Socket::address: add equality operator, getPort, setPort, getSize
- improved cmake and added srpm, todo make targets

Changes from 6.1.2 to 6.1.3
- revised unixaddr buffer overflow issue

Changes from 6.1.1 to 6.1.2
- updated contacts, fsf address, and copyright
- revised cmake build
- added setgroups

from ucommon 6.1.0 to 6.1.1
- module flag support for older commoncpp packages
- fix for commoncpp pc file
- some additional original classes mapped to commoncpp
- default Semaphore constructor now valid special case

11 files changed, 80 insertions, 117 deletions

diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index 228a7d2e0fc..31513414b0a 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.8 2014/02/12 23:17:51 tron Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/18 02:43:24 rodent Exp $
 #
 
-DISTNAME=	ucommon-6.1.0
-PKGREVISION=	1
+DISTNAME=	ucommon-6.3.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=commonc++/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.gnu.org/software/commoncpp/
+HOMEPAGE=	https://www.gnu.org/software/commoncpp/
 COMMENT=	Very light-weight C++ library for deeply embedded applications
 LICENSE=	gnu-lgpl-v3
 
@@ -15,7 +14,6 @@ USE_TOOLS+=	intltool pkg-config
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_CMAKE=	yes
-CMAKE_ARGS=	-DINSTALL_MANDIR=${PKGMANDIR}
 
 PKGCONFIG_OVERRIDE+=	commoncpp.pc.in
 PKGCONFIG_OVERRIDE+=	ucommon.pc.in
@@ -27,5 +25,4 @@ LDFLAGS.SunOS+=		-lsocket -lnsl -lintl
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ucommon/PLIST b/devel/ucommon/PLIST
index b935a763d57..c564c24e752 100644
--- a/devel/ucommon/PLIST
+++ b/devel/ucommon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/01/10 02:32:50 rodent Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/18 02:43:24 rodent Exp $
 bin/args
 bin/car
 bin/commoncpp-config
@@ -18,6 +18,7 @@ include/commoncpp/exception.h
 include/commoncpp/export.h
 include/commoncpp/file.h
 include/commoncpp/mime.h
+include/commoncpp/misc.h
 include/commoncpp/numbers.h
 include/commoncpp/object.h
 include/commoncpp/pointer.h
@@ -63,15 +64,18 @@ include/ucommon/ucommon.h
 include/ucommon/unicode.h
 include/ucommon/vector.h
 include/ucommon/xml.h
-lib/libcommoncpp.so
-lib/libcommoncpp.so.6
-lib/libcommoncpp.so.${PKGVERSION}
-lib/libucommon.so
-lib/libucommon.so.6
-lib/libucommon.so.${PKGVERSION}
-lib/libusecure.so
-lib/libusecure.so.6
-lib/libusecure.so.${PKGVERSION}
+${PLIST.static}lib/libcommoncpp.a
+${PLIST.dynamic}lib/libcommoncpp.so
+${PLIST.dynamic}lib/libcommoncpp.so.7
+${PLIST.dynamic}lib/libcommoncpp.so.7.0.5
+${PLIST.static}lib/libucommon.a
+${PLIST.dynamic}lib/libucommon.so
+${PLIST.dynamic}lib/libucommon.so.7
+${PLIST.dynamic}lib/libucommon.so.7.0.5
+${PLIST.static}lib/libusecure.a
+${PLIST.dynamic}lib/libusecure.so
+${PLIST.dynamic}lib/libusecure.so.7
+${PLIST.dynamic}lib/libusecure.so.7.0.5
 lib/pkgconfig/commoncpp.pc
 lib/pkgconfig/ucommon.pc
 man/man1/args.1
@@ -84,3 +88,5 @@ man/man1/scrub-files.1
 man/man1/sockaddr.1
 man/man1/ucommon-config.1
 man/man1/zerofill.1
+share/ucommon/cmake/CapeConfig.cmake
+share/ucommon/cmake/CapeMakeTargets.cmake
diff --git a/devel/ucommon/buildlink3.mk b/devel/ucommon/buildlink3.mk
index cb8a9ea54aa..0aa36e9efba 100644
--- a/devel/ucommon/buildlink3.mk
+++ b/devel/ucommon/buildlink3.mk
@@ -1,17 +1,27 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/02/12 23:17:51 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2015/04/18 02:43:24 rodent Exp $
 
 BUILDLINK_TREE+=	ucommon
 
 .if !defined(UCOMMON_BUILDLINK3_MK)
 UCOMMON_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ucommon+=	ucommon>=5.0.6
-BUILDLINK_ABI_DEPENDS.ucommon?=	ucommon>=6.1.0nb1
+BUILDLINK_API_DEPENDS.ucommon+=	ucommon>=6.0.0
+BUILDLINK_ABI_DEPENDS.ucommon?=	ucommon>=6.3.1
 BUILDLINK_PKGSRCDIR.ucommon?=	../../devel/ucommon
 
 pkgbase := ucommon
 .include "../../mk/pkg-build-options.mk"
 
+.if !empty(PKG_BUILD_OPTIONS.ucommon:Mgnutls)
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=3.0.0
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.ucommon:Mopenssl)
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.0
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_BUILD_OPTIONS.ucommon:Mstatic)
 BUILDLINK_DEPMETHOD.ucommon?=	build
 .endif
diff --git a/devel/ucommon/distinfo b/devel/ucommon/distinfo
index 560d2512b87..9da2c865a1d 100644
--- a/devel/ucommon/distinfo
+++ b/devel/ucommon/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.8 2014/01/19 00:49:06 rodent Exp $
+$NetBSD: distinfo,v 1.9 2015/04/18 02:43:24 rodent Exp $
 
-SHA1 (ucommon-6.1.0.tar.gz) = c20dc9c5ec53131284cbc523148302b6e135a9ac
-RMD160 (ucommon-6.1.0.tar.gz) = 93e175c0970e335acb2df2b8ee2433720ba69fdd
-Size (ucommon-6.1.0.tar.gz) = 826742 bytes
-SHA1 (patch-CMakeLists.txt) = 53e9ffad15d45a89eb1b992da3d6a965a46d0447
-SHA1 (patch-commoncpp_address.cpp) = 64cbb5ae5f43b994a36d65d893cf58309e7324df
-SHA1 (patch-commoncpp_udp.cpp) = 6950168df08702bb5aed023682e8a73e73b6f965
-SHA1 (patch-inc_ucommon_string.h) = 334e9a71dfbf94f81ced34e0af7074c67f65b8da
-SHA1 (patch-utils_keywait.cpp) = 7f5a595b080f3e61097cf99680602d8fcc84bafa
+SHA1 (ucommon-6.3.1.tar.gz) = 82db4fda4b11589b0b02a2afb07a4f675edacfb9
+RMD160 (ucommon-6.3.1.tar.gz) = b58ac6dcd7b5e88fdc2e38703cddc9afd17175bf
+Size (ucommon-6.3.1.tar.gz) = 830661 bytes
+SHA1 (patch-commoncpp_udp.cpp) = 34607048d74a0c0142334179e43f481aa4affab7
+SHA1 (patch-configure) = 13335dcb186aa37a12e8dafcf64c077ccc543819
+SHA1 (patch-utils_keywait.cpp) = 003bc190393f0b1c3e052605136ef9cf50bddc40
diff --git a/devel/ucommon/options.mk b/devel/ucommon/options.mk
index ed4e682efdc..2b9e6d5f27d 100644
--- a/devel/ucommon/options.mk
+++ b/devel/ucommon/options.mk
@@ -1,17 +1,30 @@
-# $NetBSD: options.mk,v 1.1 2013/06/27 01:36:25 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2015/04/18 02:43:24 rodent Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucommon
-PKG_SUPPORTED_OPTIONS=	static tests
-PKG_SUGGESTED_OPTIONS+=	# blank
+PKG_SUPPORTED_OPTIONS=	gnutls openssl static tests
+PKG_SUGGESTED_OPTIONS+=	openssl
 PLIST_VARS+=		dynamic static
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mgnutls)
+BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=3.0.0
+.include "../../security/gnutls/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+BUILDLINK_API_DEPENDS.openssl+=	openssl>=1.0.0
+.include "../../security/openssl/buildlink3.mk"
+CMAKE_ARGS+=	-DCRYPTO_OPENSSL=ON
+.else
+CMAKE_ARGS+=	-DCRYPTO_OPENSSL=OFF
+.endif
+
 .if !empty(PKG_OPTIONS:Mstatic)
-CMAKE_ARGS+=	-DBUILD_STATIC=ON
+CMAKE_ARGS+=	-DBUILD_STATIC=ON -DCRYPTO_STATIC=ON
 PLIST.static=	yes
 .else
-CMAKE_ARGS+=	-DBUILD_STATIC=OFF
+CMAKE_ARGS+=	-DBUILD_STATIC=OFF -DCRYPTO_STATIC=OFF
 PLIST.dynamic=	yes
 .endif
 
diff --git a/devel/ucommon/patches/patch-CMakeLists.txt b/devel/ucommon/patches/patch-CMakeLists.txt
deleted file mode 100644
index 5b9a161a66a..00000000000
--- a/devel/ucommon/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/19 00:49:06 rodent Exp $
-
-Fix INSTALL_MANDIR overwriting itself.
-
---- CMakeLists.txt.orig	2014-01-04 17:15:36.000000000 +0000
-+++ CMakeLists.txt
-@@ -42,15 +42,7 @@ if(WIN32)
-     set(SYSCONFDIR "etc" CACHE PATH "config directory")
-     set(STATEDIR "var" CACHE PATH "state directory")
- else()
--    if (NOT LIB_SUFFIX)
--        if (NOT EXISTS /etc/debian_version)
--            if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
--                set(LIB_SUFFIX 64)
--            endif()
--        endif()
--    endif()
-     set(INSTALL_SBINDIR sbin)
--    set(INSTALL_MANDIR share/man)
-     set(INSTALL_LOCALE share/locale)
-     set(INSTALL_DOCDIR share/doc/${PROJECT_NAME})
-     set(INSTALL_INFODIR share/info)
diff --git a/devel/ucommon/patches/patch-commoncpp_address.cpp b/devel/ucommon/patches/patch-commoncpp_address.cpp
deleted file mode 100644
index f47ed7b1cd8..00000000000
--- a/devel/ucommon/patches/patch-commoncpp_address.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-commoncpp_address.cpp,v 1.3 2014/01/19 00:49:06 rodent Exp $
-
-Be explicit that the local version of bitset is wanted, not the STL
-version in std for C++11 libraries.
-
---- commoncpp/address.cpp.orig	2014-01-04 17:32:41.000000000 +0000
-+++ commoncpp/address.cpp
-@@ -1062,7 +1062,7 @@ void IPV4Cidr::set(const char *cp)
- #endif
- 
-     memset(&netmask, 0, sizeof(netmask));
--    bitset((bit_t *)&netmask, getMask(cp));
-+    ::bitset((bit_t *)&netmask, getMask(cp));
-     setString(cbuf, sizeof(cbuf), cp);
- 
-     ep = (char *)strchr(cp, '/');
-@@ -1192,7 +1192,7 @@ void IPV6Cidr::set(const char *cp)
-     char *ep;
- 
-     memset(&netmask, 0, sizeof(netmask));
--    bitset((bit_t *)&netmask, getMask(cp));
-+    ::bitset((bit_t *)&netmask, getMask(cp));
-     setString(cbuf, sizeof(cbuf), cp);
-     ep = (char *)strchr(cp, '/');
-     if(ep)
diff --git a/devel/ucommon/patches/patch-commoncpp_udp.cpp b/devel/ucommon/patches/patch-commoncpp_udp.cpp
index 42387f0d32a..6add92200e1 100644
--- a/devel/ucommon/patches/patch-commoncpp_udp.cpp
+++ b/devel/ucommon/patches/patch-commoncpp_udp.cpp
@@ -1,17 +1,10 @@
-$NetBSD: patch-commoncpp_udp.cpp,v 1.2 2014/01/19 00:49:06 rodent Exp $
+$NetBSD: patch-commoncpp_udp.cpp,v 1.3 2015/04/18 02:43:24 rodent Exp $
 
---- commoncpp/udp.cpp.orig	2014-01-04 17:32:41.000000000 +0000
+Fix build for NetBSD.
+
+--- commoncpp/udp.cpp.orig	2015-03-24 23:28:03.000000000 +0000
 +++ commoncpp/udp.cpp
-@@ -409,7 +409,7 @@ Socket::Error UDPSocket::join(const IPV4
-     setsockopt(so, IPPROTO_IP, IP_ADD_MEMBERSHIP, (char *)&group, sizeof(group));
-     return errSuccess;
- 
--#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__)
-+#elif defined(IP_ADD_MEMBERSHIP) && defined(SIOCGIFINDEX) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(_OSF_SOURCE) && !defined(__hpux) && !defined(__GNU__) && !defined(__NetBSD__)
- 
-         struct ip_mreqn      group;
-     struct sockaddr_in   myaddr;
-@@ -448,7 +448,7 @@ Socket::Error UDPSocket::join(const IPV4
+@@ -317,7 +317,7 @@ Socket::Error UDPSocket::join(const ucom
  Socket::Error UDPSocket::getInterfaceIndex(const char *DeviceName,int& InterfaceIndex)
  {
  #ifndef _MSWINDOWS_
diff --git a/devel/ucommon/patches/patch-configure b/devel/ucommon/patches/patch-configure
new file mode 100644
index 00000000000..26f3fcbcd39
--- /dev/null
+++ b/devel/ucommon/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2015/04/18 02:43:24 rodent Exp $
+
+Fix portability failure.
+
+--- configure.orig	2015-03-24 23:44:16.000000000 +0000
++++ configure
+@@ -16782,7 +16782,7 @@ if test "${enable_utils+set}" = set; the
+   enableval=$enable_utils;
+ fi
+ 
+-if test x"$enable_utils" == "xno"; then
++if test x"$enable_utils" = "xno"; then
+      if false; then
+   BUILD_UTILS_TRUE=
+   BUILD_UTILS_FALSE='#'
diff --git a/devel/ucommon/patches/patch-inc_ucommon_string.h b/devel/ucommon/patches/patch-inc_ucommon_string.h
deleted file mode 100644
index ef68f123dd8..00000000000
--- a/devel/ucommon/patches/patch-inc_ucommon_string.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-inc_ucommon_string.h,v 1.2 2014/01/19 00:49:06 rodent Exp $
-
---- inc/ucommon/string.h.orig	2014-01-04 17:30:39.000000000 +0000
-+++ inc/ucommon/string.h
-@@ -1627,7 +1627,7 @@ public:
-  * @param string2 to compare.
-  * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
-  */
--extern "C" inline int stricmp(const char *string1, const char *string2)
-+inline int stricmp(const char *string1, const char *string2)
-     {return String::case_compare(string1, string2);}
- 
- /**
-@@ -1637,7 +1637,7 @@ extern "C" inline int stricmp(const char
-  * @param max size of string to compare.
-  * @return 0 if equal, > 0 if s2 > s1, < 0 if s2 < s1.
-  */
--extern "C" inline int strnicmp(const char *string1, const char *string2, size_t max)
-+inline int strnicmp(const char *string1, const char *string2, size_t max)
-     {return String::case_compare(string1, string2, max);}
- 
- #endif
diff --git a/devel/ucommon/patches/patch-utils_keywait.cpp b/devel/ucommon/patches/patch-utils_keywait.cpp
index 3b153582ca6..7a2a4429fbb 100644
--- a/devel/ucommon/patches/patch-utils_keywait.cpp
+++ b/devel/ucommon/patches/patch-utils_keywait.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-utils_keywait.cpp,v 1.1 2014/01/26 04:00:19 rodent Exp $
+$NetBSD: patch-utils_keywait.cpp,v 1.2 2015/04/18 02:43:24 rodent Exp $
 
 Fix unportable cfmakeraw() for SunOS.
 
---- utils/keywait.cpp.orig	2014-01-04 17:31:43.000000000 +0000
+--- utils/keywait.cpp.orig	2015-03-24 23:42:51.000000000 +0000
 +++ utils/keywait.cpp
-@@ -122,7 +122,15 @@ PROGRAM_MAIN(argc, argv)
+@@ -123,7 +123,15 @@ int main(int argc, char **argv)
      shell::exiting(&cleanup);
  
      tcgetattr(0, &current);