34 files changed, 127 insertions, 144 deletions

diff --git a/textproc/ibus-el/Makefile b/textproc/ibus-el/Makefile
index 43e7eadf1a38..9dd286552ff6 100644
--- a/textproc/ibus-el/Makefile
+++ b/textproc/ibus-el/Makefile
@@ -25,6 +25,8 @@ PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/ibus.el \
 		libexec/ibus-el-agent
 PORTDOCS=	README
 
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	@cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \
 		-f batch-byte-compile ibus.el
@@ -37,10 +39,8 @@ do-install:
 		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
 	@${INSTALL_SCRIPT} ${WRKSRC}/ibus-el-agent \
 		${STAGEDIR}${PREFIX}/libexec
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/jakarta-commons-digester/Makefile b/textproc/jakarta-commons-digester/Makefile
index e9590b6081d4..f5d19f10757b 100644
--- a/textproc/jakarta-commons-digester/Makefile
+++ b/textproc/jakarta-commons-digester/Makefile
@@ -31,10 +31,11 @@ ALL_TARGET=	dist
 
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
-.if !defined(NOPORTDOCS)
+
+OPTIONS_DEFINE=	DOCS
+
 OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 PORTDOCS=	api ${OTHERDOCS}
-.endif
 
 COMMONS_BEANUTILS_API=	${LOCALBASE}/share/doc/commons-beanutils
 COMMONS_COLLECTIONS_API=${LOCALBASE}/share/doc/commons-collections/apidocs
@@ -67,7 +68,7 @@ do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
 	@${INSTALL_DATA} ${WRKSRC}/dist/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${JARFILE}
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@cd ${WRKSRC}/dist/docs \
 	  && ${FIND} api -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index c05156ddc953..7694b4cf6229 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -27,26 +27,24 @@ JAVA_VERSION=	1.6+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 USE_ANT=	yes
 ALL_TARGET=	jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	docs
-.endif
+DOCS_ALL_TARGET=${ALL_TARGET} docs
 
 PLIST_FILES+=	%%DATADIR%%/jaxup-xupdater.jar bin/jaxup-xupdater \
 		%%JAVAJARDIR%%/${PORTNAME}.jar
 PLIST_DIRS=	%%DATADIR%%
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	LICENSE.txt api index.html jaxup_files xupdate-wd.html xupdate-wd_files
-.endif
 
 .include <bsd.port.pre.mk>
 
 UTIL_CLASSPATH_JARS=	jaxen-full saxpath xercesImpl
 UTIL_CLASSPATH!=	${ECHO_CMD} ${UTIL_CLASSPATH_JARS:S,^,${JAVALIBDIR}/,:S,$,.jar,} | ${TR} " " ":"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.[4-5] -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 .if ${JDK_API} != ""
 MAKE_ARGS+=	-Dj2se.apidocs="${JDK_API}"
@@ -58,9 +56,9 @@ MAKE_ARGS+=	-Djaxen.apidocs="${JAXEN_API}"
 .endif
 
 post-extract:
-	@${CP} ${FILESDIR}/build.xml ${WRKSRC}/
-	@${CP} ${FILESDIR}/DOMXUpdater.java ${WRKDIR}/
-	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%DATADIR%%,${DATADIR},g' \
+	${CP} ${FILESDIR}/build.xml ${WRKSRC}/
+	${CP} ${FILESDIR}/DOMXUpdater.java ${WRKDIR}/
+	${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g ; s,%%DATADIR%%,${DATADIR},g' \
 	  ${FILESDIR}/jaxup-xupdater.sh >${WRKDIR}/jaxup-xupdater
 
 post-build:
@@ -72,20 +70,20 @@ post-build:
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/build/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/build/lib/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} ">> Installing utility scripts and classes..."
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/jaxup-xupdater.jar ${STAGEDIR}${DATADIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/jaxup-xupdater ${STAGEDIR}${PREFIX}/bin/
 	@${ECHO_MSG} "  [ DONE ]"
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKSRC}/build/docs \
+	cd ${WRKSRC}/build/docs \
 	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.txt ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .endif
 
