Update Nanomsg to version 1.0.0 the first stable release of Nanomsg.

Also bump PORTREVISION for mail/libmapi as it depend on it.

PR:		210669
Approved by:	koobs, Jan Bramkamp <crest@bultmann.eu> (maintainer)

3 files changed, 51 insertions, 81 deletions

diff --git a/net/nanomsg/Makefile b/net/nanomsg/Makefile
index bff0d474c209..c64984f21f3f 100644
--- a/net/nanomsg/Makefile
+++ b/net/nanomsg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=			nanomsg
-DISTVERSION=			0.8-beta
+PORTVERSION=			1.0.0
 CATEGORIES=			net
 
 MAINTAINER=			crest@bultmann.eu
@@ -13,36 +13,22 @@ LICENSE_FILE=			${WRKSRC}/COPYING
 USE_GITHUB=			yes
 GH_ACCOUNT=			nanomsg
 
-USES=				autoreconf libtool pathfix
+USES=				cmake pathfix
 USE_LDCONFIG=			yes
-GNU_CONFIGURE=			yes
-INSTALL_TARGET=			install-strip
 
-.if defined(BATCH) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=		--disable-silent-rules
-.endif
-CONFIGURE_ARGS+=		--datadir=${PREFIX}/libdata
-
-OPTIONS_DEFINE=			DOCS MANPAGES
-OPTIONS_DEFAULT=		MANPAGES
+OPTIONS_DEFINE=			DOCS
 OPTIONS_SUB=			yes
 
-DOCS_DESC=			Build and/or install HTML documentation
+DOCS_DESC=			Build and/or install HTML and manpages
 
-MANPAGES_BUILD_DEPENDS+=	asciidoc:textproc/asciidoc \
-				xmlto:textproc/xmlto
+DOCS_BUILD_DEPENDS=		asciidoctor:textproc/rubygem-asciidoctor
 
 .include <bsd.port.options.mk>
 
-# Avoid duplication
-.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ARGS+=	--enable-doc
-BUILD_DEPENDS+=		asciidoc:textproc/asciidoc \
-			xmlto:textproc/xmlto
+.if ${PORT_OPTIONS:MDOCS}
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:STRING=man
+.else
+CMAKE_ARGS+=	-DNN_ENABLE_DOC=OFF
 .endif
 
-post-extract:
-	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(datadir)/pkgconfig|' \
-		${WRKSRC}/Makefile.am
-
 .include <bsd.port.mk>
diff --git a/net/nanomsg/distinfo b/net/nanomsg/distinfo
index 4a4e0434db60..7d95de068288 100644
--- a/net/nanomsg/distinfo
+++ b/net/nanomsg/distinfo
@@ -1,2 +1,3 @@
-SHA256 (nanomsg-nanomsg-0.8-beta_GH0.tar.gz) = 148ac2a0075018051731f99a3e776ca564479edf79c8f884b743accc2029960e
-SIZE (nanomsg-nanomsg-0.8-beta_GH0.tar.gz) = 310928
+TIMESTAMP = 1467791608
+SHA256 (nanomsg-nanomsg-1.0.0_GH0.tar.gz) = 24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7
+SIZE (nanomsg-nanomsg-1.0.0_GH0.tar.gz) = 305040
diff --git a/net/nanomsg/pkg-plist b/net/nanomsg/pkg-plist
index 4583b03d6c26..1e2c11f1a110 100644
--- a/net/nanomsg/pkg-plist
+++ b/net/nanomsg/pkg-plist
@@ -1,15 +1,4 @@
 bin/nanocat
-bin/nn_bus
-bin/nn_pair
-bin/nn_pub
-bin/nn_pull
-bin/nn_push
-bin/nn_rep
-bin/nn_req
-bin/nn_respondent
-bin/nn_sub
-bin/nn_surveyor
-bin/tcpmuxd
 include/nanomsg/bus.h
 include/nanomsg/inproc.h
 include/nanomsg/ipc.h
@@ -20,50 +9,11 @@ include/nanomsg/pubsub.h
 include/nanomsg/reqrep.h
 include/nanomsg/survey.h
 include/nanomsg/tcp.h
-include/nanomsg/tcpmux.h
 include/nanomsg/ws.h
-lib/libnanomsg.a
 lib/libnanomsg.so
