net/czmq4: Update to 4.1.0

Changelog:
https://github.com/zeromq/czmq/releases/tag/v4.1.0

Additional port changes:
* Moved relevant lines into the USExx section
* Added 2 patches from the maintainer

Shared library soname didn't change, but headers were
reformatted, it is hard to tell if anything really changed there.

PR:		224853
Submitted by:	Kenji Rikitake <kenji@k2r.org> (maintainer)
Approved by:	tcberner (mentor, implicit)

5 files changed, 36 insertions, 11 deletions

diff --git a/net/czmq4/Makefile b/net/czmq4/Makefile
index 721c1624dd5b..dceff7844b68 100644
--- a/net/czmq4/Makefile
+++ b/net/czmq4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	czmq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.2
+DISTVERSION=	4.1.0
 CATEGORIES=	net
 PKGNAMESUFFIX=	4
 
@@ -17,10 +17,12 @@ BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 USES=		autoreconf libtool pkgconfig shebangfix
-USE_LDCONFIG=	yes
-
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	zeromq
+USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
 SHEBANG_FILES=	doc/mkman mkdoc \
 		model/chkopts.pl \
@@ -28,7 +30,6 @@ SHEBANG_FILES=	doc/mkman mkdoc \
 
 CONFLICTS_INSTALL=	czmq-3.*
 
-GNU_CONFIGURE=	yes
 # uuid_CFLAGS and uuid_LIBS required
 # to avoid conflicts with misc/e2fsprogs-libuuid
 CONFIGURE_ARGS=	uuid_CFLAGS="-I/usr/include ${CFLAGS}" \
@@ -38,9 +39,6 @@ CONFIGURE_ARGS=	uuid_CFLAGS="-I/usr/include ${CFLAGS}" \
 		--enable-drafts="yes" \
 		--with-docs="yes"
 
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check
-
 MAKE_ENV=	V=1
 CPPFLAGS+=	-Wno-error
 
diff --git a/net/czmq4/distinfo b/net/czmq4/distinfo
index c47d1e22e5b9..576f59db4cf0 100644
--- a/net/czmq4/distinfo
+++ b/net/czmq4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509166511
-SHA256 (zeromq-czmq-v4.0.2_GH0.tar.gz) = 794f80af7392ec8d361ad69646fc20aaa284d23fef92951334009771a732c810
-SIZE (zeromq-czmq-v4.0.2_GH0.tar.gz) = 883078
+TIMESTAMP = 1514947580
+SHA256 (zeromq-czmq-v4.1.0_GH0.tar.gz) = 2e87c19988d1168b70d7ec0fdce79aba4e92a6330959c3a2576c72b319acb478
+SIZE (zeromq-czmq-v4.1.0_GH0.tar.gz) = 1068897
diff --git a/net/czmq4/files/patch-include_czmq__prelude.h b/net/czmq4/files/patch-include_czmq__prelude.h
new file mode 100644
index 000000000000..fb40f37fcf0f
--- /dev/null
+++ b/net/czmq4/files/patch-include_czmq__prelude.h
@@ -0,0 +1,12 @@
+--- include/czmq_prelude.h.orig	2017-12-31 14:43:10 UTC
++++ include/czmq_prelude.h
+@@ -683,6 +683,9 @@ char *if_indextoname (unsigned int ifind
+ #if defined (__UTYPE_OSX) && !defined (HAVE_UUID)
+ #   define HAVE_UUID 1
+ #endif
++#if defined (__UTYPE_FREEBSD) && !defined (HAVE_UUID)
++#   define HAVE_UUID 1
++#endif
+ #if defined (HAVE_UUID)
+ #   if defined (__UTYPE_FREEBSD) || defined (__UTYPE_NETBSD) || defined(__UTYPE_OPENBSD)
+ #       include <uuid.h>
diff --git a/net/czmq4/files/patch-src_zuuid.c b/net/czmq4/files/patch-src_zuuid.c
new file mode 100644
index 000000000000..d0991a6ed5f6
--- /dev/null
+++ b/net/czmq4/files/patch-src_zuuid.c
@@ -0,0 +1,11 @@
+--- src/zuuid.c.orig	2017-12-31 14:43:10 UTC
++++ src/zuuid.c
+@@ -47,7 +47,7 @@ zuuid_new (void)
+     assert (sizeof (uuid) == ZUUID_LEN);
+     UuidCreate (&uuid);
+     zuuid_set (self, (byte *) &uuid);
+-#elif defined (HAVE_UUID)
++#elif defined (HAVE_UUID) && !defined (__UTYPE_FREEBSD)
+     uuid_t uuid;
+     assert (sizeof (uuid) == ZUUID_LEN);
+     uuid_generate (uuid);
diff --git a/net/czmq4/pkg-plist b/net/czmq4/pkg-plist
index d1c569ed0c3a..cee0480dda67 100644
--- a/net/czmq4/pkg-plist
+++ b/net/czmq4/pkg-plist
@@ -3,6 +3,7 @@ include/czmq_library.h
 include/czmq_prelude.h
 include/czmq.h
 include/zactor.h
+include/zargs.h
 include/zarmour.h
 include/zauth.h
 include/zbeacon.h
@@ -38,10 +39,11 @@ include/zuuid.h
 lib/libczmq.a
 lib/libczmq.so
 lib/libczmq.so.4
-lib/libczmq.so.4.0.2
+lib/libczmq.so.4.1.0
 libdata/pkgconfig/libczmq.pc
 man/man1/zmakecert.1.gz
 man/man3/zactor.3.gz
+man/man3/zargs.3.gz
 man/man3/zarmour.3.gz
 man/man3/zauth.3.gz
 man/man3/zbeacon.3.gz
@@ -76,6 +78,7 @@ man/man3/ztrie.3.gz
 man/man3/zuuid.3.gz
 man/man7/czmq.7.gz
 share/zproject/czmq/zactor.api
+share/zproject/czmq/zargs.api
 share/zproject/czmq/zarmour.api
 share/zproject/czmq/zcert.api
 share/zproject/czmq/zcertstore.api
@@ -100,6 +103,7 @@ share/zproject/czmq/zproc.api
 share/zproject/czmq/zsock_option.api
 share/zproject/czmq/zsock.api
 share/zproject/czmq/zstr.api
+share/zproject/czmq/zsys.api
 share/zproject/czmq/ztimerset.api
 share/zproject/czmq/ztrie.api
 share/zproject/czmq/zuuid.api