35 files changed, 118 insertions, 133 deletions

diff --git a/www/anyremote2html/Makefile b/www/anyremote2html/Makefile
index 0d9047a4a8ba..ccc14e54fe5b 100644
--- a/www/anyremote2html/Makefile
+++ b/www/anyremote2html/Makefile
@@ -16,10 +16,9 @@ USE_PYTHON_RUN=	yes
 
 PORTDOCS=	ChangeLog README COPYING AUTHORS
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' ${WRKSRC}/${PORTNAME}
-.if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e '/doc\/${PORTNAME}/d' ${WRKSRC}/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 4faf80f04e66..7c65d36fdfaa 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -37,6 +37,8 @@ DOC_EXTS=	html sgml xml
 
 MAN1=	bins-edit-gui.1 bins.1 bins_edit.1
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch::
 # perl PREFIX safeness
 	@${FIND} ${WRKSRC} -type f | \
@@ -52,14 +54,12 @@ do-install:
 
 post-install:
 .for file in ${BINS_SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/bin
 .endfor
-.ifndef(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for ext in ${DOC_EXTS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.${ext} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -70,7 +70,7 @@ post-install:
 WITH_I18N=	yes
 
 post-patch::
-	@${REINPLACE_CMD} -e 's,read dummy,,' ${WRKSRC}/install.sh
+	${REINPLACE_CMD} -e 's,read dummy,,' ${WRKSRC}/install.sh
 .endif
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-install.sh
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index 061beceb8cf7..6553d6822a27 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -14,17 +14,17 @@ COMMENT=	Library that simplifies the task of writing CGI programs in C
 
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
-	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for file in CHANGES CREDITS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/html
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/entrans/Makefile b/www/entrans/Makefile
index cdcd58098dbf..cfa546ef52b1 100644
--- a/www/entrans/Makefile
+++ b/www/entrans/Makefile
@@ -20,6 +20,8 @@ PLIST=		${WRKDIR}/pkg-plist
 
 PORTDOCS=	README INSTALL COPYING AUTHORS HACKING THANKS
 
+OPTIONS_DEFINE=	DOCS
+
 pre-install:
 	cd ${WRKSRC} && ${FIND} -s * -type f | \
 		${SED} -e 's|^|${ENTRANS}/|' > ${PLIST} \
@@ -34,12 +36,10 @@ do-install:
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/${ENTRANS}
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${ENTRANS}
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${ENTRANS}
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/${i}
 .endfor
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/flood/Makefile b/www/flood/Makefile
index ea4f8787d43b..899ccd4dc795 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -27,6 +27,8 @@ EX_DATA=	flood.dtd relative-averages-time.awk round-robin-dynamic.xml \
 		round-robin-relative-reports.xml round-robin-ssl.xml \
 		round-robin-timed.xml round-robin.xml
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flood ${STAGEDIR}${PREFIX}/bin/flood
 
@@ -38,11 +40,9 @@ post-install:
 .for f in ${EX_DATA}
 	@${INSTALL_DATA} ${WRKSRC}/examples/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/docbook
 	@${INSTALL_DATA} ${WRKSRC}/docs/README ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/docbook/[Mf]* ${STAGEDIR}${DOCSDIR}/docbook
-.endif
 
 ANONCVS=	cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic
 
diff --git a/www/formication/Makefile b/www/formication/Makefile
index 1240db094896..9377972299df 100644
--- a/www/formication/Makefile
+++ b/www/formication/Makefile
@@ -21,6 +21,8 @@ PORTDOCS=	BLURB COPYING feedback.fcn feedback.html formication.txt
 PLIST_FILES=	www/cgi-bin/formication.pl
 SUB_FILES+=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 PLIST_DIRSTRY=	www/cgi-bin
@@ -33,12 +35,10 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/www/cgi-bin
 	@${INSTALL_DATA} ${WRKSRC}/formication.pl ${STAGEDIR}${PREFIX}/www/cgi-bin
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
 .	for i in ${PORTDOCS}
 	  @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .	endfor
-.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/goose/Makefile b/www/goose/Makefile
index 9ecfbfb5decc..d5d46358739f 100644
--- a/www/goose/Makefile
+++ b/www/goose/Makefile
@@ -22,24 +22,24 @@ USES=		perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}
 POD2MAN?=	pod2man
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-patch:
-	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		-e "s|%%DATADIR%%|${DATADIR}|g" \
 		-e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \
 		-e "s|/usr/local/bin/url_handler.sh|${LOCALBASE}/urlview|" \
 		${WRKSRC}/goose
 
 do-build:
-	@cd ${WRKSRC} && ${POD2MAN} goose > goose.1
+	cd ${WRKSRC} && ${POD2MAN} goose > goose.1
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/goose ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/GoogleSearch.wsdl ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/goose.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/goose.conf.example ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/goose/pkg-plist b/www/goose/pkg-plist
index 766365f72237..f8e236f2ab81 100644
--- a/www/goose/pkg-plist
+++ b/www/goose/pkg-plist
@@ -1,6 +1,6 @@
 bin/goose
 man/man1/goose.1.gz
 %%DATADIR%%/GoogleSearch.wsdl
-%%PORTDOCS%%%%EXAMPLESDIR%%/goose.conf.example
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/goose.conf.example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
diff --git a/www/grails/Makefile b/www/grails/Makefile
index 41ea3a8e54e5..bdcb5cabd978 100644
--- a/www/grails/Makefile
+++ b/www/grails/Makefile
@@ -21,9 +21,9 @@ DATAFILES=	LICENSE README build.gradle build.properties gradle.properties \
 		gradlew conf dist gradle lib media plugins scripts src
 SCRIPTFILES=	grails grails-debug startGrails
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	api guide index.html css img ref
-.endif
 PLIST_FILES=	${SCRIPTFILES:S,^,bin/,} \
 		${SCRIPTFILES:S,^,${DATADIR:S,${PREFIX}/,,}/bin/,}
 PLIST_DIRS=	${DATADIR:S,${PREFIX}/,,}/bin
@@ -44,13 +44,11 @@ do-install:
 	@${LN} -fs ${DATADIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC}/doc \
 	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 
 post-install:
 	@${FIND} -s ${DATAFILES:S,^,${WRKSRC}/,} -not -type d 2>/dev/null | \
diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile
index 31a5117649b7..93deccaa6b1a 100644
--- a/www/jmeter/Makefile
+++ b/www/jmeter/Makefile
@@ -54,9 +54,9 @@ EXTRACT_AFTER_ARGS=	--exclude '*.bat' --exclude '*.cmd'	\
 	${RUN_DEPENDS:M*.jar*:C|.*/(.+).jar:.*|--exclude '\1-*.jar'|}	\
 	--exclude 'oro-*.jar'
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	docs printable_docs README LICENSE
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -72,12 +72,10 @@ do-install:
 	  && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}/${DATADIR}/{} \;
 	cd ${WRKSRC} \
 	  && ${FIND} ${DATAFILES} -type f -not -name '*.orig' -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} \
 	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
 	cd ${WRKSRC} \
 	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-.endif
 	${INSTALL_SCRIPT} ${WRKDIR}/jmeter.sh ${STAGEDIR}${PREFIX}/bin/jmeter
 
 # For some reason, it is not enough for these three to simply be listed in
