25 files changed, 113 insertions, 123 deletions

diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index eb62171fd243..097f47eecf80 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -33,12 +33,14 @@ REINPLACE_ARGS=	-i ""
 SH2BASH=	samples/account-db/accdb
 UB2PFX=		samples/locate/locate samples/locate/updatedb
 
+.include <bsd.port.options.mk>
+
 post-patch:
 .for file in dbtool.cc engine.cc engine.h
 	@${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s,==,=,g" ${WRKSRC}/configure
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MEXAMPLES}
 .for file in ${SH2BASH}
 	@${REINPLACE_CMD} -e "s|/bin/sh|${LOCALBASE}/bin/bash|" ${WRKSRC}/${file}
 .endfor
diff --git a/databases/jakarta-commons-dbutils/Makefile b/databases/jakarta-commons-dbutils/Makefile
index 8c82d04354ca..ced0b6dc072e 100644
--- a/databases/jakarta-commons-dbutils/Makefile
+++ b/databases/jakarta-commons-dbutils/Makefile
@@ -23,9 +23,9 @@ ALL_TARGET=	dist
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS
+
 PORTDOCS=	LICENSE.txt api
-.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|' ${WRKSRC}/build.xml
@@ -35,7 +35,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/dist/commons-dbutils-1.1.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	@${ECHO_MSG} " [DONE]"
-.if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation..."
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/dist/docs && ${FIND} api \
diff --git a/databases/java-mybatis/Makefile b/databases/java-mybatis/Makefile
index 0a3740c2f5b4..a1f9a7c83b83 100644
--- a/databases/java-mybatis/Makefile
+++ b/databases/java-mybatis/Makefile
@@ -8,14 +8,12 @@ CATEGORIES=	databases devel java
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	java-
 DISTFILES=	${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX}
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${USER_GUIDE}
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX}
-.endif
 
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	SQL Mapping Framework
 
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-bundle${EXTRACT_SUFX}
+
 USE_JAVA=	yes
 USES=		zip
 LICENSE=	APACHE20
@@ -26,14 +24,16 @@ DEST_JAR_FILE=	${PORTNAME}.jar
 USER_GUIDE=	MyBatis-${PORTVERSION}-User-Guide.pdf
 
 PLIST_FILES+=	%%JAVAJARDIR%%/${DEST_JAR_FILE}
