net/libzmq4: Update version 4.3.4=>4.3.5

- Relicensed from LGPL30+ to MPL20

Changelog: https://github.com/zeromq/libzmq/releases/tag/v4.3.5

4 files changed, 91 insertions, 106 deletions

diff --git a/net/libzmq4/Makefile b/net/libzmq4/Makefile
index 54e3db50c773..b5f02d5c32ea 100644
--- a/net/libzmq4/Makefile
+++ b/net/libzmq4/Makefile
@@ -1,41 +1,35 @@
 PORTNAME=	libzmq4
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.3.4
+DISTVERSION=	4.3.5
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/zeromq/libzmq/releases/download/${DISTVERSIONFULL}/
 DISTNAME=	zeromq-${DISTVERSION}
 
-PATCH_SITES=	https://github.com/zeromq/libzmq/commit/
-PATCHFILES=	438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch:-p1
-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	ZeroMQ core library (Version 4)
 WWW=		https://www.zeromq.org/
 
-LICENSE=	LGPL3
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake libtool pkgconfig
+USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-silent-rules \
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+			--disable-silent-rules \
 			--disable-Werror \
-			--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+			--mandir=${PREFIX}/share/man
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-CFLAGS+=	-Wno-long-long
-
 CONFLICTS=	libzmq[^4] zmq
 
-OPTIONS_DEFINE=			LIBUNWIND MANPAGES STATIC
-OPTIONS_DEFAULT=		MANPAGES NORM PGM TWEETNACL STATIC
+OPTIONS_DEFINE=			CURVE LIBUNWIND MANPAGES STATIC
+OPTIONS_DEFAULT=		MANPAGES NORM PGM CURVE STATIC
 OPTIONS_GROUP=			MULTICAST
 OPTIONS_GROUP_MULTICAST=	NORM PGM
-OPTIONS_RADIO=			CURVE
-OPTIONS_RADIO_CURVE=		SODIUM TWEETNACL
 OPTIONS_SUB=			yes
 
 CURVE_DESC=	CURVE security backend
@@ -43,23 +37,19 @@ LIBUNWIND_DESC=	Use libunwind to print stack trace in case of error
 MULTICAST_DESC=	Reliable Multicast Transports
 NORM_DESC=	Enable NORM via NRL
 PGM_DESC=	Enable PGM transport via OpenPGM
-SODIUM_DESC=	Use libsodium
-TWEETNACL_DESC=	Use tweetnacl
 
+CURVE_LIB_DEPENDS=		libsodium.so:security/libsodium
+CURVE_CONFIGURE_OFF=	--disable-curve
+CURVE_CONFIGURE_WITH=		libsodium
+CURVE_PLIST_FILES=		bin/curve_keygen
 LIBUNWIND_LIB_DEPENDS=		libunwind.so:devel/libunwind
 LIBUNWIND_CONFIGURE_ENABLE=	libunwind
-MANPAGES_BUILD_DEPENDS=		asciidoc:textproc/asciidoc \
-				xmlto:textproc/xmlto
-MANPAGES_CONFIGURE_WITH=	docs
 NORM_LIB_DEPENDS=		libnorm.so:net/norm
 NORM_CONFIGURE_WITH=		norm=${PREFIX}
 PGM_LIB_DEPENDS=		libpgm.so:net/openpgm
 PGM_CONFIGURE_WITH=		pgm
-SODIUM_LIB_DEPENDS=		libsodium.so:security/libsodium
-SODIUM_CONFIGURE_WITH=		libsodium
-SODIUM_PLIST_FILES=		bin/curve_keygen
+
 STATIC_CONFIGURE_OFF=		--disable-static
-TWEETNACL_PLIST_FILES=		bin/curve_keygen
 
 .include <bsd.port.options.mk>
 
