Remove NOPORTDOCS and NOPORTEXAMPLES.

13 files changed, 34 insertions, 47 deletions

diff --git a/net-mgmt/check_multi/Makefile b/net-mgmt/check_multi/Makefile
index 6de9bd767d33..6bb63d4e2976 100644
--- a/net-mgmt/check_multi/Makefile
+++ b/net-mgmt/check_multi/Makefile
@@ -23,12 +23,12 @@ PLUGIN_DIR=	libexec/nagios
 
 SHEBANG_FILES=	check_multi
 
+OPTIONS_DEFINE=	EXAMPLES
+
 do-install:
 	-${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/check_multi ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}/
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${TAR} -C ${WRKSRC}/contrib -cf - . | ${TAR} -C ${STAGEDIR}${EXAMPLESDIR} -xf -
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/coovachilli/Makefile b/net-mgmt/coovachilli/Makefile
index d37c32b58988..8651db8f9d01 100644
--- a/net-mgmt/coovachilli/Makefile
+++ b/net-mgmt/coovachilli/Makefile
@@ -25,13 +25,13 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	coovachilli
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${FILESDIR}/main.conf.sample ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${FILESDIR}/pf.conf.sample ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${FILESDIR}/ipfw-config.sample ${STAGEDIR}/${EXAMPLESDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ehnt/Makefile b/net-mgmt/ehnt/Makefile
index 79c76daccac4..1c112e08012c 100644
--- a/net-mgmt/ehnt/Makefile
+++ b/net-mgmt/ehnt/Makefile
@@ -18,6 +18,8 @@ PLIST_DIRS+=	share/ehnt
 PORTDOCS=	README
 STPREFIX=	${STAGEDIR}${PREFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${TOUCH} ${WRKSRC}/asnc.txt
 
@@ -29,9 +31,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/ehntserv.8 ${STPREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/asnc.txt ${STAGEDIR}${DATADIR}/
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/fprobe/Makefile b/net-mgmt/fprobe/Makefile
index c115691335ca..39680b3a67a4 100644
--- a/net-mgmt/fprobe/Makefile
+++ b/net-mgmt/fprobe/Makefile
@@ -17,15 +17,15 @@ SUB_LIST=	NAME=${PORTNAME}
 PLIST_FILES=	man/man8/${PORTNAME}.8.gz sbin/fprobe
 PORTDOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ChangeLog README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 598318b92d2c..acbd4918dfc5 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -27,10 +27,10 @@ SHEBANG_FILES= 	netleak netleakd
 
 PORTDOCS=	BUGS README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netspoc/Makefile b/net-mgmt/netspoc/Makefile
index bf0815be97e9..b052be14efcc 100644
--- a/net-mgmt/netspoc/Makefile
+++ b/net-mgmt/netspoc/Makefile
@@ -19,17 +19,15 @@ USE_PERL5=	configure
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.shtml ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
-.endif
-.if !defined(NOPORTEXAMPLES)
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/doc)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/netustad/Makefile b/net-mgmt/netustad/Makefile
index e3f5bc4803bf..fc63b72b3318 100644
--- a/net-mgmt/netustad/Makefile
+++ b/net-mgmt/netustad/Makefile
@@ -15,25 +15,20 @@ USES=		gettext
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	SSL NLS
+OPTIONS_DEFINE=	SSL NLS DOCS
 OPTIONS_DEFAULT=SSL
 SSL_DESC=	Use netUstad with SSL support
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.options.mk>
+SSL_USE=		OPENSSL=yes
+SSL_CONFIGURE_WITH=	ssl
 
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-.else
-CONFIGURE_ARGS+=	--without-ssl
-.endif
+NLS_CONFIGURE_WITH=	nls
 
-.if empty(PORT_OPTIONS:MNLS)
-CONFIGURE_ARGS+=	--without-nls
-.endif
+.include <bsd.port.options.mk>
 
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-patch:
 	${REINPLACE_CMD} "s/^install-data-am:.*/install-data-am:/" ${WRKSRC}/Makefile.in
 .endif
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 7fac87adec86..d1d0b9ecba29 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -29,6 +29,8 @@ USES=		perl5
 CONFIGURE_ARGS=	--prefix=${PREFIX} --localstatedir=/var/spool/nagios
 DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 .if !defined(_BUILDING_NSCA_CLIENT)
 USE_RC_SUBR=	nsca
 PLIST_SUB+=	SERVER=""
@@ -61,10 +63,8 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nsca27/Makefile b/net-mgmt/nsca27/Makefile
index 05c33e1a0c49..c8310bb513e2 100644
--- a/net-mgmt/nsca27/Makefile
+++ b/net-mgmt/nsca27/Makefile
@@ -30,6 +30,8 @@ USES=		perl5
 CONFIGURE_ARGS=	--prefix=${PREFIX} --localstatedir=/var/spool/nagios
 DOCSDIR?=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 .if !defined(_BUILDING_NSCA_CLIENT)
 USE_RC_SUBR=	nsca
 PLIST_SUB+=	SERVER=""
@@ -62,10 +64,8 @@ do-install:
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
index 6dfe2ab379e4..26f73de4b591 100644
--- a/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
+++ b/net-mgmt/p5-Nagios-Plugins-Memcached/Makefile
@@ -21,13 +21,13 @@ RUN_DEPENDS+=	${BUILD_DEPENDS}
 
 PORTDOCS=	Changes README
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL} ${WRKSRC}/bin/check_memcached ${STAGEDIR}${PREFIX}/libexec/nagios/check_memcached
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile
index 8b5f53b9591b..e36c2a60addf 100644
--- a/net-mgmt/pmacct/Makefile
+++ b/net-mgmt/pmacct/Makefile
@@ -21,7 +21,7 @@ LDFLAGS+=	"-L${LOCALBASE}/lib"
 PORTSCOUT=	skipv:0.15.0
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE THREADS MMAP LAYER2 IPV6 SHARED DEBUG \
-		MONGO GEOIP
+		MONGO GEOIP DOCS
 OPTIONS_DEFAULT=MMAP LAYER2 IPV6 SHARED
 
 SQLITE_DESC=	Enable SQLite support
@@ -29,8 +29,6 @@ MMAP_DESC=	Enable mmap(2) support
 LAYER2_DESC=	Enable Layer-2 support: MAC addresses and VLANs
 SHARED_DESC=	Enable shared objects
 
-.include <bsd.port.options.mk>
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
@@ -113,17 +111,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 .for i in ChangeLog FAQS README TOOLS CONFIG-KEYS KNOWN-BUGS
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sql/* ${STAGEDIR}${DATADIR}
 
diff --git a/net-mgmt/softflowd/Makefile b/net-mgmt/softflowd/Makefile
index 894bec18d602..01b872cc49f9 100644
--- a/net-mgmt/softflowd/Makefile
+++ b/net-mgmt/softflowd/Makefile
@@ -18,10 +18,10 @@ PLIST_FILES=	sbin/softflowd sbin/softflowctl \
 PORTDOCS=	README
 USE_RC_SUBR=	softflowd
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/whatmask/Makefile b/net-mgmt/whatmask/Makefile
index b6988c3e895f..df31f7efdf50 100644
--- a/net-mgmt/whatmask/Makefile
+++ b/net-mgmt/whatmask/Makefile
@@ -15,10 +15,10 @@ GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS ChangeLog README
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>