-lib/libnanomsg.so.4
-lib/libnanomsg.so.4.0.0
-libdata/pkgconfig/libnanomsg.pc
-%%MANPAGES%%man/man1/nanocat.1.gz
-%%MANPAGES%%man/man1/tcpmuxd.1.gz
-%%MANPAGES%%man/man3/nn_allocmsg.3.gz
-%%MANPAGES%%man/man3/nn_bind.3.gz
-%%MANPAGES%%man/man3/nn_close.3.gz
-%%MANPAGES%%man/man3/nn_cmsg.3.gz
-%%MANPAGES%%man/man3/nn_connect.3.gz
-%%MANPAGES%%man/man3/nn_device.3.gz
-%%MANPAGES%%man/man3/nn_errno.3.gz
-%%MANPAGES%%man/man3/nn_freemsg.3.gz
-%%MANPAGES%%man/man3/nn_getsockopt.3.gz
-%%MANPAGES%%man/man3/nn_poll.3.gz
-%%MANPAGES%%man/man3/nn_reallocmsg.3.gz
-%%MANPAGES%%man/man3/nn_recv.3.gz
-%%MANPAGES%%man/man3/nn_recvmsg.3.gz
-%%MANPAGES%%man/man3/nn_send.3.gz
-%%MANPAGES%%man/man3/nn_sendmsg.3.gz
-%%MANPAGES%%man/man3/nn_setsockopt.3.gz
-%%MANPAGES%%man/man3/nn_shutdown.3.gz
-%%MANPAGES%%man/man3/nn_socket.3.gz
-%%MANPAGES%%man/man3/nn_strerror.3.gz
-%%MANPAGES%%man/man3/nn_symbol.3.gz
-%%MANPAGES%%man/man3/nn_symbol_info.3.gz
-%%MANPAGES%%man/man3/nn_term.3.gz
-%%MANPAGES%%man/man7/nanomsg.7.gz
-%%MANPAGES%%man/man7/nn_bus.7.gz
-%%MANPAGES%%man/man7/nn_env.7.gz
-%%MANPAGES%%man/man7/nn_inproc.7.gz
-%%MANPAGES%%man/man7/nn_ipc.7.gz
-%%MANPAGES%%man/man7/nn_pair.7.gz
-%%MANPAGES%%man/man7/nn_pipeline.7.gz
-%%MANPAGES%%man/man7/nn_pubsub.7.gz
-%%MANPAGES%%man/man7/nn_reqrep.7.gz
-%%MANPAGES%%man/man7/nn_survey.7.gz
-%%MANPAGES%%man/man7/nn_tcp.7.gz
-%%MANPAGES%%man/man7/nn_tcpmux.7.gz
-%%MANPAGES%%man/man7/nn_ws.7.gz
+lib/libnanomsg.so.1.0.0
+lib/libnanomsg.so.5.0.0
+libdata/pkgconfig/nanomsg.pc
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nanocat.1.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nanomsg.7.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_allocmsg.3.html
@@ -76,6 +26,7 @@ libdata/pkgconfig/libnanomsg.pc
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_env.7.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_errno.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_freemsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_get_statistic.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_getsockopt.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_inproc.7.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_ipc.7.html
@@ -97,7 +48,39 @@ libdata/pkgconfig/libnanomsg.pc
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_symbol.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_symbol_info.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_tcp.7.html
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_tcpmux.7.html
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_term.3.html
 %%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_ws.7.html
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/tcpmuxd.1.html
+%%DOCS%%man/man1/nanocat.1.gz
+%%DOCS%%man/man3/nn_allocmsg.3.gz
+%%DOCS%%man/man3/nn_bind.3.gz
+%%DOCS%%man/man3/nn_close.3.gz
+%%DOCS%%man/man3/nn_cmsg.3.gz
+%%DOCS%%man/man3/nn_connect.3.gz
+%%DOCS%%man/man3/nn_device.3.gz
+%%DOCS%%man/man3/nn_errno.3.gz
+%%DOCS%%man/man3/nn_freemsg.3.gz
+%%DOCS%%man/man3/nn_get_statistic.3.gz
+%%DOCS%%man/man3/nn_getsockopt.3.gz
+%%DOCS%%man/man3/nn_poll.3.gz
+%%DOCS%%man/man3/nn_reallocmsg.3.gz
+%%DOCS%%man/man3/nn_recv.3.gz
+%%DOCS%%man/man3/nn_recvmsg.3.gz
+%%DOCS%%man/man3/nn_send.3.gz
+%%DOCS%%man/man3/nn_sendmsg.3.gz
+%%DOCS%%man/man3/nn_setsockopt.3.gz
+%%DOCS%%man/man3/nn_shutdown.3.gz
+%%DOCS%%man/man3/nn_socket.3.gz
+%%DOCS%%man/man3/nn_strerror.3.gz
+%%DOCS%%man/man3/nn_symbol.3.gz
+%%DOCS%%man/man3/nn_symbol_info.3.gz
+%%DOCS%%man/man7/nanomsg.7.gz
+%%DOCS%%man/man7/nn_bus.7.gz
+%%DOCS%%man/man7/nn_env.7.gz
+%%DOCS%%man/man7/nn_inproc.7.gz
+%%DOCS%%man/man7/nn_ipc.7.gz
+%%DOCS%%man/man7/nn_pair.7.gz
+%%DOCS%%man/man7/nn_pipeline.7.gz
+%%DOCS%%man/man7/nn_pubsub.7.gz
+%%DOCS%%man/man7/nn_reqrep.7.gz
+%%DOCS%%man/man7/nn_survey.7.gz
+%%DOCS%%man/man7/nn_tcp.7.gz
+%%DOCS%%man/man7/nn_ws.7.gz