diff --git a/net/nanomsg/Makefile b/net/nanomsg/Makefile
index 4858fa6ce94c..5a567bc18a7c 100644
--- a/net/nanomsg/Makefile
+++ b/net/nanomsg/Makefile
@@ -1,27 +1,24 @@
 PORTNAME=	nanomsg
 PORTVERSION=	1.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	crest@bultmann.eu
 COMMENT=	Socket library that provides several common communication patterns
 WWW=		https://nanomsg.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake pathfix
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	MANPAGES
+OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
-DOCS_DESC=	Build and/or install HTML and manpages
-
-DOCS_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
-DOCS_CMAKE_BOOL=	NN_ENABLE_DOC
+MANPAGES_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor
+MANPAGES_CMAKE_BOOL=	NN_ENABLE_DOC
 
 .include <bsd.port.mk>
diff --git a/net/nanomsg/pkg-plist b/net/nanomsg/pkg-plist
index 1ebf0300a862..b8493ba6befb 100644
--- a/net/nanomsg/pkg-plist
+++ b/net/nanomsg/pkg-plist
@@ -1,56 +1,56 @@
 bin/nanocat
 include/nanomsg/bus.h
 include/nanomsg/inproc.h
 include/nanomsg/ipc.h
 include/nanomsg/nn.h
 include/nanomsg/pair.h
 include/nanomsg/pipeline.h
 include/nanomsg/pubsub.h
 include/nanomsg/reqrep.h
 include/nanomsg/survey.h
 include/nanomsg/tcp.h
 include/nanomsg/ws.h
 lib/cmake/nanomsg-1.1.5/nanomsg-config-version.cmake
 lib/cmake/nanomsg-1.1.5/nanomsg-config.cmake
 lib/cmake/nanomsg-1.1.5/nanomsg-target-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/nanomsg-1.1.5/nanomsg-target.cmake
 lib/libnanomsg.so
 lib/libnanomsg.so.5
 lib/libnanomsg.so.5.1.0
 libdata/pkgconfig/nanomsg.pc
-%%DOCS%%share/man/man1/nanocat.1.gz
-%%DOCS%%share/man/man3/nn_allocmsg.3.gz
-%%DOCS%%share/man/man3/nn_bind.3.gz
-%%DOCS%%share/man/man3/nn_close.3.gz
-%%DOCS%%share/man/man3/nn_cmsg.3.gz
-%%DOCS%%share/man/man3/nn_connect.3.gz
-%%DOCS%%share/man/man3/nn_device.3.gz
-%%DOCS%%share/man/man3/nn_errno.3.gz
-%%DOCS%%share/man/man3/nn_freemsg.3.gz
-%%DOCS%%share/man/man3/nn_get_statistic.3.gz
-%%DOCS%%share/man/man3/nn_getsockopt.3.gz
-%%DOCS%%share/man/man3/nn_poll.3.gz
-%%DOCS%%share/man/man3/nn_reallocmsg.3.gz
-%%DOCS%%share/man/man3/nn_recv.3.gz
-%%DOCS%%share/man/man3/nn_recvmsg.3.gz
-%%DOCS%%share/man/man3/nn_send.3.gz
-%%DOCS%%share/man/man3/nn_sendmsg.3.gz
-%%DOCS%%share/man/man3/nn_setsockopt.3.gz
-%%DOCS%%share/man/man3/nn_shutdown.3.gz
-%%DOCS%%share/man/man3/nn_socket.3.gz
-%%DOCS%%share/man/man3/nn_strerror.3.gz
-%%DOCS%%share/man/man3/nn_symbol.3.gz
-%%DOCS%%share/man/man3/nn_symbol_info.3.gz
-%%DOCS%%share/man/man3/nn_term.3.gz
-%%DOCS%%share/man/man7/nanomsg.7.gz
-%%DOCS%%share/man/man7/nn_bus.7.gz
-%%DOCS%%share/man/man7/nn_env.7.gz
-%%DOCS%%share/man/man7/nn_inproc.7.gz
-%%DOCS%%share/man/man7/nn_ipc.7.gz
-%%DOCS%%share/man/man7/nn_pair.7.gz
-%%DOCS%%share/man/man7/nn_pipeline.7.gz
-%%DOCS%%share/man/man7/nn_pubsub.7.gz
-%%DOCS%%share/man/man7/nn_reqrep.7.gz
-%%DOCS%%share/man/man7/nn_survey.7.gz
-%%DOCS%%share/man/man7/nn_tcp.7.gz
-%%DOCS%%share/man/man7/nn_ws.7.gz
+%%MANPAGES%%share/man/man1/nanocat.1.gz
+%%MANPAGES%%share/man/man3/nn_allocmsg.3.gz
+%%MANPAGES%%share/man/man3/nn_bind.3.gz
+%%MANPAGES%%share/man/man3/nn_close.3.gz
+%%MANPAGES%%share/man/man3/nn_cmsg.3.gz
+%%MANPAGES%%share/man/man3/nn_connect.3.gz
+%%MANPAGES%%share/man/man3/nn_device.3.gz
+%%MANPAGES%%share/man/man3/nn_errno.3.gz
+%%MANPAGES%%share/man/man3/nn_freemsg.3.gz
+%%MANPAGES%%share/man/man3/nn_get_statistic.3.gz
+%%MANPAGES%%share/man/man3/nn_getsockopt.3.gz
+%%MANPAGES%%share/man/man3/nn_poll.3.gz
+%%MANPAGES%%share/man/man3/nn_reallocmsg.3.gz
+%%MANPAGES%%share/man/man3/nn_recv.3.gz
+%%MANPAGES%%share/man/man3/nn_recvmsg.3.gz
+%%MANPAGES%%share/man/man3/nn_send.3.gz
+%%MANPAGES%%share/man/man3/nn_sendmsg.3.gz
+%%MANPAGES%%share/man/man3/nn_setsockopt.3.gz
+%%MANPAGES%%share/man/man3/nn_shutdown.3.gz
+%%MANPAGES%%share/man/man3/nn_socket.3.gz
+%%MANPAGES%%share/man/man3/nn_strerror.3.gz
+%%MANPAGES%%share/man/man3/nn_symbol.3.gz
+%%MANPAGES%%share/man/man3/nn_symbol_info.3.gz
+%%MANPAGES%%share/man/man3/nn_term.3.gz
+%%MANPAGES%%share/man/man7/nanomsg.7.gz
+%%MANPAGES%%share/man/man7/nn_bus.7.gz
+%%MANPAGES%%share/man/man7/nn_env.7.gz
+%%MANPAGES%%share/man/man7/nn_inproc.7.gz
+%%MANPAGES%%share/man/man7/nn_ipc.7.gz
+%%MANPAGES%%share/man/man7/nn_pair.7.gz
+%%MANPAGES%%share/man/man7/nn_pipeline.7.gz
+%%MANPAGES%%share/man/man7/nn_pubsub.7.gz
+%%MANPAGES%%share/man/man7/nn_reqrep.7.gz
+%%MANPAGES%%share/man/man7/nn_survey.7.gz
+%%MANPAGES%%share/man/man7/nn_tcp.7.gz
+%%MANPAGES%%share/man/man7/nn_ws.7.gz