Remove NOPORTDOCS and NOPORTEXAMPLES.

37 files changed, 138 insertions, 127 deletions

diff --git a/net/despoof/Makefile b/net/despoof/Makefile
index 8110a2ef4b5b..30f505ed7c2e 100644
--- a/net/despoof/Makefile
+++ b/net/despoof/Makefile
@@ -16,6 +16,8 @@ BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-I$${LOCALBASE}/include ||; \
@@ -27,9 +29,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/despoof ${STAGEDIR}${PREFIX}/bin
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/dgd-kernel/Makefile b/net/dgd-kernel/Makefile
index e61b86f1055a..aee77b881da8 100644
--- a/net/dgd-kernel/Makefile
+++ b/net/dgd-kernel/Makefile
@@ -17,9 +17,9 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/dgd:${PORTSDIR}/net/dgd
 DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
@@ -41,10 +41,8 @@ do-install:
 		-e "s:%%DATADIR%%:${DATADIR}:" > \
 		${STAGEDIR}${PREFIX}/etc/rc.d/dgd-kernel.sh.sample
 	@${CHMOD} a+x ${STAGEDIR}${PREFIX}/etc/rc.d/dgd-kernel.sh.sample
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/kernellib && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
-.endif
 
 post-install:
 	@# Need a temporary directory for certain files
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 9ecd293b37ac..ea39bdf4985f 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -21,6 +21,8 @@ NO_CDROM=	${NO_PACKAGE}
 DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}/mud
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${CP} ${FILESDIR}/oconv.c ${WRKSRC}/
 	@${CP} ${FILESDIR}/Makefile.bin ${WRKSRC}/Makefile
@@ -48,10 +50,8 @@ do-install:
 		${STAGEDIR}${DATADIR}/lpmud/ACCESS.ALLOW.example
 	${MV} ${STAGEDIR}${DATADIR}/lpmud/ACCESS.DENY \
 		${STAGEDIR}${DATADIR}/lpmud/ACCESS.DENY.example
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 post-install:
 	# Need a temporary directory for certain files
diff --git a/net/drawterm/Makefile b/net/drawterm/Makefile
index 38c399ea92b8..7f334bb631cd 100644
--- a/net/drawterm/Makefile
+++ b/net/drawterm/Makefile
@@ -21,13 +21,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ARGS=	CONF=pthread
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/drawterm ${STAGEDIR}${PREFIX}/bin
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/README ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/glflow/Makefile b/net/glflow/Makefile
index 0a6840c506df..197680a107d1 100644
--- a/net/glflow/Makefile
+++ b/net/glflow/Makefile
@@ -16,14 +16,14 @@ PLIST_FILES=	bin/glflow
 PORTDOCS=	README
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 
+OPTIONS_DEFINE=	DOCS
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-debug --with-hash=md4
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glflow ${STAGEDIR}${PREFIX}/bin
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 3da707668e52..dbde341f3168 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -16,6 +16,8 @@ USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USES=		gmake
 
+OPTIONS_DEFINE=	DOCS
+
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet11-config
 
 post-patch:
@@ -31,9 +33,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gspoof ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/pixmap
 	${INSTALL_DATA} ${WRKSRC}/pixmap/icon.png ${STAGEDIR}${DATADIR}/pixmap
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/gwhois/Makefile b/net/gwhois/Makefile
index 3d4108ef2cb3..f6e775b9c2ea 100644
--- a/net/gwhois/Makefile
+++ b/net/gwhois/Makefile
@@ -24,18 +24,18 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/gwhois.1.gz %%DATADIR%%/pattern
 PLIST_DIRS=	%%DATADIR%%
 PORTDOCS=	TODO README.RIPE
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/gwhois|${DATADIR}|g'\
+	${REINPLACE_CMD} -e 's|/etc/gwhois|${DATADIR}|g'\
 		${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