diff --git a/textproc/libxml2-reference/Makefile b/textproc/libxml2-reference/Makefile
index ec4d69bf9bd9..e1ab5e7ff29a 100644
--- a/textproc/libxml2-reference/Makefile
+++ b/textproc/libxml2-reference/Makefile
@@ -10,7 +10,11 @@ EXTRACT_ONLY=
 USES=		gmake
 MAKE_ARGS=	DOC_MODULE=libxml2 EXAMPLES_DIR=${EXAMPLESDIR}
 
-.if !defined(NOPORTEXAMPLES)
+OPTIONS_DEFINE=	EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MEXAMPLES}
 EXAMPLES=	testHTML.c testSAX.c testXPath.c xmllint.c
 PLIST_FILES=	${EXAMPLES:S|^|%%EXAMPLESDIR%%/|}
 PLIST_DIRS=	%%EXAMPLESDIR%%
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index 98ea2db3b224..adde9ec8dfa5 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libadns.so:${PORTSDIR}/dns/adns \
 
 USES=		gettext libtool
 
+OPTIONS_DEFINE=	DOCS MYSQL
+
 # Please don't remove the comments, as soon as autoconf/libtool get's
 # updated in the ports collection the comments may be removed.
 # They serve as a reminder.
@@ -24,9 +26,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-ltdl-install=no --with-gd=${LOCALBASE}/include \
 		--program-transform-name=\'\'
-.if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--with-mysql
-.endif
+MYSQL_CONFIGURE_ON=	--with-mysql
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -40,12 +40,10 @@ post-patch:
 #	${TOUCH} ${WRKSRC}/libltdl/config.status
 
 post-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/modlogan
 .for i in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}/${PREFIX}/share/doc/modlogan/${i}
 .endfor
-.endif
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/modlogan
 .for i in footer.ihtml header.ihtml output.tmpl convert_history_to_07x.pl convert_to_055.pl convert_to_060.pl
 	@${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}/${PREFIX}/share/examples/modlogan/${i}
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index 313e6655442c..82220a84d0f2 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -17,23 +17,19 @@ USE_PGSQL=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 PORTDOCS=	Changes INSTALL README primer.html
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${CP} -R ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Examples installed in ${STAGEDIR}${EXAMPLESDIR}."
-.endif
 
-.if !defined(NOPORTDOCS)
 	@${CP} -p ${WRKSRC}/doc/primer.html ${WRKSRC}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}${DOCSDIR}."
-.endif
 
 # Sample DB initialization.
 DBNAME?=	openfts
@@ -43,4 +39,4 @@ create-database:
 		psql ${DBNAME} < tsearch2.sql && \
 		psql ${DBNAME} < openfts.sql
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/p5-CAM-PDF/Makefile b/textproc/p5-CAM-PDF/Makefile
index c85f5227fc23..c7a32063fc2c 100644
--- a/textproc/p5-CAM-PDF/Makefile
+++ b/textproc/p5-CAM-PDF/Makefile
@@ -23,13 +23,13 @@ TEST_DEPENDS=	p5-Test-Memory-Cycle>=1.02:${PORTSDIR}/devel/p5-Test-Memory-Cycle
 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/textproc/p5-PerlPoint-Package/Makefile b/textproc/p5-PerlPoint-Package/Makefile
index 16614bc213ff..43f64383a080 100644
--- a/textproc/p5-PerlPoint-Package/Makefile
+++ b/textproc/p5-PerlPoint-Package/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	# suck all DOCSDIR
 
 post-install:
