net/nmsg: upgrade to version 1.0.0

  The network encapsulation library, nmsg, version 1.0.0 is released.
  This release deprecates Crossroads I/O (libxs) support in favor of
  ZeroMQ (libzmq). Note command-line updates enabling ZeroMQ socket
  connections for nmsgtool, as described in its man page. In addition
  the treatment of unknown rrtypes was amended for nmsgtool JSON
  output. In detail:

    Replace libXS with ZeroMQ and associated calls.

    Developer API functions nmsg_input_open_xs(),
    nmsg_input_open_xs_endpoint(), nmsg_io_add_input_xs_channel(),
    nmsg_output_open_xs(), and nmsg_output_open_xs_endpoint() are
    deprecated and replaced with respectively: nmsg_input_open_zmq(),
    nmsg_input_open_zmq_endpoint(), nmsg_io_add_input_zmq_channel(),
    nmsg_output_open_zmq(), and nmsg_output_open_zmq_endpoint().

    Update nmsgtool command-line options: --readzchan replaces --readzsock,
    --writezsock replaces --writexsock, --readzsock replaces --readxsock.

    Change format of unknown rrtypes in nmsgtool JSON output to "TYPE"
    followed by number.

Expose --without-yajl and --without-libzmq configure flags as port options.

This upgrade changes the libnmsg.so version number, bump PORTREVISION
of the dependent ports.

Sponsored by:	Farsight Security, Inc.

8 files changed, 21 insertions, 14 deletions

diff --git a/dns/dnstable-convert/Makefile b/dns/dnstable-convert/Makefile
index e31fb15327be..38855790c5e1 100644
--- a/dns/dnstable-convert/Makefile
+++ b/dns/dnstable-convert/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	dnstable-convert
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 
diff --git a/net/axa/Makefile b/net/axa/Makefile
index fe3a6b428c44..825adef4abf8 100644
--- a/net/axa/Makefile
+++ b/net/axa/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	axa
 PORTVERSION=	2.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net dns
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 
diff --git a/net/nmsg/Makefile b/net/nmsg/Makefile
index 9846df0e75f6..0b244f4cd237 100644
--- a/net/nmsg/Makefile
+++ b/net/nmsg/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	nmsg
-PORTVERSION=	0.15.1
-PORTREVISION=	1
+PORTVERSION=	1.0.0
+PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 
@@ -11,9 +11,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c \
-		libxs.so:devel/libxs \
-		libwdns.so:dns/wdns \
-		libyajl.so:devel/yajl
+		libwdns.so:dns/wdns
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pathfix pkgconfig
@@ -25,11 +23,16 @@ PORTDOCS=	*
 
 # The DOXYGEN option is best effort.
 # If doxygen is installed, it will get used if the option is set to NO.
-OPTIONS_DEFINE=		DOXYGEN EXAMPLES MANPAGES DOCS
-OPTIONS_DEFAULT=	DOXYGEN MANPAGES
+OPTIONS_DEFINE=		YAJL ZEROMQ DOXYGEN EXAMPLES MANPAGES DOCS
+OPTIONS_DEFAULT=	YAJL ZEROMQ DOXYGEN MANPAGES
 OPTIONS_SUB=		yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include/yajl
+YAJL_DESC=		JSON support via libyajl
+YAJL_CONFIGURE_WITH=	yajl
+YAJL_LIB_DEPENDS=	libyajl.so:devel/yajl
+ZEROMQ_DESC=		ZeroMQ support
+ZEROMQ_CONFIGURE_WITH=	libzmq
+ZEROMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 
 ALL_TARGET=	all
 DOXYGEN_IMPLIES=	DOCS
diff --git a/net/nmsg/distinfo b/net/nmsg/distinfo
index 93212cd6d095..30dfba3953dd 100644
--- a/net/nmsg/distinfo
+++ b/net/nmsg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580336193
-SHA256 (nmsg-0.15.1.tar.gz) = 073f3eefb3b53a9f0bf0f6b4dfe42ca179591bd6bbdbc154d927e52d9fd3b350
-SIZE (nmsg-0.15.1.tar.gz) = 662964
+TIMESTAMP = 1631820282
+SHA256 (nmsg-1.0.0.tar.gz) = 4999bba3cc84e43c4353210e015c9f80efb2d15812b4169ae6db2c1dd29888d3
+SIZE (nmsg-1.0.0.tar.gz) = 663438
diff --git a/net/nmsg/pkg-plist b/net/nmsg/pkg-plist
index d28692a68449..238f89542ceb 100644
--- a/net/nmsg/pkg-plist
+++ b/net/nmsg/pkg-plist
@@ -44,8 +44,8 @@ include/nmsg/version.h
 include/nmsg/zbuf.h
 lib/libnmsg.a
 lib/libnmsg.so
-lib/libnmsg.so.6
-lib/libnmsg.so.6.1.0
+lib/libnmsg.so.8
+lib/libnmsg.so.8.0.0
 lib/nmsg/nmsg_flt1_sample.so
 lib/nmsg/nmsg_msg9_base.so
 libdata/pkgconfig/libnmsg.pc
diff --git a/net/p5-Net-Nmsg/Makefile b/net/p5-Net-Nmsg/Makefile
index ca46a4a4eb92..bec40cc58e15 100644
--- a/net/p5-Net-Nmsg/Makefile
+++ b/net/p5-Net-Nmsg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	Net-Nmsg
 PORTVERSION=	0.17
+PORTREVISION=	1
 CATEGORIES=	net perl5
 MASTER_SITES=	https://tools.netsa.cert.org/confluence/download/attachments/12320770/ \
 		CPAN
diff --git a/net/py-pynmsg/Makefile b/net/py-pynmsg/Makefile
index cc2c4df3794a..4fbf6fc93218 100644
--- a/net/py-pynmsg/Makefile
+++ b/net/py-pynmsg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	pynmsg
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/sie-nmsg/Makefile b/net/sie-nmsg/Makefile
index 379039d4ea1b..615e66b64010 100644
--- a/net/sie-nmsg/Makefile
+++ b/net/sie-nmsg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sie-nmsg
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net dns
 MASTER_SITES=	FARSIGHT LOCAL/truckman/farsight