-
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-.endif
+
+OPTIONS_DEFINE=	DOCS
+DOCS_DISTFILES=	${USER_GUIDE}
+
+.include <bsd.port.options.mk>
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${JAR_FILE} ${STAGEDIR}${JAVAJARDIR}/${DEST_JAR_FILE}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@-${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in LICENSE NOTICE
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 54ca1f04629a..3f296032d3a8 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -20,8 +20,9 @@ USE_LDCONFIG=	yes
 
 CONFLICTS=	${PORTNAME}*-2.*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/userman/html ${STAGEDIR}${DOCSDIR}/refman/html
 	@${INSTALL_DATA} ${WRKSRC}/doc/userman/html/* ${STAGEDIR}${DOCSDIR}/userman/html
 	@${INSTALL_DATA} ${WRKSRC}/doc/refman/html/* ${STAGEDIR}${DOCSDIR}/refman/html
@@ -36,6 +37,5 @@ post-install:
 		${SED} -e "s|-lmysqlpp|-L${PREFIX}/lib -L${LOCALBASE}/lib/mysql -lmysqlpp|" \
 		> ${STAGEDIR}${EXAMPLESDIR}/Makefile
 	@${RM} -f ${STAGEDIR}${EXAMPLESDIR}/Makefile.temp
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/mysql++1/pkg-plist b/databases/mysql++1/pkg-plist
index f842f216eead..cfb3a6cc3abe 100644
--- a/databases/mysql++1/pkg-plist
+++ b/databases/mysql++1/pkg-plist
@@ -338,26 +338,26 @@ lib/libmysqlpp.so.4
 %%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s06.html
 %%PORTDOCS%%%%DOCSDIR%%/userman/html/ar01s07.html
 %%PORTDOCS%%%%DOCSDIR%%/userman/html/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/cgi_image.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom2.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom3.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom4.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/custom5.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/dbinfo.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/fieldinf1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/load_file.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/resetdb.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/simple1.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/updel.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/util.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi_image.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom2.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom3.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom4.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom5.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbinfo.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fieldinf1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/load_file.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/resetdb.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/updel.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/util.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/util.h
 @dirrm include/mysql++
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/refman/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/refman
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/userman
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile
index 54d0136de631..8ad9c03f5021 100644
--- a/databases/mysql++3/Makefile
+++ b/databases/mysql++3/Makefile
@@ -23,16 +23,14 @@ CONFLICTS=	${PORTNAME}*-1.*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
-.ifndef(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
-.endif
-.ifndef(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.h ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.cpp ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 63564a6c3890..2f02aa88d257 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -29,7 +29,8 @@ INSTALL_TARGET=	bindir=${STAGEDIR}${PREFIX}/bin install
 post-extract:
 	${CP} -p ${WRKSRC}/support-files/install.sql ${WRKSRC}/examples/
 
-.if !defined(NOPORTDOCS)
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PORTDOCS=	AUTHORS ChangeLog README doc
 PORTEXAMPLES=	crawler install.sql
 
@@ -45,7 +46,6 @@ post-install:
 .for f in ${PORTEXAMPLES}
 	cd ${WRKSRC}/examples; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
 
 install-functions:
 	mysql -u root -p -f mysql < ${EXAMPLESDIR}/install.sql
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index d0b4c73b87bc..9c6d092fad25 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -20,6 +20,8 @@ CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		${ICONV_CONFIGURE_ARG}
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include "${.CURDIR}/Makefile.common"
 
 
@@ -27,13 +29,11 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g' ${WRKSRC}/Makefile.in
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.css ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/en
 	${INSTALL_DATA} ${WRKSRC}/doc/en/*.html ${STAGEDIR}${DOCSDIR}/en
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/ja
 	${INSTALL_DATA} ${WRKSRC}/doc/ja/*.html ${STAGEDIR}${DOCSDIR}/ja
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index c0497305824a..8e34ab463f01 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -19,12 +19,10 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5
 USE_PERL5=	modbuild
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	Changes README
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-SQLite/Makefile b/databases/p5-Class-DBI-SQLite/Makefile
index 2f877ea3a7d9..98f97714d14d 100644
--- a/databases/p5-Class-DBI-SQLite/Makefile
+++ b/databases/p5-Class-DBI-SQLite/Makefile
@@ -21,12 +21,10 @@ BUILD_DEPENDS:=	${RUN_DEPENDS}
 USES=		perl5
 USE_PERL5=	configure
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	Changes
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index ab65d75b939b..01bb033718d2 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -21,9 +21,7 @@ USES=		perl5
 USE_PERL5=	configure
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/sample/* ${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Excel/pkg-plist b/databases/p5-DBD-Excel/pkg-plist
index 9ce4eb40aa23..dabfa2a5edc6 100644
--- a/databases/p5-DBD-Excel/pkg-plist
+++ b/databases/p5-DBD-Excel/pkg-plist
@@ -1,20 +1,20 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel/.packlist
 %%SITE_PERL%%/DBD/Excel.pm
-%%PORTDOCS%%share/examples/DBD-Excel/README
-%%PORTDOCS%%share/examples/DBD-Excel/dbdtest.xls
-%%PORTDOCS%%share/examples/DBD-Excel/newxl.xls
-%%PORTDOCS%%share/examples/DBD-Excel/res_hidden
-%%PORTDOCS%%share/examples/DBD-Excel/res_testj
-%%PORTDOCS%%share/examples/DBD-Excel/res_tex
-%%PORTDOCS%%share/examples/DBD-Excel/res_texj
-%%PORTDOCS%%share/examples/DBD-Excel/testj.pl
-%%PORTDOCS%%share/examples/DBD-Excel/testj.xls
-%%PORTDOCS%%share/examples/DBD-Excel/tex.pl
-%%PORTDOCS%%share/examples/DBD-Excel/texj.pl
-%%PORTDOCS%%share/examples/DBD-Excel/thidden.pl
-%%PORTDOCS%%share/examples/DBD-Excel/thidden.xls
+%%PORTEXAMPLES%%share/examples/DBD-Excel/README
+%%PORTEXAMPLES%%share/examples/DBD-Excel/dbdtest.xls
+%%PORTEXAMPLES%%share/examples/DBD-Excel/newxl.xls
+%%PORTEXAMPLES%%share/examples/DBD-Excel/res_hidden
+%%PORTEXAMPLES%%share/examples/DBD-Excel/res_testj
+%%PORTEXAMPLES%%share/examples/DBD-Excel/res_tex
+%%PORTEXAMPLES%%share/examples/DBD-Excel/res_texj
+%%PORTEXAMPLES%%share/examples/DBD-Excel/testj.pl
+%%PORTEXAMPLES%%share/examples/DBD-Excel/testj.xls
+%%PORTEXAMPLES%%share/examples/DBD-Excel/tex.pl
+%%PORTEXAMPLES%%share/examples/DBD-Excel/texj.pl
+%%PORTEXAMPLES%%share/examples/DBD-Excel/thidden.pl
+%%PORTEXAMPLES%%share/examples/DBD-Excel/thidden.xls
 %%PERL5_MAN3%%/DBD::Excel.3.gz
 @dirrmtry %%SITE_PERL%%/DBD
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Excel
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD
-%%PORTDOCS%%@dirrmtry share/examples/DBD-Excel
+%%PORTEXAMPLES%%@dirrmtry share/examples/DBD-Excel
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 420dfa6828a5..7fd2a89260f0 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -10,9 +10,11 @@ MASTER_SITES=	http://pgfoundry.org/frs/download.php/2575/ \
 MAINTAINER=	pea@raveland.org
 COMMENT=	PostgreSQL log analyzer
 
-NO_BUILD =	Yes
+NO_BUILD=	Yes
 USE_PHP=	gd pcre
 
+OPTIONS_DEFINE=	DOCS
+
 pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/bin/php,${LOCALBASE}/bin/php,g;' \
 		-e 's,!!PREFIX!!,${PREFIX},g' \
@@ -25,12 +27,10 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/include
 	${INSTALL_DATA} ${WRKSRC}/version.php ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/include/
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog 	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/THANKS 	${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/rpm-specific/sources/pgfouine-tutorial.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgloader/Makefile b/databases/pgloader/Makefile
index df806b5897be..dde92c99b646 100644
--- a/databases/pgloader/Makefile
+++ b/databases/pgloader/Makefile
@@ -15,6 +15,8 @@ USE_PYTHON=	yes
 
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:${PORTSDIR}/databases/py-psycopg2
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/share/python-support,${PYTHON_SITELIBDIR},' ${WRKSRC}/pgloader/options.py
 
@@ -25,15 +27,11 @@ do-install:
 	@cd ${WRKSRC}/pgloader && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHON_SITELIBDIR}/pgloader/
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/pgloader/reformat
 	@cd ${WRKSRC}/reformat && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHON_SITELIBDIR}/pgloader/reformat/
-.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/BUGS.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/TODO.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/pgloader.1.txt ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool-II-22/Makefile b/databases/pgpool-II-22/Makefile
index 3e48265a2417..47529e1979a8 100644
--- a/databases/pgpool-II-22/Makefile
+++ b/databases/pgpool-II-22/Makefile
@@ -24,6 +24,8 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
@@ -43,7 +45,6 @@ post-install:
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
@@ -52,6 +53,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 PORTDOCS+=	${PORTDOCShtml}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool-II-23/Makefile b/databases/pgpool-II-23/Makefile
index 3acddc6141c2..f8c05c3de41d 100644
--- a/databases/pgpool-II-23/Makefile
+++ b/databases/pgpool-II-23/Makefile
@@ -24,6 +24,8 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
@@ -43,7 +45,6 @@ post-install:
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
@@ -52,6 +53,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 PORTDOCS+=	${PORTDOCShtml}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool-II-30/Makefile b/databases/pgpool-II-30/Makefile
index 5c7adcfde682..2b3cebd68c03 100644
--- a/databases/pgpool-II-30/Makefile
+++ b/databases/pgpool-II-30/Makefile
@@ -25,6 +25,8 @@ PORTDOCS+=	TODO
 PORTDOCShtml=	pgpool-en.html pgpool-ja.html pgpool.css
 PORTDOCShtml+=	tutorial-en.html tutorial-ja.html
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
@@ -45,7 +47,6 @@ post-install:
 .for f in pgpool_recovery pgpool_recovery_pitr pgpool_remote_start
 	${INSTALL_SCRIPT} ${WRKSRC}/sample/${f}  ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
 	@${MKDIR}  ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f  ${STAGEDIR}${DOCSDIR}
@@ -54,6 +55,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/$f  ${STAGEDIR}${DOCSDIR}
 .endfor
 PORTDOCS+=	${PORTDOCShtml}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile
index c17ebd02e584..98b44deb9987 100644
--- a/databases/pgpool/Makefile
+++ b/databases/pgpool/Makefile
@@ -18,12 +18,12 @@ CONFLICTS=	pgpool-II-*
 
 PORTDOCS=	README AUTHORS COPYING ChangeLog INSTALL NEWS TODO README.euc_jp
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-plruby/Makefile b/databases/postgresql-plruby/Makefile
index b63257619e48..f22825fb52c2 100644
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@@ -36,15 +36,19 @@ INSTALL_TARGET=	site-install
 
 DOCS=		Changes plruby.html plruby.rd
 
+OPTIONS_DEFINE=	DOCS
+
 PKGMESSAGE=	${WRKDIR}/createlang.sql
 
+.include <bsd.port.options.mk>
+
 post-fetch:
 	cd ${PGSQL_PORTDIR} && ${MAKE} -DBATCH patch
 
 post-build:
 	${SED} 's,!!PLRUBY_SO!!,${RUBY_SITEARCHLIBDIR}/plruby.so,' \
 		${FILESDIR}/createlang.sql > ${WRKDIR}/createlang.sql
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc
 .endif
 
@@ -53,7 +57,7 @@ post-build:
 post-install:
 	@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs/doc ${STAGEDIR}${RUBY_MODDOCDIR}/ README.markdown && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${RUBY_MODDOCDIR}/
 	${FIND} -ds ${STAGEDIR}${RUBY_MODDOCDIR} -type f -print | ${SED} -E -e \
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index bed0176d11c4..1350e0b9da47 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -16,10 +16,10 @@ USE_LDCONFIG=	yes
 
 DOCS=		AUTHORS FORMAT_DESCR NEWS 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/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
index 0a42ed7b4ea1..a5cfa92a9655 100644
--- a/databases/py-psycopg/Makefile
+++ b/databases/py-psycopg/Makefile
@@ -28,12 +28,10 @@ CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} \
 		--with-postgres-includes=${LOCALBASE}/include \
 		--with-mxdatetime-includes=${DATETIME_INC}
 
-.if defined(WITH_ZOPE)
-USES+=		zope
-PLIST_SUB+=	ZOPE=""
-.else
-PLIST_SUB+=	ZOPE="@comment "
-.endif
+OPTIONS_DEFINE=	ZOPE DOCS
+OPTIONS_SUB=	yes
+
+ZOPE_USES=	zope
 
 DATETIME_DEP=	${PYTHON_SITELIBDIR}/mx/DateTime/__init__.py
 DATETIME_INC=	${PYTHON_SITELIBDIR}/mx/DateTime/mxDateTime/
@@ -49,14 +47,10 @@ EXAMPLES=	binary.py bool.py bounded.py commit.py copy_from.py \
 DOCS=		AUTHORS COPYING CREDITS ChangeLog FAQ INSTALL NEWS \
 		README RELEASE-1.0 SUCCESS TODO
 
-pre-everything::
-.if !defined(WITH_ZOPE)
-	@${ECHO} ""
-	@${ECHO} "* To build with Zope support please specify WITH_ZOPE=YES"
-	@${ECHO} ""
-.endif
 
-.if defined(WITH_ZOPE)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MZOPE}
 post-build:
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/ZPsycopgDA
 .endif
@@ -65,13 +59,12 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/psycopgmodule.so \
 		${STAGEDIR}${PYTHON_SITELIBDIR}
-.if defined(WITH_ZOPE)
+.if ${PORT_OPTIONS:MZOPE}
 	${MKDIR} ${STAGEDIR}${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/ZPsycopgDA
 	${CP} -R ${WRKSRC}/ZPsycopgDA ${STAGEDIR}${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${EXAMPLES}
 	@${INSTALL_DATA} ${WRKSRC}/doc/examples/${f} ${STAGEDIR}${EXAMPLESDIR}
@@ -80,8 +73,7 @@ post-install:
 .for f in ${DOCS}
 	@${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if !defined(BATCH) && defined(WITH_ZOPE)
+.if !defined(BATCH) && ${PORT_OPTIONS:MZOPE}
 	@${ECHO} ""
 	@${ECHO} "To complete the installation of ZPsycopgDA:"
 	@${ECHO} ""
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index 639dde9b4140..f347fc2b44d7 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -19,10 +19,15 @@ LIB_DEPENDS=	libtds.so:${PORTSDIR}/databases/freetds
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+OPTIONS_DEFINE=	DOCS THREADS EXAMPLES
+OPTIONS_DEFAULT=THREADS
+
 .if defined(TDS_VERSION)
 TDS_SUF="=${TDS_VERSION}"
 .else
 
+.include <bsd.port.options.mk>
+
 pre-build:
 	@V=`${PKG_INFO} | ${SED} -ne 's/^freetds-0.\(..\).*/\1/p'` ; \
 	if [ $$V -le 60 ]; then \
@@ -34,7 +39,7 @@ pre-build:
 
 MAKE_ENV+=	SYBASE=${LOCALBASE}
 
-.if !defined(WITHOUT_THREADS)
+.if ${PORT_OPTIONS:MTHREADS}
 BUILDARGS=	-D WANT_THREADS -U WANT_BULKCOPY -D HAVE_FREETDS${TDS_SUF}
 .else
 BUILDARGS=	-U WANT_BULKCOPY -D HAVE_FREETDS${TDS_SUF}
@@ -46,10 +51,8 @@ do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} build)
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -cf - -C ${WRKSRC}/examples . | ${TAR} -xf - -C ${STAGEDIR}${EXAMPLESDIR}
 	@${TAR} -cf - -C ${WRKDIR}/${PORTNAME} . | ${TAR} -xf - -C ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/py-sybase/pkg-plist b/databases/py-sybase/pkg-plist
