4 files changed, 40 insertions, 37 deletions

diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index 5071e5e6e72a..f36a2138fd7d 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -18,6 +18,7 @@ CONFIGURE_ARGS=	--disable-static \
 		--with-dbi-incdir=${LOCALBASE}/include/dbi
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}
 
+OPTIONS_DEFINE=	DOCS
 OPTIONS_MULTI=	DRIVER
 OPTIONS_MULTI_DRIVER=	MYSQL PGSQL SQLITE3
 
diff --git a/databases/libdbi-drivers/pkg-plist b/databases/libdbi-drivers/pkg-plist
index 3ba5504838da..87f605f8c6f3 100644
--- a/databases/libdbi-drivers/pkg-plist
+++ b/databases/libdbi-drivers/pkg-plist
@@ -5,38 +5,38 @@
 %%SQLITE3%%lib/dbd/libdbdsqlite3.la
 %%SQLITE3%%lib/dbd/libdbdsqlite3.so
 @dirrmtry lib/dbd
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c40.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c44.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/c98.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/copying-fdl.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/f29.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/index.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x47.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql/x61.html
-%%MYSQL%%%%DOCSDIR%%/dbd_mysql.pdf
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/f30.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/index.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install-build.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install-prereq.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/install.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/intro.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/options.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql/specific.html
-%%PGSQL%%%%DOCSDIR%%/dbd_pgsql.pdf
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c34.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c47.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c98.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/c134.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/f23.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/index.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x50.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x64.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x137.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3/x209.html
-%%SQLITE3%%%%DOCSDIR%%/dbd_sqlite3.pdf
-%%MYSQL%%@dirrm %%DOCSDIR%%/dbd_mysql
-%%PGSQL%%@dirrm %%DOCSDIR%%/dbd_pgsql
-%%SQLITE3%%@dirrm %%DOCSDIR%%/dbd_sqlite3
-@dirrm %%DOCSDIR%%
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/c40.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/c44.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/c98.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/copying-fdl.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/f29.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/index.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/x47.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql/x61.html
+%%MYSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_mysql.pdf
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/copying-fdl.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/f30.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/index.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/install-build.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/install-prereq.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/install.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/intro.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/options.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql/specific.html
+%%PGSQL%%%%PORTDOCS%%%%DOCSDIR%%/dbd_pgsql.pdf
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/c34.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/c47.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/c98.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/c134.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/copying-fdl.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/f23.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/index.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/x50.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/x64.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/x137.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3/x209.html
+%%SQLITE3%%%%PORTDOCS%%%%DOCSDIR%%/dbd_sqlite3.pdf
+%%MYSQL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/dbd_mysql
+%%PGSQL%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/dbd_pgsql
+%%SQLITE3%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/dbd_sqlite3
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 612776dae399..8818f510acef 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -29,6 +29,8 @@ SUB_LIST=	JAVA_HOME=${JAVA_HOME} PORTNAME=${PORTNAME}
 
 PORTDOCS=	readme.html
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
diff --git a/databases/sqldeveloper/pkg-plist b/databases/sqldeveloper/pkg-plist
index 2745564b6107..9a4fc771ee1d 100644
--- a/databases/sqldeveloper/pkg-plist
+++ b/databases/sqldeveloper/pkg-plist
@@ -1,5 +1,5 @@
 bin/sqldeveloper
-%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
 %%DATADIR%%/configuration/bundles.info
 %%DATADIR%%/configuration/oracle.datamodeler.bundles.info
 %%DATADIR%%/configuration/oracle.ide.sqldev.bundles.info
@@ -1815,7 +1815,7 @@ bin/sqldeveloper
 %%DATADIR%%/svnkit/svnkit.jar
 %%DATADIR%%/svnkit/trilead.jar
 %%DATADIR%%/view-source-paths.lis
-@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrmtry %%DATADIR%%/configuration
 @dirrmtry %%DATADIR%%/dataminer/scripts
 @dirrmtry %%DATADIR%%/dataminer