- Update to 6.1.11

  Changes:
  * 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*)

5 files changed, 6 insertions, 46 deletions

diff --git a/devel/ucommon/Makefile b/devel/ucommon/Makefile
index b577bc26ab61..7a28830d7539 100644
--- a/devel/ucommon/Makefile
+++ b/devel/ucommon/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ucommon
-PORTVERSION=	6.1.10
+PORTVERSION=	6.1.11
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	commoncpp
diff --git a/devel/ucommon/distinfo b/devel/ucommon/distinfo
index ea2df3689fef..26da08da8f4c 100644
--- a/devel/ucommon/distinfo
+++ b/devel/ucommon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ucommon-6.1.10.tar.gz) = d7a15ed31e3c418b41d95d5ff5e1bc24dfc4c2a465a099c6fd30e0b6c9f7be92
-SIZE (ucommon-6.1.10.tar.gz) = 833384
+SHA256 (ucommon-6.1.11.tar.gz) = ef933dd71f0b1e759052ecc169bc473bbcd818497c9ba9e7b778b0d37cecfc42
+SIZE (ucommon-6.1.11.tar.gz) = 833187
diff --git a/devel/ucommon/files/patch-inc-commoncpp_config.h b/devel/ucommon/files/patch-inc-commoncpp_config.h
deleted file mode 100644
index c0c5d76ff0c7..000000000000
--- a/devel/ucommon/files/patch-inc-commoncpp_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- inc/commoncpp/config.h.orig	2014-04-14 16:50:21.000000000 +0200
-+++ inc/commoncpp/config.h	2014-04-14 17:02:39.000000000 +0200
-@@ -50,7 +50,7 @@
-  * @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 ucommon::String::case_compare(string1, string2);}
- 
- /**
-@@ -60,7 +60,7 @@
-  * @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 ucommon::String::case_compare(string1, string2, max);}
- 
- #endif
diff --git a/devel/ucommon/files/patch-inc-ucommon_string.h b/devel/ucommon/files/patch-inc-ucommon_string.h
deleted file mode 100644
index 7d408c6a99c3..000000000000
--- a/devel/ucommon/files/patch-inc-ucommon_string.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- inc/ucommon/string.h.orig	2014-04-14 17:03:00.000000000 +0200
-+++ inc/ucommon/string.h	2014-04-14 17:03:09.000000000 +0200
-@@ -1627,7 +1627,7 @@
-  * @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 @@
-  * @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/pkg-plist b/devel/ucommon/pkg-plist
index c668a4192eff..711ff46a564d 100644
--- a/devel/ucommon/pkg-plist
+++ b/devel/ucommon/pkg-plist
@@ -66,13 +66,13 @@ include/ucommon/vector.h
 include/ucommon/xml.h
 lib/libcommoncpp.so
 lib/libcommoncpp.so.6
-lib/libcommoncpp.so.6.0.15
+lib/libcommoncpp.so.6.0.16
 lib/libucommon.so
 lib/libucommon.so.6
-lib/libucommon.so.6.0.15
+lib/libucommon.so.6.0.16
 lib/libusecure.so
 lib/libusecure.so.6
-lib/libusecure.so.6.0.15
+lib/libusecure.so.6.0.16
 libdata/pkgconfig/commoncpp.pc
 libdata/pkgconfig/ucommon.pc
 man/man1/args.1.gz