@@ -67,8 +57,4 @@ TWEETNACL_PLIST_FILES=		bin/curve_keygen
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if !${PORT_OPTIONS:MSODIUM} && !${PORT_OPTIONS:MTWEETNACL}
-CONFIGURE_ARGS+=	--disable-curve
-.endif
-
 .include <bsd.port.mk>
diff --git a/net/libzmq4/distinfo b/net/libzmq4/distinfo
index 0fdbb7d01440..c882e05b278e 100644
--- a/net/libzmq4/distinfo
+++ b/net/libzmq4/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1686062378
-SHA256 (zeromq-4.3.4.tar.gz) = c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
-SIZE (zeromq-4.3.4.tar.gz) = 2486520
-SHA256 (438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch) = 08f8068e109225ff628f9205597b917f633f02bc0be9382b06fbd98b0de2f8a0
-SIZE (438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch) = 3537
+TIMESTAMP = 1705052315
+SHA256 (zeromq-4.3.5.tar.gz) = 6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
+SIZE (zeromq-4.3.5.tar.gz) = 2530237
diff --git a/net/libzmq4/files/patch-tests_testutil.hpp b/net/libzmq4/files/patch-tests_testutil.hpp
index 4b303062d057..537995538357 100644
--- a/net/libzmq4/files/patch-tests_testutil.hpp
+++ b/net/libzmq4/files/patch-tests_testutil.hpp
@@ -1,6 +1,6 @@
---- tests/testutil.hpp.orig	2021-01-03 21:46:02 UTC
+--- tests/testutil.hpp.orig	2023-06-18 14:40:34 UTC
 +++ tests/testutil.hpp
-@@ -45,6 +45,8 @@
+@@ -23,6 +23,8 @@
  #include <arpa/inet.h>
  #include <unistd.h>
  #include <stdlib.h>
diff --git a/net/libzmq4/pkg-plist b/net/libzmq4/pkg-plist
index 6c715f8f53ab..19418efd2940 100644
--- a/net/libzmq4/pkg-plist
+++ b/net/libzmq4/pkg-plist
@@ -3,74 +3,75 @@ include/zmq.h
 %%STATIC%%lib/libzmq.a
 lib/libzmq.so
 lib/libzmq.so.5
-lib/libzmq.so.5.2.4
+lib/libzmq.so.5.2.5
 libdata/pkgconfig/libzmq.pc
