3 files changed, 116 insertions, 23 deletions

diff --git a/net/nanomsg/Makefile b/net/nanomsg/Makefile
index b874fe73f993..ee5787af3050 100644
--- a/net/nanomsg/Makefile
+++ b/net/nanomsg/Makefile
@@ -1,32 +1,48 @@
 # $FreeBSD$
 
-PORTNAME=	nanomsg
-PORTVERSION=	0.5
-CATEGORIES=	net
-MASTER_SITES=	http://download.nanomsg.org/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-beta
+PORTNAME=			nanomsg
+DISTVERSION=			0.8-beta
+CATEGORIES=			net
 
-MAINTAINER=	crest@bultmann.eu
-COMMENT=	Socket library that provides several common communication patterns
+MAINTAINER=			crest@bultmann.eu
+COMMENT=			Socket library that provides several common communication patterns
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=			MIT
+LICENSE_FILE=			${WRKSRC}/COPYING
 
-USES=		libtool pathfix
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+USE_GITHUB=			yes
+GH_ACCOUNT=			nanomsg
+
+USES=				autoreconf libtool pathfix
+USE_LDCONFIG=			yes
+GNU_CONFIGURE=			yes
+INSTALL_TARGET=			install-strip
 
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--disable-silent-rules
+CONFIGURE_ARGS+=		--disable-silent-rules
 .endif
+CONFIGURE_ARGS+=		--datadir=${PREFIX}/libdata
+
+OPTIONS_DEFINE=			DOCS MANPAGES
+OPTIONS_DEFAULT=		DOCS MANPAGES
+OPTIONS_SUB=			yes
+
+DOCS_DESC=			Build and/or install HTML documentation
 
-PORTDOCS=	AUTHORS ChangeLog README
+MANPAGES_BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+				xmlto:${PORTSDIR}/textproc/xmlto
 
-OPTIONS_DEFINE=	DOCS
+.include <bsd.port.options.mk>
+
+# Avoid duplication
+.if ${PORT_OPTIONS:MDOCS} || ${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ARGS+=	--enable-doc
+BUILD_DEPENDS+=		asciidoc:${PORTSDIR}/textproc/asciidoc \
+			xmlto:${PORTSDIR}/textproc/xmlto
+.endif
 
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+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 baa7368969b9..4a4e0434db60 100644
--- a/net/nanomsg/distinfo
+++ b/net/nanomsg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nanomsg-0.5-beta.tar.gz) = 13bff7ae8f31957722ee62d50504ce1a0c590da908f8566f997e3e521abb089f
-SIZE (nanomsg-0.5-beta.tar.gz) = 623927
+SHA256 (nanomsg-nanomsg-0.8-beta_GH0.tar.gz) = 148ac2a0075018051731f99a3e776ca564479edf79c8f884b743accc2029960e
+SIZE (nanomsg-nanomsg-0.8-beta_GH0.tar.gz) = 310928
diff --git a/net/nanomsg/pkg-plist b/net/nanomsg/pkg-plist
index 752c61920865..4583b03d6c26 100644
--- a/net/nanomsg/pkg-plist
+++ b/net/nanomsg/pkg-plist
@@ -9,6 +9,7 @@ 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
@@ -19,8 +20,84 @@ 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.0
-lib/libnanomsg.so.0.2.1
+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
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nanocat.1.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nanomsg.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_allocmsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_bind.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_bus.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_close.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_cmsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_connect.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_device.3.html
+%%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_getsockopt.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_inproc.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_ipc.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_pair.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_pipeline.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_poll.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_pubsub.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_reallocmsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_recv.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_recvmsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_reqrep.7.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_send.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_sendmsg.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_setsockopt.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_shutdown.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_socket.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_strerror.3.html
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/nn_survey.7.html
+%%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