diff --git a/www/jspacker/Makefile b/www/jspacker/Makefile
index 39a5b5c33c84..0b367f699ee9 100644
--- a/www/jspacker/Makefile
+++ b/www/jspacker/Makefile
@@ -23,16 +23,16 @@ SUB_FILES=	${PORTNAME}
 SUB_LIST=	JSPACKER=${JSPACKER} \
 		PERL5=${PERL5}
 
+OPTIONS_DEFINE=	EXAMPLES
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DATADIR} && \
 	cd ${WRKSRC} && \
 	${INSTALL_DATA} *.pm ${STAGEDIR}${DATADIR} && \
 	${INSTALL_SCRIPT} ${JSPACKER} ${STAGEDIR}${DATADIR}
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \
 	cd ${WRKSRC} && \
 	${INSTALL_DATA} *.htm ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index 101d1d938b7f..cc4aa5bf6737 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -17,10 +17,10 @@ GNU_CONFIGURE=	yes
 PORTDOCS=	Copyright README USAGE
 PLIST_FILES=	bin/mgstat
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index b4b7148fa314..816ab010eaca 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -20,7 +20,11 @@ INSTALL_ARGS=	-prefix ${STAGEDIR} -binpath ${STAGEDIR}${PREFIX}/bin \
 		-manpath ${STAGEDIR}${PREFIX}/man \
 		-batch
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 THEDOCSDIR=	${STAGEDIR}${PREFIX}/share/doc/MHonArc
 DOCSDIR=${PREFIX}/share/doc/MHonArc
 INSTALL_ARGS+=	-docpath ${THEDOCSDIR}
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index 484fe15f0b18..2e9bbb29b72f 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -19,7 +19,7 @@ AP_FAST_BUILD=	yes
 SRC_FILE=	${PORTNAME}.c sha2.c
 AP_EXTRAS=	-DAPACHE22
 