index 0420d4e8987c..0f360de53c25 100644
--- a/databases/py-sybase/pkg-plist
+++ b/databases/py-sybase/pkg-plist
@@ -50,26 +50,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/icons/previous.png
 %%PORTDOCS%%%%DOCSDIR%%/icons/up.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/up.png
-%%PORTDOCS%%share/examples/sybase/README
-%%PORTDOCS%%share/examples/sybase/array_bind.py
-%%PORTDOCS%%share/examples/sybase/array_bind.sql
-%%PORTDOCS%%share/examples/sybase/bulkcopy.py
-%%PORTDOCS%%share/examples/sybase/bulkcopy.sql
-%%PORTDOCS%%share/examples/sybase/cursor_sel.py
-%%PORTDOCS%%share/examples/sybase/cursor_upd.py
-%%PORTDOCS%%share/examples/sybase/cursor_upd.sql
-%%PORTDOCS%%share/examples/sybase/diag_example.py
-%%PORTDOCS%%share/examples/sybase/dynamic_cur.py
-%%PORTDOCS%%share/examples/sybase/dynamic_ins.py
-%%PORTDOCS%%share/examples/sybase/dynamic_ins.sql
-%%PORTDOCS%%share/examples/sybase/example.py
-%%PORTDOCS%%share/examples/sybase/mult_text.py
-%%PORTDOCS%%share/examples/sybase/mult_text.sql
-%%PORTDOCS%%share/examples/sybase/params.py
-%%PORTDOCS%%share/examples/sybase/rpc.py
-%%PORTDOCS%%share/examples/sybase/rpc.sql
-%%PORTDOCS%%share/examples/sybase/timeout.py
-%%PORTDOCS%%share/examples/sybase/timeout.readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array_bind.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/array_bind.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bulkcopy.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bulkcopy.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_sel.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_upd.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cursor_upd.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/diag_example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_cur.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_ins.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_ins.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mult_text.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mult_text.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/params.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rpc.sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timeout.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timeout.readme
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm share/examples/sybase
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/databases/rrdmerge/Makefile b/databases/rrdmerge/Makefile
index fae29a35b759..6380d039abf1 100644
--- a/databases/rrdmerge/Makefile
+++ b/databases/rrdmerge/Makefile
@@ -24,12 +24,12 @@ PLIST_FILES=	bin/${PORTNAME} bin/${PORTNAME}tree
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rrdmerge ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/rrdmergetree ${STAGEDIR}${PREFIX}/bin
-.ifndef(NOPORTDOCS)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/README.rst ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}
-.endif
 
 .include <bsd.port.mk>
diff --git a/databases/sqlite-ext-miscfuncs/Makefile b/databases/sqlite-ext-miscfuncs/Makefile
index 5fd4ae1d67c4..e2ccd6d762f4 100644
--- a/databases/sqlite-ext-miscfuncs/Makefile
+++ b/databases/sqlite-ext-miscfuncs/Makefile
@@ -35,6 +35,8 @@ PORTDOCS=	README
 
 CFLAGS+=	-I${PREFIX}/include -fPIC -lm -shared
 
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	@cd ${WRKSRC} && ${CC} ${CFLAGS} ${SRCFILE} -o ${LIBFILE}
 
@@ -43,9 +45,7 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/${LIBFILE} ${STAGEDIR}${INST_DIR}
 
 post-install:
-.if !defined(NOPORTDOCS)
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	@${CP} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>