net/czmq: Update to 4.1.1

  - Explicitly disable docs: it requires xmlto/asciidoc (which is fine), but
    then fails to build using a packaged mkman (perl) script. Isolate the issue
    separately from this update.
  - Remove MAKE_ENV override to build verbosely, the build is verbose now by
    default
  - Remove all patches (upstreamed)

Changelog:

  https://github.com/zeromq/czmq/blob/v4.1.1/NEWS

PR:		229687
Requested by:	yuri

5 files changed, 44 insertions, 309 deletions

diff --git a/net/czmq/Makefile b/net/czmq/Makefile
index 40315dd10432..633c04647081 100644
--- a/net/czmq/Makefile
+++ b/net/czmq/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	czmq
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	4.1.1
 CATEGORIES=	net
-MASTER_SITES=	http://download.zeromq.org/
+MASTER_SITES=	https://github.com/zeromq/${PORTNAME}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	High-level C Binding for ZeroMQ
@@ -20,12 +19,12 @@ USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libzmq=${LOCALBASE} \
-		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \
+		--without-docs
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-MAKE_ENV=	V=1
-CPPFLAGS+=	-Wno-error
+CFLAGS+=	-Wno-error
 
 .include <bsd.port.mk>
diff --git a/net/czmq/distinfo b/net/czmq/distinfo
index ef932a1d784f..bc7e5393e4e5 100644
--- a/net/czmq/distinfo
+++ b/net/czmq/distinfo
@@ -1,2 +1,3 @@
-SHA256 (czmq-3.0.2.tar.gz) = 8bca39ab69375fa4e981daf87b3feae85384d5b40cef6adbe9d5eb063357699a
-SIZE (czmq-3.0.2.tar.gz) = 818110
+TIMESTAMP = 1532993817
+SHA256 (czmq-4.1.1.tar.gz) = f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0
+SIZE (czmq-4.1.1.tar.gz) = 1370719
diff --git a/net/czmq/files/patch-PR1031 b/net/czmq/files/patch-PR1031
deleted file mode 100644
index b96969fae6c0..000000000000
--- a/net/czmq/files/patch-PR1031
+++ /dev/null
@@ -1,222 +0,0 @@
-From 0a658bf1e793b73cbbe634f5f79ffe54a710bd82 Mon Sep 17 00:00:00 2001
-From: Pieter Hintjens <ph@imatix.com>
-Date: Sun, 21 Jun 2015 09:48:31 +0200
-Subject: [PATCH] Problem: someone added BOM headers to our sources
-
-Solution: burn this with fire
-
-Fixes #1030, #1029
-
-  https://github.com/zeromq/czmq/issues/1029
-  https://github.com/zeromq/czmq/issues/1028
-
-diff --git a/src/zactor.c b/src/zactor.c
-index c52df18..60477ee 100644
---- src/zactor.c
-+++ src/zactor.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zactor - simple actor framework
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zarmour.c b/src/zarmour.c
-index 1a16926..20d9b76 100644
---- src/zarmour.c
-+++ src/zarmour.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zarmour - armoured text encoding and decoding
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zauth.c b/src/zauth.c
-index bcb51b4..7e8e930 100644
---- src/zauth.c
-+++ src/zauth.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zauth - authentication for ZeroMQ security mechanisms
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zbeacon.c b/src/zbeacon.c
-index 353f8e0..9481839 100644
---- src/zbeacon.c
-+++ src/zbeacon.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zbeacon - LAN discovery and presence
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zcertstore.c b/src/zcertstore.c
-index e060fe5..3dea7ca 100644
---- src/zcertstore.c
-+++ src/zcertstore.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zcertstore - work with CURVE security certificate stores
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zchunk.c b/src/zchunk.c
-index b0eb870..f9b3028 100644
---- src/zchunk.c
-+++ src/zchunk.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zchunk - work with memory chunks
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zconfig.c b/src/zconfig.c
-index 8456422..9b30e4b 100644
---- src/zconfig.c
-+++ src/zconfig.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zconfig - work with config files written in rfc.zeromq.org/spec:4/ZPL.
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zdir.c b/src/zdir.c
-index b328799..6e4710c 100644
---- src/zdir.c
-+++ src/zdir.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zdir - work with file-system directories
- 
-     -------------------------------------------------------------------------
-diff --git a/src/zdir_patch.c b/src/zdir_patch.c
-index d0931ed..a87c46e 100644
---- src/zdir_patch.c
-+++ src/zdir_patch.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zdir_patch - work with directory patches
-     A patch is a change to the directory (create/delete).
- 
-diff --git a/src/zfile.c b/src/zfile.c
-index a4e47f3..1167c44 100644
---- src/zfile.c
-+++ src/zfile.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zfile - provides methods to work with files in a portable fashion.
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zframe.c b/src/zframe.c
-index ab92e63..f92169a 100644
---- src/zframe.c
-+++ src/zframe.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zframe - working with single message frames
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zhash.c b/src/zhash.c
-index 625ae20..647d27e 100644
---- src/zhash.c
-+++ src/zhash.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zhash - simple generic hash container
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zhashx.c b/src/zhashx.c
-index 74485a4..b3c91d1 100644
---- src/zhashx.c
-+++ src/zhashx.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zhashx - extended generic hash container
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zlistx.c b/src/zlistx.c
-index e88f94d..9798655 100644
---- src/zlistx.c
-+++ src/zlistx.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zlistx - extended generic list container
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zmonitor.c b/src/zmonitor.c
-index 413d9f6..54f572c 100644
---- src/zmonitor.c
-+++ src/zmonitor.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zmonitor - socket event monitor
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zmsg.c b/src/zmsg.c
-index ddf8175..5cd2524 100644
---- src/zmsg.c
-+++ src/zmsg.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zmsg - working with multipart messages
- 
-     -------------------------------------------------------------------------
-diff --git a/src/zpoller.c b/src/zpoller.c
-index 0c3907f..8268387 100644
---- src/zpoller.c
-+++ src/zpoller.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zpoller - trivial socket poller class
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zproxy.c b/src/zproxy.c
-index 1e9f212..8d2e273 100644
---- src/zproxy.c
-+++ src/zproxy.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zproxy - run a steerable proxy in the background
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zsock.c b/src/zsock.c
-index a236f4b..9fcf4ed 100644
---- src/zsock.c
-+++ src/zsock.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zsock - high-level socket API that hides libzmq contexts and sockets
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zstr.c b/src/zstr.c
-index 968ca31..24971f4 100644
---- src/zstr.c
-+++ src/zstr.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zstr - sending and receiving strings
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
-diff --git a/src/zsys.c b/src/zsys.c
-index 4d0bb8a..fd91804 100644
---- src/zsys.c
-+++ src/zsys.c
-@@ -1,4 +1,4 @@
--/*  =========================================================================
-+/*  =========================================================================
-     zsys - system-level methods
- 
-     Copyright (c) the Contributors as noted in the AUTHORS file.
diff --git a/net/czmq/files/patch-doc_Makefile.am b/net/czmq/files/patch-doc_Makefile.am
deleted file mode 100644
index 3b8a7c62a9ea..000000000000
--- a/net/czmq/files/patch-doc_Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# From 70a01b00cebcc4fbec0ffe31c26447d3810f488f Mon Sep 17 00:00:00 2001
-# From: Pieter Hintjens <ph@imatix.com>
-# Date: Tue, 16 Jun 2015 12:18:51 +0200
-# Subject: [PATCH] Problem: does not install man pages if BUILD_DOC is off
-# https://github.com/zeromq/czmq/pull/1027
-
---- doc/Makefile.am.orig	2015-06-16 08:02:24 UTC
-+++ doc/Makefile.am
-@@ -13,11 +13,12 @@ MAN_TXT += $(MAN7:%.7=%.txt)
- 
- EXTRA_DIST = asciidoc.conf $(MAN_TXT)
- 
--if BUILD_DOC
- if INSTALL_MAN
- dist_man_MANS = $(MAN_DOC)
- endif
- 
-+if BUILD_DOC
-+
- MAINTAINERCLEANFILES = $(MAN_DOC)
- 
- dist-hook : $(MAN_DOC)
diff --git a/net/czmq/pkg-plist b/net/czmq/pkg-plist
index f61b2e0993a6..5669d05692a2 100644
--- a/net/czmq/pkg-plist
+++ b/net/czmq/pkg-plist
@@ -1,22 +1,19 @@
-bin/makecert
-include/czmq.h
+bin/zmakecert
 include/czmq_library.h
 include/czmq_prelude.h
+include/czmq.h
 include/zactor.h
 include/zarmour.h
 include/zauth.h
-include/zauth_v2.h
 include/zbeacon.h
-include/zbeacon_v2.h
 include/zcert.h
 include/zcertstore.h
 include/zchunk.h
 include/zclock.h
 include/zconfig.h
-include/zctx.h
 include/zdigest.h
-include/zdir.h
 include/zdir_patch.h
+include/zdir.h
 include/zfile.h
 include/zframe.h
 include/zgossip.h
@@ -27,65 +24,47 @@ include/zlist.h
 include/zlistx.h
 include/zloop.h
 include/zmonitor.h
-include/zmonitor_v2.h
 include/zmsg.h
-include/zmutex.h
 include/zpoller.h
 include/zproxy.h
-include/zproxy_v2.h
 include/zrex.h
 include/zsock.h
-include/zsock_option.h
-include/zsocket.h
-include/zsockopt.h
 include/zstr.h
 include/zsys.h
-include/zthread.h
 include/zuuid.h
 lib/libczmq.a
 lib/libczmq.so
-lib/libczmq.so.3
-lib/libczmq.so.3.0.0
+lib/libczmq.so.4
+lib/libczmq.so.4.1.1
 libdata/pkgconfig/libczmq.pc
-man/man1/makecert.1.gz
-man/man3/zactor.3.gz
-man/man3/zarmour.3.gz
-man/man3/zauth.3.gz
-man/man3/zauth_v2.3.gz
-man/man3/zbeacon.3.gz
-man/man3/zbeacon_v2.3.gz
-man/man3/zcert.3.gz
-man/man3/zcertstore.3.gz
-man/man3/zchunk.3.gz
-man/man3/zclock.3.gz
-man/man3/zconfig.3.gz
-man/man3/zctx.3.gz
-man/man3/zdigest.3.gz
-man/man3/zdir.3.gz
-man/man3/zdir_patch.3.gz
-man/man3/zfile.3.gz
-man/man3/zframe.3.gz
-man/man3/zgossip.3.gz
-man/man3/zhash.3.gz
-man/man3/zhashx.3.gz
-man/man3/ziflist.3.gz
-man/man3/zlist.3.gz
-man/man3/zlistx.3.gz
-man/man3/zloop.3.gz
-man/man3/zmonitor.3.gz
-man/man3/zmonitor_v2.3.gz
-man/man3/zmsg.3.gz
-man/man3/zmutex.3.gz
-man/man3/zpoller.3.gz
-man/man3/zproxy.3.gz
-man/man3/zproxy_v2.3.gz
-man/man3/zrex.3.gz
-man/man3/zsock.3.gz
-man/man3/zsock_option.3.gz
-man/man3/zsocket.3.gz
-man/man3/zsockopt.3.gz
-man/man3/zstr.3.gz
-man/man3/zsys.3.gz
-man/man3/zthread.3.gz
-man/man3/zuuid.3.gz
-man/man7/czmq.7.gz
+share/zproject/czmq/python_cffi.slurp
+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
+share/zproject/czmq/zchunk.api
+share/zproject/czmq/zclock.api
+share/zproject/czmq/zconfig.api
+share/zproject/czmq/zdigest.api
+share/zproject/czmq/zdir_patch.api
+share/zproject/czmq/zdir.api
+share/zproject/czmq/zfile.api
+share/zproject/czmq/zframe.api
+share/zproject/czmq/zgossip_msg.api
+share/zproject/czmq/zhash.api
+share/zproject/czmq/zhashx.api
+share/zproject/czmq/ziflist.api
+share/zproject/czmq/zlist.api
+share/zproject/czmq/zlistx.api
+share/zproject/czmq/zloop.api
+share/zproject/czmq/zmsg.api
+share/zproject/czmq/zpoller.api
+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