-%%MANPAGES%%man/man3/zmq_atomic_counter_dec.3.gz
-%%MANPAGES%%man/man3/zmq_atomic_counter_destroy.3.gz
-%%MANPAGES%%man/man3/zmq_atomic_counter_inc.3.gz
-%%MANPAGES%%man/man3/zmq_atomic_counter_new.3.gz
-%%MANPAGES%%man/man3/zmq_atomic_counter_set.3.gz
-%%MANPAGES%%man/man3/zmq_atomic_counter_value.3.gz
-%%MANPAGES%%man/man3/zmq_bind.3.gz
-%%MANPAGES%%man/man3/zmq_close.3.gz
-%%MANPAGES%%man/man3/zmq_connect.3.gz
-%%MANPAGES%%man/man3/zmq_connect_peer.3.gz
-%%MANPAGES%%man/man3/zmq_ctx_get.3.gz
-%%MANPAGES%%man/man3/zmq_ctx_new.3.gz
-%%MANPAGES%%man/man3/zmq_ctx_set.3.gz
-%%MANPAGES%%man/man3/zmq_ctx_shutdown.3.gz
-%%MANPAGES%%man/man3/zmq_ctx_term.3.gz
-%%MANPAGES%%man/man3/zmq_curve_keypair.3.gz
-%%MANPAGES%%man/man3/zmq_curve_public.3.gz
-%%MANPAGES%%man/man3/zmq_disconnect.3.gz
-%%MANPAGES%%man/man3/zmq_errno.3.gz
-%%MANPAGES%%man/man3/zmq_getsockopt.3.gz
-%%MANPAGES%%man/man7/zmq_gssapi.7.gz
-%%MANPAGES%%man/man3/zmq_has.3.gz
-%%MANPAGES%%man/man3/zmq_msg_close.3.gz
-%%MANPAGES%%man/man3/zmq_msg_copy.3.gz
-%%MANPAGES%%man/man3/zmq_msg_data.3.gz
-%%MANPAGES%%man/man3/zmq_msg_get.3.gz
-%%MANPAGES%%man/man3/zmq_msg_gets.3.gz
-%%MANPAGES%%man/man3/zmq_msg_init.3.gz
-%%MANPAGES%%man/man3/zmq_msg_init_buffer.3.gz
-%%MANPAGES%%man/man3/zmq_msg_init_data.3.gz
-%%MANPAGES%%man/man3/zmq_msg_init_size.3.gz
-%%MANPAGES%%man/man3/zmq_msg_more.3.gz
-%%MANPAGES%%man/man3/zmq_msg_move.3.gz
-%%MANPAGES%%man/man3/zmq_msg_recv.3.gz
-%%MANPAGES%%man/man3/zmq_msg_routing_id.3.gz
-%%MANPAGES%%man/man3/zmq_msg_send.3.gz
-%%MANPAGES%%man/man3/zmq_msg_set.3.gz
-%%MANPAGES%%man/man3/zmq_msg_set_routing_id.3.gz
-%%MANPAGES%%man/man3/zmq_msg_size.3.gz
-%%MANPAGES%%man/man3/zmq_poll.3.gz
-%%MANPAGES%%man/man3/zmq_poller.3.gz
-%%MANPAGES%%man/man3/zmq_proxy.3.gz
-%%MANPAGES%%man/man3/zmq_proxy_steerable.3.gz
-%%MANPAGES%%man/man3/zmq_recv.3.gz
-%%MANPAGES%%man/man3/zmq_recvmsg.3.gz
-%%MANPAGES%%man/man3/zmq_send.3.gz
-%%MANPAGES%%man/man3/zmq_send_const.3.gz
-%%MANPAGES%%man/man3/zmq_sendmsg.3.gz
-%%MANPAGES%%man/man3/zmq_setsockopt.3.gz
-%%MANPAGES%%man/man3/zmq_socket.3.gz
-%%MANPAGES%%man/man3/zmq_socket_monitor.3.gz
-%%MANPAGES%%man/man3/zmq_socket_monitor_versioned.3.gz
-%%MANPAGES%%man/man3/zmq_strerror.3.gz
-%%MANPAGES%%man/man3/zmq_timers.3.gz
-%%MANPAGES%%man/man3/zmq_unbind.3.gz
-%%MANPAGES%%man/man3/zmq_version.3.gz
-%%MANPAGES%%man/man3/zmq_z85_decode.3.gz
-%%MANPAGES%%man/man3/zmq_z85_encode.3.gz
-%%MANPAGES%%man/man7/zmq_curve.7.gz
-%%MANPAGES%%man/man7/zmq_inproc.7.gz
-%%MANPAGES%%man/man7/zmq_ipc.7.gz
-%%MANPAGES%%man/man7/zmq_null.7.gz
-%%MANPAGES%%man/man7/zmq_pgm.7.gz
-%%MANPAGES%%man/man7/zmq_plain.7.gz
-%%MANPAGES%%man/man7/zmq_tcp.7.gz
-%%MANPAGES%%man/man7/zmq_tipc.7.gz
-%%MANPAGES%%man/man7/zmq_udp.7.gz
-%%MANPAGES%%man/man7/zmq_vmci.7.gz
-%%MANPAGES%%man/man7/zmq.7.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_dec.3.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_destroy.3.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_inc.3.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_new.3.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_set.3.gz
+%%MANPAGES%%share/man/man3/zmq_atomic_counter_value.3.gz
+%%MANPAGES%%share/man/man3/zmq_bind.3.gz
+%%MANPAGES%%share/man/man3/zmq_close.3.gz
+%%MANPAGES%%share/man/man3/zmq_connect.3.gz
+%%MANPAGES%%share/man/man3/zmq_connect_peer.3.gz
+%%MANPAGES%%share/man/man3/zmq_ctx_get.3.gz
+%%MANPAGES%%share/man/man3/zmq_ctx_new.3.gz
+%%MANPAGES%%share/man/man3/zmq_ctx_set.3.gz
+%%MANPAGES%%share/man/man3/zmq_ctx_shutdown.3.gz
+%%MANPAGES%%share/man/man3/zmq_ctx_term.3.gz
+%%MANPAGES%%share/man/man3/zmq_curve_keypair.3.gz
+%%MANPAGES%%share/man/man3/zmq_curve_public.3.gz
+%%MANPAGES%%share/man/man3/zmq_disconnect.3.gz
+%%MANPAGES%%share/man/man3/zmq_errno.3.gz
+%%MANPAGES%%share/man/man3/zmq_getsockopt.3.gz
+%%MANPAGES%%share/man/man7/zmq_gssapi.7.gz
+%%MANPAGES%%share/man/man3/zmq_has.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_close.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_copy.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_data.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_get.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_gets.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_init.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_init_buffer.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_init_data.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_init_size.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_more.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_move.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_recv.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_routing_id.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_send.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_set.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_set_routing_id.3.gz
+%%MANPAGES%%share/man/man3/zmq_msg_size.3.gz
+%%MANPAGES%%share/man/man3/zmq_poll.3.gz
+%%MANPAGES%%share/man/man3/zmq_poller.3.gz
+%%MANPAGES%%share/man/man3/zmq_proxy.3.gz
+%%MANPAGES%%share/man/man3/zmq_proxy_steerable.3.gz
+%%MANPAGES%%share/man/man3/zmq_recv.3.gz
+%%MANPAGES%%share/man/man3/zmq_recvmsg.3.gz
+%%MANPAGES%%share/man/man3/zmq_send.3.gz
+%%MANPAGES%%share/man/man3/zmq_send_const.3.gz
+%%MANPAGES%%share/man/man3/zmq_sendmsg.3.gz
+%%MANPAGES%%share/man/man3/zmq_setsockopt.3.gz
+%%MANPAGES%%share/man/man3/zmq_socket.3.gz
+%%MANPAGES%%share/man/man3/zmq_socket_monitor.3.gz
+%%MANPAGES%%share/man/man3/zmq_socket_monitor_versioned.3.gz
+%%MANPAGES%%share/man/man3/zmq_strerror.3.gz
+%%MANPAGES%%share/man/man3/zmq_timers.3.gz
+%%MANPAGES%%share/man/man3/zmq_unbind.3.gz
+%%MANPAGES%%share/man/man3/zmq_version.3.gz
+%%MANPAGES%%share/man/man3/zmq_z85_decode.3.gz
+%%MANPAGES%%share/man/man3/zmq_z85_encode.3.gz
+%%MANPAGES%%share/man/man3/zmq_ppoll.3.gz
+%%MANPAGES%%share/man/man7/zmq_curve.7.gz
+%%MANPAGES%%share/man/man7/zmq_inproc.7.gz
+%%MANPAGES%%share/man/man7/zmq_ipc.7.gz
+%%MANPAGES%%share/man/man7/zmq_null.7.gz
+%%MANPAGES%%share/man/man7/zmq_pgm.7.gz
+%%MANPAGES%%share/man/man7/zmq_plain.7.gz
+%%MANPAGES%%share/man/man7/zmq_tcp.7.gz
+%%MANPAGES%%share/man/man7/zmq_tipc.7.gz
+%%MANPAGES%%share/man/man7/zmq_udp.7.gz
+%%MANPAGES%%share/man/man7/zmq_vmci.7.gz
+%%MANPAGES%%share/man/man7/zmq.7.gz