@@ -27,6 +28,5 @@ post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} utilities ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/demo && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-PerlPoint-Package/pkg-plist b/textproc/p5-PerlPoint-Package/pkg-plist
index 3c9c40d154ac..6eadb67ef402 100644
--- a/textproc/p5-PerlPoint-Package/pkg-plist
+++ b/textproc/p5-PerlPoint-Package/pkg-plist
@@ -27,15 +27,15 @@ bin/pp2sdf
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package/.packlist
 man/man1/perlpoint.1.gz
 man/man1/pp2sdf.1.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/.pp2sdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/perlpods.pp
-%%PORTDOCS%%%%EXAMPLESDIR%%/perlpoint
-%%PORTDOCS%%%%EXAMPLESDIR%%/pp2pod
-%%PORTDOCS%%%%EXAMPLESDIR%%/pp2pp
-%%PORTDOCS%%%%EXAMPLESDIR%%/pp2ppresenter
-%%PORTDOCS%%%%EXAMPLESDIR%%/pp2sdf
-%%PORTDOCS%%%%EXAMPLESDIR%%/pp2tree
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.pp2sdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perlpods.pp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/perlpoint
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2pod
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2pp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2ppresenter
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2sdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pp2tree
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint/Package
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/PerlPoint
 @dirrmtry %%SITE_PERL%%/PerlPoint/Tags
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index 8415ca4badc1..eb71829654dd 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -21,13 +21,13 @@ USE_PERL5=	configure
 DOCSUBDIR=	/ RDF RDF/Core RDF/Core/Enumerator RDF/Core/Model \
 		RDF/Core/Storage
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 .for DOCDIR in ${DOCSUBDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/${DOCDIR}/*.html	${STAGEDIR}${DOCSDIR}/${DOCDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index adf44fdf2141..22ab6532ef85 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -19,13 +19,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.ifndef(NOPORTEXAMPLES)
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/Excel
 	${INSTALL_DATA} ${WRKSRC}/sample/README ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/*.pl ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample/Excel/* ${STAGEDIR}${EXAMPLESDIR}/Excel
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
index 1760861364ea..902eb4b012b8 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/Makefile
@@ -18,10 +18,10 @@ TEST_DEPENDS=	p5-Test-Differences>0:${PORTSDIR}/devel/p5-Test-Differences
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/*.pl ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist b/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
index cd2cdab47e11..5da4b7e3c9c5 100644
--- a/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
+++ b/textproc/p5-Syntax-Highlight-Engine-Kate/pkg-plist
@@ -273,10 +273,10 @@
 %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Yacas.pm
 %%SITE_PERL%%/Syntax/Highlight/Engine/Kate/Yacc_Bison.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine/Kate/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/hlansi.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/hlhtml.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/regen.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hlansi.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hlhtml.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/regen.pl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine/Kate
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight/Engine
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Syntax/Highlight
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index f764b55a2638..62eacb217056 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -23,13 +23,13 @@ SCRIPTS=	tdiff
 EXAMPLES=	diff.html new.txt old.txt
 EXAMPLESDIR=	${PREFIX}/share/examples/p5-Text-ParagraphDiff
 
+OPTIONS_DEFINE=	EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/bin && \
 	${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && \
 	${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-Text-ParagraphDiff/pkg-plist b/textproc/p5-Text-ParagraphDiff/pkg-plist
index 4873b6d9bf32..a5ac4d66e696 100644
--- a/textproc/p5-Text-ParagraphDiff/pkg-plist
+++ b/textproc/p5-Text-ParagraphDiff/pkg-plist
@@ -1,11 +1,11 @@
 %%PERL5_MAN3%%/Text::ParagraphDiff.3.gz
 %%SITE_PERL%%/Text/ParagraphDiff.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/diff.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/new.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/old.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tdiff
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diff.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/new.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/old.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tdiff
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text/ParagraphDiff
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Text
 @dirrmtry %%SITE_PERL%%/Text
diff --git a/textproc/p5-WDDX/Makefile b/textproc/p5-WDDX/Makefile
index 33254e0ac6df..614e07bb4c8e 100644
--- a/textproc/p5-WDDX/Makefile
+++ b/textproc/p5-WDDX/Makefile
@@ -18,10 +18,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Changes ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-DTDParser/Makefile b/textproc/p5-XML-DTDParser/Makefile
index 11078f44f186..13646854453c 100644
--- a/textproc/p5-XML-DTDParser/Makefile
+++ b/textproc/p5-XML-DTDParser/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Perl module for parsing XML DTD strings
 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/textproc/p5-XML-SAX-Machines/Makefile b/textproc/p5-XML-SAX-Machines/Makefile
index 3c81341648bf..4b45dc55c871 100644
--- a/textproc/p5-XML-SAX-Machines/Makefile
+++ b/textproc/p5-XML-SAX-Machines/Makefile
@@ -19,14 +19,14 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	EXAMPLES
+
 regression-test: build
 	${MAKE} -C ${WRKSRC} test
 
 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/textproc/p5-XML-STX/Makefile b/textproc/p5-XML-STX/Makefile
index d78d8afb27f5..a829b455c46b 100644
--- a/textproc/p5-XML-STX/Makefile
+++ b/textproc/p5-XML-STX/Makefile
@@ -18,6 +18,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure patch
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-extract:
 	@${MKDIR} ${WRKSRC}/scripts
 	@${MV} ${WRKSRC}/stx*.pl ${WRKSRC}/scripts
@@ -29,13 +31,11 @@ post-configure:
 	@${PERL} -pi -e 's/^(POD2MAN_EXE.*)$$/\1 --lax/;' ${WRKSRC}/Makefile
 
 post-install:
-.ifndef(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing additional documentation for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-STX/pkg-plist b/textproc/p5-XML-STX/pkg-plist
index e6afa0089af6..105e9d1d6109 100644
--- a/textproc/p5-XML-STX/pkg-plist
+++ b/textproc/p5-XML-STX/pkg-plist
@@ -24,9 +24,9 @@ bin/stxview.pl
 %%PORTDOCS%%%%DOCSDIR%%/STX.html
 %%PORTDOCS%%%%DOCSDIR%%/TrAXref.html
 %%PORTDOCS%%%%DOCSDIR%%/TrAXref.pod
-%%PORTDOCS%%%%EXAMPLESDIR%%/stx-filter.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/tester.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stx-filter.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tester.pl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML/STX
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/XML
diff --git a/textproc/p5-XML-Validator-Schema/Makefile b/textproc/p5-XML-Validator-Schema/Makefile
index 764873a75965..0db89188b43b 100644
--- a/textproc/p5-XML-Validator-Schema/Makefile
+++ b/textproc/p5-XML-Validator-Schema/Makefile
@@ -19,13 +19,13 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	ANNOUNCE 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/textproc/p5-xmltv/Makefile b/textproc/p5-xmltv/Makefile
index 2d953e63b6e5..03c8e40120d4 100644
--- a/textproc/p5-xmltv/Makefile
+++ b/textproc/p5-xmltv/Makefile
@@ -49,9 +49,10 @@ USE_PERL5=	configure
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
-.ifdef(NOPORTDOCS)
-EXTRA_PATCHES+=	${FILESDIR}/extra-noportdocs-patch-Makefile.PL
-.else
+OPTIONS_DEFINE=	DOCS
+
+DOCS_EXTRA_PATCHES=	${FILESDIR}/extra-noportdocs-patch-Makefile.PL
+
 PORTDOCS=	COPYING \
 		QuickStart \
 		README \
@@ -59,7 +60,6 @@ PORTDOCS=	COPYING \
 		README.win32 \
 		tv_check_doc.html \
 		tv_check_doc.jpg
-.endif
 
 # idea taken from devel/cvsweb port
 # Specify these directories in relative paths to ${PREFIX}.
diff --git a/textproc/re_graph/Makefile b/textproc/re_graph/Makefile
index 4e95c5b7fb50..c229a8780bf6 100644
--- a/textproc/re_graph/Makefile
+++ b/textproc/re_graph/Makefile
@@ -22,16 +22,14 @@ USE_PERL5=	run
 
 PLIST_FILES=	bin/re_graph
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	*
-.endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/re_graph.pl ${STAGEDIR}${PREFIX}/bin/re_graph
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/re_graph.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tut* ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index b17ecdc41227..d469b889a75f 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -29,12 +29,12 @@ NO_BUILD=	yes
 
 CONFLICTS=	saxon-6.*
 
+OPTIONS_DEFINE=	DOCS
+
 JARFILES=	saxon9-sql.jar saxon9.jar saxon9-xpath.jar saxon9-dom.jar \
 		saxon9-xqj.jar saxon9-s9api.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon bin/saxon-xquery
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
 
 .include <bsd.port.options.mk>
 
@@ -61,17 +61,17 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 .for file in ${JARFILES}
 	@${ECHO_MSG} -n " ${file}"
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${JAVAJARDIR}/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}/..."
-	@cd ${WRKSRC}/samples/ \
+	cd ${WRKSRC}/samples/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/doc/ \
+	cd ${WRKSRC}/doc/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
@@ -79,15 +79,15 @@ do-install:
 	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
 .for scriptfile in saxon saxon-xquery
 	@${ECHO_MSG} -n " ${scriptfile}"
-	@${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile}
+	${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
-	@${FIND} -s ${WRKSRC}/samples -not -type d | \
+	${FIND} -s ${WRKSRC}/samples -not -type d | \
 		${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC}/samples -type d | \
+	${FIND} -s -d ${WRKSRC}/samples -type d | \
 		${SED} -ne 's,^${WRKSRC}/samples,@dirrm ${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
 .endif
 
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index cf7f9cfaabdb..b80fde1503c0 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -22,15 +22,15 @@ NO_BUILD=	yes
 
 CONFLICTS=	saxon-devel-8.*
 
+OPTIONS_DEFINE=	DOCS
+
 JARFILES=	saxon-jdom.jar saxon.jar
 PLIST_FILES+=	${JARFILES:S,^,%%JAVAJARDIR%%/,} bin/saxon
-.if !defined(NOPORTDOCS)
 PORTDOCS=	api api-guide.html changes.html conditions.html \
 		conformance.html dtdgen.html expressions.html \
 		extensibility.html extensions.html index.html \
 		instant.html limitations.html patterns.html samples.html \
 		saxon-style.css using-xsl.html xsl-elements.html
-.endif
 
 SUB_LIST=	SAXON_JARS="${JARFILES:S,^,${JAVAJARDIR}/,}"
 SUB_FILES=	saxon.sh
@@ -39,23 +39,21 @@ do-install:
 	@${ECHO_MSG} -n ">> Installing JARs in ${JAVAJARDIR}..."
 .for JARFILE in ${JARFILES}
 	@${ECHO_MSG} -n " ${JARFILE}"
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
-	@cd ${WRKSRC}/samples/ && \
+	cd ${WRKSRC}/samples/ && \
 	  ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/{} \; && \
 	  ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC}/doc/ && \
+	cd ${WRKSRC}/doc/ && \
 	  ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; && \
 	  ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 	@${ECHO_MSG} -n ">> Installing script in ${PREFIX}/bin..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon
+	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/saxon
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.mk>
diff --git a/textproc/sdf/Makefile b/textproc/sdf/Makefile
index a95b3256080a..339deb07cf9e 100644
--- a/textproc/sdf/Makefile
+++ b/textproc/sdf/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Simple Document Format - "author-friendly" mark-up system
 USES=		perl5
 USE_PERL5=	configure
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
-.endif
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/sgmls/Makefile b/textproc/sgmls/Makefile
index 7b5b11132afc..1181bd53d784 100644
--- a/textproc/sgmls/Makefile
+++ b/textproc/sgmls/Makefile
@@ -18,22 +18,22 @@ INSTALL_TARGET=	install install.man
 PROGS=		sgmls sgmlsasp rast
 PKGDOCS=	ChangeLog INSTALL LICENSE NEWS README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/Makefile
 
 post-build:
 .for file in ${PROGS}
-	@${STRIP_CMD} ${WRKSRC}/${file}
+	${STRIP_CMD} ${WRKSRC}/${file}
 .endfor
-	@cd ${WRKSRC} && ${MAKE} test
+	cd ${WRKSRC} && ${MAKE} test
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
 	@-${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PKGDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 587256d484e4..5336469a66ed 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -18,6 +18,8 @@ CONFLICTS?=	uim-el-xemacs21-mule-[0-9]* \
 
 RUN_DEPENDS=	uim-el-agent:${PORTSDIR}/textproc/uim
 
+OPTIONS_DEFINE=	DOCS
+
 USE_BZIP2=	yes
 USE_PERL5=	build
 USE_GNOME=	intltool
@@ -36,12 +38,10 @@ LIBS+=		-L${LOCALBASE}/lib
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
-.if !defined(NOPORTDOCS)
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/emacs/README ${STAGEDIR}${DOCSDIR}/README
 	${INSTALL_DATA} ${WRKSRC}/emacs/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.ja
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index a89107c6960a..45ef3e9a9144 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -21,13 +21,17 @@ USES=		gettext gmake iconv pkgconfig perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
-.if !defined(WITHOUT_X11)
+OPTIONS_DEFINE=	DOCS X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=	libXft.so:${PORTSDIR}/x11-fonts/libXft
 CONFIGURE_ARGS+=	--with-x --with-xft
 .endif
 
 .if !defined(UIM_SLAVE)
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--with-gtk2
 .endif
@@ -45,7 +49,7 @@ PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \
 		DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}"
 .endif
 
-.if defined(WITHOUT_X11)
+.if empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	X11="@comment "
 .else
 PLIST_SUB+=	X11=""
@@ -80,7 +84,7 @@ do-build:
 .for d in replace sigscheme uim scm xim po fep emacs pixmaps tables
 	cd ${WRKSRC}/${d} && ${MAKE_CMD}
 .endfor
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD}
 .endif
 .endif
@@ -91,7 +95,7 @@ do-install:
 .for d in sigscheme uim scm xim po fep emacs pixmaps tables
 	cd ${WRKSRC}/${d} && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .endfor
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	cd ${WRKSRC}/gtk2/candwin && ${MAKE_CMD} DESTDIR=${STAGEDIR} install
 .endif
 .endif
@@ -99,7 +103,6 @@ do-install:
 .if !defined(UIM_SLAVE)
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/helperdata
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${STAGEDIR}${DOCSDIR}/KEY
@@ -108,6 +111,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${STAGEDIR}${DOCSDIR_JA}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/xim/README ${STAGEDIR}${DOCSDIR}/README.xim
 .endif
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/uml2svg/Makefile b/textproc/uml2svg/Makefile
index 97184f14b9e9..260de3d542c2 100644
--- a/textproc/uml2svg/Makefile
+++ b/textproc/uml2svg/Makefile
@@ -13,14 +13,12 @@ NO_BUILD=	yes
 
 INSTDIR=	share/xsl/uml2svg
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${TAR} -cf - . |\
 		${TAR} -xf - -C ${STAGEDIR}${DOCSDIR})
-.endif
 	${MKDIR} ${STAGEDIR}${PREFIX}/${INSTDIR}/xsl
 	dirs=$$(${FIND} ${WRKSRC}/src/xsl -type d | ${SED} 's|^${WRKSRC}/src/xsl||g'); \
 	for d in $${dirs}; do \
@@ -36,4 +34,4 @@ do-install:
 	done
 	${INSTALL_DATA} ${WRKSRC}/src/uml2svg.xsl ${STAGEDIR}${PREFIX}/${INSTDIR}/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index 30dc6629dbc1..5d4c3cf42b04 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -21,32 +21,30 @@ NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 SUFFIXES=	-sax -dom -jdom
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar bin/xincluder ${SUFFIXES:S,^,bin/xincluder,}
-.if !defined(NOPORTDOCS)
 PORTDOCS=	apidoc index.html
-.endif
 SUB_FILES=	xincluder.sh
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
 	@${ECHO_MSG} -n " xincluder"
-	@${INSTALL_SCRIPT} ${WRKDIR}/xincluder.sh ${STAGEDIR}${PREFIX}/bin/xincluder
+	${INSTALL_SCRIPT} ${WRKDIR}/xincluder.sh ${STAGEDIR}${PREFIX}/bin/xincluder
 .for suffix in ${SUFFIXES}
 	@${ECHO_MSG} -n " xincluder${suffix}"
-	@${LN} -s xincluder ${STAGEDIR}${PREFIX}/bin/xincluder${suffix}
+	${LN} -s xincluder ${STAGEDIR}${PREFIX}/bin/xincluder${suffix}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@cd ${WRKSRC} \
+	cd ${WRKSRC} \
 	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
 	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index 78fbb3ec68b2..34007b380f5e 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -14,12 +14,11 @@ COMMENT=	Light-weight XML encoding library for Java
 USE_JAVA=	yes
 USE_ANT=	yes
 
-.if defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 ALL_TARGET=	jar
-.else
-ALL_TARGET=	jar javadoc
+DOCS_ALL_TARGET=${ALL_TARGET} javadoc
 PORTDOCS=	*
-.endif
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 
@@ -38,7 +37,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${STAGEDIR}${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
 	@cd ${WRKSRC}/build/javadoc/ \
 	  && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
diff --git a/textproc/xom/Makefile b/textproc/xom/Makefile
index 8de6899cdeaa..dd3c0d220483 100644
--- a/textproc/xom/Makefile
+++ b/textproc/xom/Makefile
@@ -20,27 +20,22 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/XOM
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-.if !defined(NOPORTDOCS)
 PORTDOCS=	overview.html apidocs
-PLIST_FILES+=	%%EXAMPLESDIR%%/xom-samples.jar
-PLIST_DIRS=	%%EXAMPLESDIR%%
-.endif
+PORTEXAMPLES=	xom-samples.jar
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing samples in ${EXAMPLESDIR}..."
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/xom-samples.jar ${STAGEDIR}${EXAMPLESDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apidocs
-	@cd ${WRKSRC}/ && ${FIND} ${PORTDOCS} \
+	cd ${WRKSRC}/ && ${FIND} ${PORTDOCS} \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
-.endif
 
 .include <bsd.port.mk>
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 70bcba1cf727..69ae1b67521e 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -19,10 +19,10 @@ USE_JAVA=	YES
 JAVA_VERSION=	1.6+
 NO_BUILD=	YES
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 OTHERDOCS=	copying.txt copyingjc.txt index.html
 PORTDOCS=	${OTHERDOCS} api
-.endif
 SAMPLES=	date.xsl nxml.xsl slides.xml slides.xsl sort-uniq.xml \
 		sort-uniq.xsl split.xml split.xsl textfile.xml textfile.xsl
 
@@ -43,13 +43,11 @@ do-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${INSTALL_DATA} ${SAMPLES} ${STAGEDIR}${EXAMPLESDIR}/
 	@${ECHO_MSG} "  [ DONE ]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} ">> Installing documentation in ${DOCSDIR}..."
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${FIND} api \
 	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
 	cd ${WRKSRC} && ${INSTALL_DATA} ${OTHERDOCS} ${STAGEDIR}${DOCSDIR}/
 	@${ECHO_MSG} "  [ DONE ]"
-.endif
 
 .include <bsd.port.mk>