-	@${INSTALL} -d ${STAGEDIR}${DATADIR}/
-	@${INSTALL_DATA} ${WRKSRC}/pattern ${STAGEDIR}${DATADIR}/
-.ifndef NOPORTDOCS
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}/
-	@cd ${WRKSRC}/&&${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/pattern ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/hidentd/Makefile b/net/hidentd/Makefile
index e227c1ae22ba..b1bf16430c22 100644
--- a/net/hidentd/Makefile
+++ b/net/hidentd/Makefile
@@ -14,12 +14,10 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	README
 PLIST_FILES=	man/man8/hidentd.8.gz sbin/hidentd
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index 1f64c083db02..ed39e4bb4ce8 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -11,18 +11,18 @@ COMMENT=	A Half-Life game master server daemon
 
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e 's|CXXFLAGS = -O2 -Wall||'
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/*.list ${STAGEDIR}${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/examples/woncomm.lst ${STAGEDIR}${EXAMPLESDIR}
-.endif #NOPORTDOCS
+	${INSTALL_DATA} ${WRKSRC}/examples/*.list ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/woncomm.lst ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/hlmaster/pkg-plist b/net/hlmaster/pkg-plist
index 2d6d84d37df3..756386d68ba7 100644
--- a/net/hlmaster/pkg-plist
+++ b/net/hlmaster/pkg-plist
@@ -4,8 +4,8 @@ man/man1/hlmaster.filter.1.gz
 man/man1/hlmaster.gameserver.1.gz
 man/man1/hlmaster.list.1.gz
 %%PORTDOCS%%share/doc/hlmaster/README
-%%PORTDOCS%%share/examples/hlmaster/filter.list
-%%PORTDOCS%%share/examples/hlmaster/server.list
-%%PORTDOCS%%share/examples/hlmaster/woncomm.lst
-%%PORTDOCS%%@dirrm share/examples/hlmaster
+%%PORTEXAMPLES%%share/examples/hlmaster/filter.list
+%%PORTEXAMPLES%%share/examples/hlmaster/server.list
+%%PORTEXAMPLES%%share/examples/hlmaster/woncomm.lst
+%%PORTEXAMPLES%%@dirrm share/examples/hlmaster
 %%PORTDOCS%%@dirrm share/doc/hlmaster
diff --git a/net/jakarta-commons-net/Makefile b/net/jakarta-commons-net/Makefile
index ee8c1ede1b5e..2497fe227c34 100644
--- a/net/jakarta-commons-net/Makefile
+++ b/net/jakarta-commons-net/Makefile
@@ -21,6 +21,8 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ARGS=	-cp ${JAVALIBDIR}/junit.jar -Dlibdir=${JAVALIBDIR} -Dnoget=""
 MAKE_ENV+=	LANG=C
@@ -31,7 +33,9 @@ ALL_TARGET=	dist
 ALL_TARGET=	compile test jar dist
 .endif
 
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	LICENSE.txt NOTICE.txt api
 ALL_TARGET+=	javadoc
 .endif
@@ -42,7 +46,7 @@ do-install:
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 	@${ECHO_MSG} " [DONE]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/dist/docs && ${FIND} api \
diff --git a/net/java-beepcore/Makefile b/net/java-beepcore/Makefile
index 20e49acc5847..4f21da85d308 100644
--- a/net/java-beepcore/Makefile
+++ b/net/java-beepcore/Makefile
@@ -18,6 +18,8 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/beep*.jar ${STAGEDIR}${JAVAJARDIR}
 	cd ${WRKSRC}/example \
@@ -26,9 +28,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/example.jar ${STAGEDIR}${EXAMPLESDIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.txt ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index 97acce81ebcd..e97501ac5570 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -24,6 +24,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	CHANGES ChangeLog README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ! empty(ICONV_LIB)
@@ -38,11 +40,9 @@ do-install:
 .for sample in ${SAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/samples/${sample} ${STAGEDIR}${DATADIR}/samples
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/luasocket/Makefile b/net/luasocket/Makefile
index f08d81df43aa..4cb5e7aeaeba 100644
--- a/net/luasocket/Makefile
+++ b/net/luasocket/Makefile
@@ -22,6 +22,8 @@ USES=		lua:51 gmake pkgconfig
 CFLAGS+=    `pkgconf --cflags lua-${LUA_VER}`
 LDFLAGS+=   -shared  `pkgconf --libs lua-${LUA_VER}`
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
 	@${MV} ${WRKSRC}/src/makefile ${WRKSRC}/src/Makefile
@@ -31,9 +33,7 @@ post-extract:
 	@${REINPLACE_CMD} -e 's/prefix/PREFIX/g' ${WRKSRC}/src/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}/${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/mopd/Makefile b/net/mopd/Makefile
index feaa393ca73a..90468142f370 100644
--- a/net/mopd/Makefile
+++ b/net/mopd/Makefile
@@ -7,10 +7,6 @@ PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
-.if !defined(NOPORTDOCS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		VAX-netboot-HOWTO VS3100-console-cmds.txt
-.endif
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
@@ -18,11 +14,20 @@ COMMENT=	MOP Loader Daemon for netbooting DEC machines
 
 MAKE_ENV=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man NO_MANCOMPRESS=true
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS} || make(makesum)
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		VAX-netboot-HOWTO VS3100-console-cmds.txt
+.endif
+
 do-configure:
 	@${REINPLACE_CMD} -e 's/MAN=/MAN8=/' ${WRKSRC}/mopd/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_MAN} ${DISTDIR}/VAX-netboot-HOWTO  \
 		${DISTDIR}/VS3100-console-cmds.txt ${STAGEDIR}${DOCSDIR}
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index f84ef21c9836..3cbd989dd5fb 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -33,14 +33,14 @@ SUB_FILES=	pkg_message
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 PKGMESSAGE=	${WRKDIR}/pkg_message
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${RM} -rf ${STAGEDIR}${LSTATEDIR}
 	(cd ${STAGEDIR}${PREFIX} \
 	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;})
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/nstxd/Makefile b/net/nstxd/Makefile
index 52eccdf53f4b..62a203091cdd 100644
--- a/net/nstxd/Makefile
+++ b/net/nstxd/Makefile
@@ -24,12 +24,12 @@ SUB_FILES=	pkg-message
 ALL_TARGET=	nstxd
 INSTALL_TARGET=	nstxd
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nstxd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/nstxd.8 ${STAGEDIR}${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
-.endif	#NOPORTDOCS
 
 .include <bsd.port.mk>
diff --git a/net/ntlmaps/Makefile b/net/ntlmaps/Makefile
index 0dcacd02c550..c511728c86a3 100644
--- a/net/ntlmaps/Makefile
+++ b/net/ntlmaps/Makefile
@@ -15,6 +15,8 @@ USES=		dos2unix
 
 DOCS=		COPYING Install.txt changelog.txt readme.txt research.txt
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 	    's,^#! /usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/main.py
@@ -25,12 +27,10 @@ do-build:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/examples/ntlmaps
 	${INSTALL_DATA} ${WRKSRC}/*.py* \
diff --git a/net/p5-POE-Component-Jabber/Makefile b/net/p5-POE-Component-Jabber/Makefile
index 327199355265..0698c6cf07fa 100644
--- a/net/p5-POE-Component-Jabber/Makefile
+++ b/net/p5-POE-Component-Jabber/Makefile
@@ -27,11 +27,11 @@ CONFIGURE_ARGS=	</dev/null
 
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/pen/Makefile b/net/pen/Makefile
index e9dac6a526d6..6e4da33a1dc5 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -10,30 +10,29 @@ MASTER_SITES=	ftp://siag.nu/pub/pen/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A load balancer for simple TCP based protocols
 
-GNU_CONFIGURE=		yes
-USE_OPENSSL=		yes
-USE_RC_SUBR=		pen
-CONFIGURE_ARGS=		--with-daemon --with-docdir=${DOCSDIR} \
-			--with-ssl=${OPENSSLBASE}
-
-PORTDOCS=		penstats HOWTO AUTHORS README ChangeLog COPYING
-PLIST_FILES=		bin/mergelogs bin/pen bin/penctl bin/penlog \
-			bin/penlogd man/man1/mergelogs.1.gz \
-			man/man1/pen.1.gz man/man1/penctl.1.gz \
-			man/man1/penlog.1.gz man/man1/penlogd.1.gz
+GNU_CONFIGURE=	yes
+USE_OPENSSL=	yes
+USE_RC_SUBR=	pen
+CONFIGURE_ARGS=	--with-daemon --with-docdir=${DOCSDIR} \
+		--with-ssl=${OPENSSLBASE}
+
+PORTDOCS=	penstats HOWTO AUTHORS README ChangeLog COPYING
+PLIST_FILES=	bin/mergelogs bin/pen bin/penctl bin/penlog \
+		bin/penlogd man/man1/mergelogs.1.gz \
+		man/man1/pen.1.gz man/man1/penctl.1.gz \
+		man/man1/penlog.1.gz man/man1/penlogd.1.gz
+
+OPTIONS_DEFINE=	DOCS KQUEUE
+OPTIONS_DEFAULT=KQUEUE
+KQUEUE_DESC=	Use kqueue backend
 
 .if defined(WITH_FDSETSIZE)
 CONFIGURE_ARGS+=	--with-fd_setsize=${WITH_FDSETSIZE}
 .endif
 
-.if defined(WITH_POLL)
-CONFIGURE_ARGS+=	--with-poll
-.else
-CONFIGURE_ARGS+=	--with-kqueue
-.endif
+KQUEUE_CONFIGURE_ON=	--with-kqueue
+KQUEUE_CONFIGURE_OFF=	--with-poll
 
-.if defined(NOPORTDOCS)
-MAKE_ARGS+=	-DNOPORTDOCS
-.endif
+DOCS_MAKE_ARGS=	-DNOPORTDOCS
 
 .include <bsd.port.mk>
diff --git a/net/phamm/Makefile b/net/phamm/Makefile
index 4e9e5199c215..e757ebac9744 100644
--- a/net/phamm/Makefile
+++ b/net/phamm/Makefile
@@ -23,6 +23,8 @@ PLIST_SUB=	PHAMMDIR=${PHAMMDIR}
 
 PORTDOCS=	CHANGELOG INSTALL README LICENSE THANKS
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 do-install:
@@ -35,11 +37,9 @@ do-install:
 	${EGREP} -v '(examples|cfg|schema|debian|server)'` ; do \
 		${CP} -Rv $$d ${STAGEDIR}${PREFIX}/${PHAMMDIR}; \
 	done;
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index a7a8fd1afd60..5b39c13500f5 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -16,18 +16,18 @@ USE_OPENSSL=	YES
 
 ALL_TARGET=	pipsecd
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pipsecd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/pipsecd.sh ${STAGEDIR}${PREFIX}/etc/rc.d
 	# ${CHMOD} 755 ${STAGEDIR}${PREFIX}/etc/rc.d/pipsecd.sh;
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ipsec
 	${INSTALL_DATA} ${WRKSRC}/pipsecd.conf.sample ${STAGEDIR}${PREFIX}/etc/ipsec
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 	${INSTALL_MAN} ${WRKSRC}/COPYRIGHT ${STAGEDIR}${PREFIX}/share/doc/pipsecd
 	${INSTALL_MAN} ${WRKSRC}/README.port ${STAGEDIR}${PREFIX}/share/doc/pipsecd
-.endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/pipsecd
diff --git a/net/prtunnel/Makefile b/net/prtunnel/Makefile
index 9f6b637ac939..3916ae22661f 100644
--- a/net/prtunnel/Makefile
+++ b/net/prtunnel/Makefile
@@ -14,16 +14,16 @@ ALL_TARGET=	${PORTNAME}
 PORTDOCS=	ChangeLog README
 PLIST_FILES=	bin/prtunnel man/man1/prtunnel.1.gz
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -E '/^(CC|CFLAGS|PREFIX)/d' \
 		${WRKSRC}/Makefile
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/pythondirector/Makefile b/net/pythondirector/Makefile
index 366fe54352f2..4a3bf8f961b8 100644
--- a/net/pythondirector/Makefile
+++ b/net/pythondirector/Makefile
@@ -15,10 +15,10 @@ USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PORTDOCS=		*
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/reposado/Makefile b/net/reposado/Makefile
index eadaf9663587..0a47a482555f 100644
--- a/net/reposado/Makefile
+++ b/net/reposado/Makefile
@@ -23,6 +23,8 @@ USE_PYDISTUTILS=	yes
 
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
 		${WRKSRC}/code/reposadolib/reposadocommon.py
@@ -30,10 +32,8 @@ post-patch:
 		${WRKSRC}/setup.py
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 07969ba453a3..e7a852253fa4 100644
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -85,9 +85,7 @@ do-install:
 .endfor
 
 # Documentation
-.ifndef (NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-.endif # NOPORTDOCS
 
 .include <bsd.port.mk>
diff --git a/net/seda/Makefile b/net/seda/Makefile
index fef206bda6b6..629857679762 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -16,9 +16,7 @@ JAVA_VERSION=	1.6+
 USE_ANT=	yes
 ALL_TARGET=	dist
 
-.ifndef(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-.endif
+OPTIONS_DEFINE=	DOCS
 
 JAVADOC_WRKSRC=	${WRKSRC}/build/javadoc
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
@@ -38,24 +36,30 @@ PORTDOCS=	${DOC_FILES} \
 PLIST_FILES=	\
 		%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	javadoc
+.endif
+
 pre-build:
 # use our build.xml
-	@${CP} ${FILESDIR}/build.xml ${WRKSRC}
+	${CP} ${FILESDIR}/build.xml ${WRKSRC}
 
 do-install:
 # jar
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
+	${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
 		${STAGEDIR}${JAVAJARDIR}/
 # docs
-.ifndef(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 . for doc in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
 . endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/javadoc
 # line taken from textproc/xerces-j maintained by hq@FreeBSD.org
-	@cd ${JAVADOC_WRKSRC} && \
+	cd ${JAVADOC_WRKSRC} && \
 		${FIND} . -type d -exec ${MKDIR} "${STAGEDIR}${DOCSDIR}/javadoc/{}" \; && \
 		${FIND} . -not -type d -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DOCSDIR}/javadoc/{}" \;
 .endif
diff --git a/net/sippy_b2bua/Makefile b/net/sippy_b2bua/Makefile
index 895d60ca0548..cdfe16945aad 100644
--- a/net/sippy_b2bua/Makefile
+++ b/net/sippy_b2bua/Makefile
@@ -19,10 +19,10 @@ DOCSDIR=	${PREFIX}/share/doc/${PYDISTUTILS_PKGNAME}
 
 DOCS=		COPYING README
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/sntop/Makefile b/net/sntop/Makefile
index 68357e82eded..e3e3c2472979 100644
--- a/net/sntop/Makefile
+++ b/net/sntop/Makefile
@@ -17,14 +17,14 @@ PORTDOCS=	COPYING CREDITS ChangeLog INSTALL README TODO
 EXAMPLES=	alarm.sh sntoprc.EXAMPLE
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sntop
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for example in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${example} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net/sntop/pkg-plist b/net/sntop/pkg-plist
index a4a93a7c4ae4..018149aacc81 100644
--- a/net/sntop/pkg-plist
+++ b/net/sntop/pkg-plist
@@ -1,6 +1,6 @@
 bin/sntop
 @sample etc/sntoprc.sample
 man/man1/sntop.1.gz
-%%EXAMPLESDIR%%/alarm.sh
-%%EXAMPLESDIR%%/sntoprc.EXAMPLE
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alarm.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sntoprc.EXAMPLE
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/net/splatd/Makefile b/net/splatd/Makefile
index d8a83daa3dfa..55fc2bfbec76 100644
--- a/net/splatd/Makefile
+++ b/net/splatd/Makefile
@@ -21,15 +21,15 @@ PYDISTUTILS_PKGNAME=	splat
 USE_RC_SUBR=	splatd
 SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/splat.conf ${STAGEDIR}${PREFIX}/etc/splat.conf.sample
 	${MV} -f ${STAGEDIR}${PREFIX}/bin/splatd ${STAGEDIR}${PREFIX}/sbin/splatd
 	${INSTALL_MAN} ${WRKSRC}/docs/man/splat.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
 	${INSTALL_MAN} ${WRKSRC}/docs/man/splatd.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/xhtml
 	${INSTALL_MAN} ${WRKSRC}/docs/xhtml/* ${STAGEDIR}${DOCSDIR}/xhtml
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index cc9a12c41095..ecdcc78979a9 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -18,25 +18,30 @@ USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
+OPTIONS_DEFINE=	DOCS
+
 ANT?=		${LOCALBASE}/bin/ant
-.if defined(NOPORTDOCS)
+ANT_PARAMS+=	-Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/java
+PLIST_SUB+=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
+
+.include <bsd.port.options.mk>
+
+.if empty(PORT_OPTIONS:MDOCS)
 ANT_TARGET=	jar
 .else
 ANT_TARGET=	javadocs jar
 PORTDOCS+=	java
 .endif
-ANT_PARAMS+=	-Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/java
-PLIST_SUB+=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
 
 do-build:
-	@cd ${WRKSRC} && \
+	cd ${WRKSRC} && \
 		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} ${ANT_TARGET} ${ANT_PARAMS}
 
 do-install:
-	@cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}
-.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS}
+.if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d -o root -g wheel -m 0755 ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/recThread.java ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${STAGEDIR}${EXAMPLESDIR}/java
diff --git a/net/tn5250j/Makefile b/net/tn5250j/Makefile
index 4ed4266e5755..55c919e4b0e1 100644
--- a/net/tn5250j/Makefile
+++ b/net/tn5250j/Makefile
@@ -41,16 +41,16 @@ DOC_FILES=	CHANGELOG.txt applet.txt filetransfers.txt readme.txt antbuild.txt\
 SUB_FILES=	tn5250j
 SUB_LIST=	JYTHON_JAR=${JYTHON_JAR}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/tn5250j ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/build/tn5250j.jar ${STAGEDIR}${JAVAJARDIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${DOC_FILES}
 	${INSTALL_MAN} ${WRKSRC}/src/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/ttlscan/Makefile b/net/ttlscan/Makefile
index 45e31b1bad90..801dbc840d1d 100644
--- a/net/ttlscan/Makefile
+++ b/net/ttlscan/Makefile
@@ -17,6 +17,8 @@ LDFLAGS+=	-lpcap -ldnet
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
 
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	(cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -D_XOPEN_SOURCE \
 	`${LIBNET_CONFIG} --defines --cflags` ${PORTNAME}.c -o ${PORTNAME} `${LIBNET_CONFIG} --libs` ${LDFLAGS})
@@ -24,9 +26,7 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} -s ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index fb57e7f6b364..6d6f14441707 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -26,6 +26,8 @@ ALL_TARGET=	vtund
 DOCS=		ChangeLog Credits FAQ README README.LZO README.Setup \
 		README.Shaper TODO
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${CC} == "clang" || ${CXX} == "clang++" || ${OSVERSION} >= 1000026
@@ -40,12 +42,10 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-tun_dev.c
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/vtund
 	@${INSTALL_DATA} ${WRKSRC}/vtund.conf ${STAGEDIR}${PREFIX}/etc/vtund.conf.example
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 	@${LN} -s ${STAGEDIR}${PREFIX}/man/man8/vtund.8 ${STAGEDIR}${PREFIX}/man/man1/vtun.1
 
 .include <bsd.port.post.mk>
diff --git a/net/wmpiki/Makefile b/net/wmpiki/Makefile
index 0f65c4839066..5460988f302e 100644
--- a/net/wmpiki/Makefile
+++ b/net/wmpiki/Makefile
@@ -15,6 +15,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_XORG=	xpm
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/X11R6|$$(LOCALBASE)|g' \
 		-e 's|/include/X11|/include|g' \
@@ -27,11 +29,9 @@ post-patch:
 		${WRKSRC}/config.example
 
 do-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/config.example ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 	${INSTALL_PROGRAM} ${WRKSRC}/wmpiki ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/wmping/Makefile b/net/wmping/Makefile
index b16b14d48a81..6122f5c1e54b 100644
--- a/net/wmping/Makefile
+++ b/net/wmping/Makefile
@@ -16,14 +16,14 @@ GNU_CONFIGURE=	yes
 
 PORTDOCS=	BUGS CHANGES README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL} -c -s -o root -g wheel ${WRKSRC}/wmping ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/wmping.1 ${STAGEDIR}${PREFIX}/man/man1
-.ifndef(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>