-OPTIONS_DEFINE=	QUERY_SEP
+OPTIONS_DEFINE=	QUERY_SEP DOCS EXAMPLES
 QUERY_SEP_DESC=	Experimental TKTAuthQuerySeparator directive
 OPTIONS_DEFAULT=QUERY_SEP
 
@@ -37,7 +37,6 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/../doc; ${MAKE} ${.TARGET:S/post-//}
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/cgi/Apache ${STAGEDIR}${EXAMPLESDIR}/conf
 .for i in cgi/AuthTktConfig.pm cgi/Apache/AuthTkt.pm cgi/tkt.css \
 	conf/02_auth_tkt.conf conf/auth_tkt_cgi.conf
@@ -46,10 +45,7 @@ post-install:
 .for i in logout.cgi login.cgi
 	${INSTALL_SCRIPT} ${WRKSRC}/../cgi/${i} ${STAGEDIR}${EXAMPLESDIR}/cgi/${i}
 .endfor
-.endif
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../README ${STAGEDIR}${DOCSDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile
index def650bd7fa8..b3bac8fb7604 100644
--- a/www/myfaces/Makefile
+++ b/www/myfaces/Makefile
@@ -15,10 +15,10 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-.if !defined(NOPORTDOCS)
 PORTDOCS=	javadoc tlddoc LICENSE.txt NOTICE.txt
-.endif
 JAR_FILES=	myfaces-all.jar myfaces-api.jar myfaces-impl.jar tomahawk.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
 		${JAR_FILES:S|^|%%DATADIR%%/|}
@@ -33,9 +33,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${jarfile} ${STAGEDIR}${DATADIR}/${jarfile}
 .endfor
 
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
 	cd ${WRKSRC} && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 377ec27178f0..3e4538871132 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -20,14 +20,14 @@ PLIST_FILES=	bin/netrik \
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} "s/#include <ncursesw\//#include </" \
 		${WRKSRC}/*.c
-.if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} "s/install-data-am: install-docDATA/install-data-am:/" \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s/install-docDATA install-man/install-man/" \
 		${WRKSRC}/doc/Makefile.in
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile
index c3fb859c3df3..efb4b624c037 100644
--- a/www/p5-Apache-Clean2/Makefile
+++ b/www/p5-Apache-Clean2/Makefile
@@ -25,10 +25,10 @@ USE_APACHE=	22+
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-Apache-Session-Wrapper/Makefile b/www/p5-Apache-Session-Wrapper/Makefile
index 71e09ed49fe2..65e51d760b2b 100644
--- a/www/p5-Apache-Session-Wrapper/Makefile
+++ b/www/p5-Apache-Session-Wrapper/Makefile
@@ -19,13 +19,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Ex/Makefile b/www/p5-CGI-Ex/Makefile
index 2ac9a2ad0a32..4964a5e08338 100644
--- a/www/p5-CGI-Ex/Makefile
+++ b/www/p5-CGI-Ex/Makefile
@@ -18,10 +18,10 @@ USE_PERL5=	configure
 
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${CP} -R ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}/
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Framework/Makefile b/www/p5-CGI-Framework/Makefile
index c75f58450993..07a8fc57260e 100644
--- a/www/p5-CGI-Framework/Makefile
+++ b/www/p5-CGI-Framework/Makefile
@@ -18,13 +18,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index de9509dae0d2..3a72dac623be 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Extremely lightweight CGI processing package
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes README TODO
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-Untaint/Makefile b/www/p5-CGI-Untaint/Makefile
index 84267828b385..8d86bcda96c5 100644
--- a/www/p5-CGI-Untaint/Makefile
+++ b/www/p5-CGI-Untaint/Makefile
@@ -17,13 +17,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index b80c7a747790..dafbcfc04382 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -17,13 +17,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.pm ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.xsl ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-XMLApplication/pkg-plist b/www/p5-CGI-XMLApplication/pkg-plist
index 479deb009f70..5d68df5aaa8e 100644
--- a/www/p5-CGI-XMLApplication/pkg-plist
+++ b/www/p5-CGI-XMLApplication/pkg-plist
@@ -1,20 +1,20 @@
 %%PERL5_MAN3%%/CGI::XMLApplication.3.gz
 %%SITE_PERL%%/CGI/XMLApplication.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2_finish.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex2_form.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/example1.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/example1.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/example3.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/example3.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/example4.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/example4.pm
-%%PORTDOCS%%%%EXAMPLESDIR%%/minimal.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/minimal.xsl
-%%PORTDOCS%%%%EXAMPLESDIR%%/minimalapp.pm
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex2_finish.xsl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex2_form.xsl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4.pm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimal.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimal.xsl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/minimalapp.pm
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/XMLApplication
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
 @dirrmtry %%SITE_PERL%%/CGI
diff --git a/www/p5-HTTP-Request-Params/Makefile b/www/p5-HTTP-Request-Params/Makefile
index 3c605179b628..0f066ccaa8dc 100644
--- a/www/p5-HTTP-Request-Params/Makefile
+++ b/www/p5-HTTP-Request-Params/Makefile
@@ -19,13 +19,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-PHP-Session/Makefile b/www/p5-PHP-Session/Makefile
index 26705c9b70e1..27fe5b54e96c 100644
--- a/www/p5-PHP-Session/Makefile
+++ b/www/p5-PHP-Session/Makefile
@@ -16,13 +16,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	Changes README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Mechanize/Makefile b/www/p5-WWW-Mechanize/Makefile
index e9a00fe3f3c0..0c1341eaa0dd 100644
--- a/www/p5-WWW-Mechanize/Makefile
+++ b/www/p5-WWW-Mechanize/Makefile
@@ -31,11 +31,11 @@ USE_PERL5=	configure
 DOCS=		Changes etc/www-mechanize-logo.png
 PORTDOCS=	${DOCS:T}
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/pebble/Makefile b/www/pebble/Makefile
index 3eb76a94e250..830cdf5735e4 100644
--- a/www/pebble/Makefile
+++ b/www/pebble/Makefile
@@ -28,12 +28,12 @@ SUB_FILES=	pebble.properties pkg-message
 
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	configuration.html credits.html images index.html \
 		installation.html license.txt multiblog.html screen.css \
 		screenshots.html security.html upgrading1x.html \
 		upgrading2x.html
-.endif
 PLIST_FILES=	${WEBAPP_SUBDIR}/${PORTNAME}.war
 PEBBLE_CONTEXT=	WEB-INF/applicationContext-pebble.xml
 
@@ -43,17 +43,12 @@ do-patch:
 	cd ${WRKSRC} && ${LOCALBASE}/bin/zip -u pebble.war ${PEBBLE_CONTEXT}
 
 do-install:
-	${MKDIR} "${STAGEDIR}${PEBBLE_HOME}"
+	@${MKDIR} "${STAGEDIR}${PEBBLE_HOME}"
 	${CHOWN} "www:www" "${STAGEDIR}${PEBBLE_HOME}"
 	${INSTALL_DATA} ${WRKDIR}/pebble.properties ${STAGEDIR}${PEBBLE_PROPERTIES}.sample
-	${MKDIR} ${STAGEDIR}${WEBAPP_DIR}
+	@${MKDIR} ${STAGEDIR}${WEBAPP_DIR}
 	${INSTALL_DATA} ${WRKSRC}/pebble.war ${STAGEDIR}${WEBAPP_DIR}/${PORTNAME}.war
-.if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \;
 	cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-.endif
-
-post-install:
-	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 973f13cb8238..2e79cf6bf337 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -17,14 +17,13 @@ COMMENT=	A Python library for the generation of HTML documents
 USE_PYTHON=	2
 NO_BUILD=	yes
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|python |${PYTHON_CMD} |' ${WRKSRC}/Makefile
 
-.if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC} -cf - README html image | \
@@ -32,6 +31,5 @@ post-install:
 	@${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${STAGEDIR}${DOCSDIR} -type d -exec ${CHMOD} 0555 {} \;
 	@${FIND} ${STAGEDIR}${DOCSDIR} -type f -exec ${CHMOD} 0444 {} \;
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index 1d71d8599bc3..8f6a11155f9a 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -17,12 +17,12 @@ LICENSE=	BSD3CLAUSE
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/doc . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}
 	@${TAR} -cf - -C ${WRKDIR}/albatross-html-${PORTVERSION} . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/samples . | ${TAR} -xf - -C ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile
index 6c577b715de9..d63c5f8dcc4c 100644
--- a/www/py-pysearch/Makefile
+++ b/www/py-pysearch/Makefile
@@ -18,14 +18,12 @@ PYDISTUTILS_PKGNAME=	pYsearch
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs/ ${STAGEDIR}${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 0b44c02758e1..7ffddcae625c 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -26,30 +26,31 @@ PORTDOCS=	*
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
-.if defined(WITH_GNUTLS)
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
-CONFIGURE_ARGS+=	--set-tls=1
-.elif defined(WITH_OPENSSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=	--set-tls=2
-LDFLAGS+=	-lssl -lcrypto
-.endif
+OPTIONS_DEFINE=	DOCS
+OPTIONS_RADIO=	BACKEND
+BACKEND_DESC=	SSL Backend
+OPTIONS_RADIO_BACKEND=	OPENSSL GNUTLS
+
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_ON=	--set-tls=1
+
+OPENSSL_USE=		OPENSSL=yes
+OPENSSL_CONFIGURE_ON=	--set-tls=2
+OPENSSL_LDFLAGS=	-lssl -lcrypto
 
 post-configure:
-	@${REINPLACE_CMD} -e 's|_IN_H 0|_IN_H 1|g ; \
+	${REINPLACE_CMD} -e 's|_IN_H 0|_IN_H 1|g ; \
 		 s|_SOCKET_H 0|_SOCKET_H 1|g' ${WRKSRC}/.config
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/retawq ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/retawq ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .for lang in de es fr pt_BR
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	@${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo \
+	${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo \
 		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docu/*.html ${STAGEDIR}${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/docu/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index a2d1c1b66717..41b893c3aa47 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -17,12 +17,14 @@ GNU_CONFIGURE=	yes
 MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
                 pkgdatadir="${DATADIR}"
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
-.endif
+
+.include <bsd.port.options.mk>
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -E 's/^(install-data-am:) install-docDATA(.*)/\1\2/' \
 		${WRKSRC}/Makefile.in
 .for p in pod prog-bin conf filter-bin filters html
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 3d61b88b852f..0241613efe23 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	YES
 LIBDIR=		lib/tclwebtest${PORTVERSION}
 PLIST_SUB+=	LIBDIR="${LIBDIR}"
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -rf
@@ -36,11 +36,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tclwebtest ${STAGEDIR}${PREFIX}/bin/tclwebtest
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${ECHO} "Installing docs"
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/doc
-	@${TAR} -C ${WRKSRC} -c -f - ChangeLog README TODO index.html generate_docs.test | ${TAR} -C ${STAGEDIR}${DOCSDIR} -x -f -
-	@${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${STAGEDIR}${DOCSDIR}/doc -x -f -
-.endif
+	${TAR} -C ${WRKSRC} -c -f - ChangeLog README TODO index.html generate_docs.test | ${TAR} -C ${STAGEDIR}${DOCSDIR} -x -f -
+	${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${STAGEDIR}${DOCSDIR}/doc -x -f -
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile
index 2a4644883419..9576ba969775 100644
--- a/www/wsdlpull/Makefile
+++ b/www/wsdlpull/Makefile
@@ -18,21 +18,21 @@ USES=		libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e '/-O2 -Wall/d' ${WRKSRC}/configure
-	@${REINPLACE_CMD} \
+	${REINPLACE_CMD} -e '/-O2 -Wall/d' ${WRKSRC}/configure
+	${REINPLACE_CMD} \
 		-e '/SUBDIRS = / s| docs||' \
 		-e '/^install-data-am:/ s| install-docsDATA||' \
 			${WRKSRC}/Makefile.in
 # Do not install wsdlpull-config.1 for the absence of wsdlpull-config
-	@${REINPLACE_CMD} \
+	${REINPLACE_CMD} \
 		-e '/^man_MANS = / s| wsdlpull-config.1||' \
 			${WRKSRC}/man/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	cd ${WRKSRC}/ && ${INSTALL_DATA} README wsdlpull.html ${STAGEDIR}${DOCSDIR}/
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/ && ${INSTALL_DATA} README wsdlpull.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>