aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2014-08-04 03:40:14 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2014-08-04 03:40:14 +0000
commit511c49bdecf1a9776490a13ab0dab1f7fc561bbf (patch)
tree813aa84d1ad8bd3cfafe0793f530eff6e9c6194c
parent5dfe9b3be2f14294a78990688d738da43cf60950 (diff)
downloadports-511c49bdecf1a9776490a13ab0dab1f7fc561bbf.tar.gz
ports-511c49bdecf1a9776490a13ab0dab1f7fc561bbf.zip
Notes
-rw-r--r--cad/geda-utils/Makefile2
-rw-r--r--cad/geda-utils/pkg-plist14
-rw-r--r--databases/libdbi-drivers/Makefile1
-rw-r--r--databases/libdbi-drivers/pkg-plist70
-rw-r--r--databases/sqldeveloper/Makefile2
-rw-r--r--databases/sqldeveloper/pkg-plist4
-rw-r--r--deskutils/cycle/Makefile2
-rw-r--r--deskutils/cycle/pkg-plist8
-rw-r--r--devel/buildtool/Makefile2
-rw-r--r--devel/buildtool/pkg-plist14
-rw-r--r--devel/flex-sdk35/Makefile10
-rw-r--r--devel/flex-sdk35/pkg-plist6
-rw-r--r--devel/flex_compiler_shell/Makefile4
-rw-r--r--devel/flex_compiler_shell/pkg-plist4
-rw-r--r--devel/fnorb/Makefile2
-rw-r--r--devel/fnorb/pkg-plist146
-rw-r--r--devel/pcre++/Makefile2
-rw-r--r--devel/pcre++/pkg-plist72
-rw-r--r--editors/conglomerate/Makefile2
-rw-r--r--editors/conglomerate/pkg-plist246
-rw-r--r--emulators/xzx/Makefile2
-rw-r--r--emulators/xzx/pkg-plist8
-rw-r--r--french/verbiste/Makefile2
-rw-r--r--french/verbiste/pkg-plist36
-rw-r--r--games/lincity-ng/Makefile2
-rw-r--r--games/lincity-ng/pkg-plist20
-rw-r--r--games/lucidlife/Makefile2
-rw-r--r--games/lucidlife/pkg-plist30
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/giram/pkg-plist4
-rw-r--r--graphics/gle/Makefile2
-rw-r--r--graphics/gle/pkg-plist226
-rw-r--r--graphics/gnash/Makefile2
-rw-r--r--graphics/gnash/pkg-plist10
-rw-r--r--graphics/openjpeg15/Makefile2
-rw-r--r--graphics/openjpeg15/pkg-plist6
-rw-r--r--japanese/freepwing/Makefile2
-rw-r--r--japanese/freepwing/pkg-plist24
-rw-r--r--japanese/marumoji-fonts/Makefile4
-rw-r--r--japanese/marumoji-fonts/pkg-plist4
-rw-r--r--japanese/nethack34/files/patch-aa11
-rw-r--r--japanese/nethack34/files/patch-ab13
-rw-r--r--japanese/nethack34/files/patch-ac29
-rw-r--r--japanese/nethack34/files/patch-ad119
-rw-r--r--japanese/nethack34/files/patch-ae51
-rw-r--r--japanese/nethack34/files/patch-af41
-rw-r--r--japanese/nethack34/files/patch-ag21
-rw-r--r--japanese/nethack34/files/patch-ai10
-rw-r--r--japanese/nethack34/files/patch-ja14
-rw-r--r--lang/alisp/Makefile2
-rw-r--r--lang/alisp/pkg-plist4
-rw-r--r--lang/mixal/pkg-plist2
-rw-r--r--lang/nml/pkg-plist8
-rw-r--r--lang/sketchy/Makefile2
-rw-r--r--lang/sketchy/pkg-plist352
-rw-r--r--mail/gnarwl/Makefile2
-rw-r--r--mail/gnarwl/pkg-plist20
-rw-r--r--math/plplot/Makefile4
-rw-r--r--math/plplot/pkg-plist38
-rw-r--r--math/solitaire/Makefile2
-rw-r--r--math/solitaire/pkg-plist6
-rw-r--r--misc/pypanda/Makefile2
-rw-r--r--misc/pypanda/pkg-plist4
-rw-r--r--misc/tpp/Makefile2
-rw-r--r--misc/tpp/pkg-plist54
-rw-r--r--net-p2p/btqueue/Makefile4
-rw-r--r--net-p2p/btqueue/pkg-plist8
-rw-r--r--net/tsocks/pkg-plist4
-rw-r--r--news/slnr/pkg-plist12
-rw-r--r--science/svmlight/Makefile2
-rw-r--r--science/svmlight/pkg-plist4
-rw-r--r--x11-fonts/webfonts/Makefile2
-rw-r--r--x11-fonts/webfonts/pkg-plist4
-rw-r--r--x11-wm/gcompmgr/Makefile1
-rw-r--r--x11-wm/gcompmgr/pkg-plist12
-rw-r--r--x11-wm/wmanager/pkg-plist20
-rw-r--r--x11/metisse/Makefile2
-rw-r--r--x11/metisse/pkg-plist20
78 files changed, 825 insertions, 1086 deletions
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 449239618cbd..59e919dd6b38 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -30,6 +30,8 @@ CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -E \
-e "s,^(DATADIR[[:space:]]*=[[:space:]]*)gEDA,\1geda," \
diff --git a/cad/geda-utils/pkg-plist b/cad/geda-utils/pkg-plist
index 0362817da875..31ba9efe533e 100644
--- a/cad/geda-utils/pkg-plist
+++ b/cad/geda-utils/pkg-plist
@@ -17,11 +17,11 @@ bin/sarlacc_sym
bin/smash_megafile
bin/tragesym
man/man1/grenum.1.gz
-%%DOCSDIR%%/readmes/README.grenum
-%%DOCSDIR%%/readmes/README.gsch2pcb
-%%DOCSDIR%%/readmes/README.olib
-%%DOCSDIR%%/readmes/README.tragesym
-%%DATADIR%%/system-gschlasrc
+%%PORTDOCS%%%%DOCSDIR%%/readmes/README.grenum
+%%PORTDOCS%%%%DOCSDIR%%/readmes/README.gsch2pcb
+%%PORTDOCS%%%%DOCSDIR%%/readmes/README.olib
+%%PORTDOCS%%%%DOCSDIR%%/readmes/README.tragesym
+%%PORTDOCS%%%%DATADIR%%/system-gschlasrc
@dirrmtry %%DATADIR%%
-@dirrmtry %%DOCSDIR%%/readmes
-@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/readmes
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
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
diff --git a/deskutils/cycle/Makefile b/deskutils/cycle/Makefile
index ec7eb5033aa1..7abd1ab81c72 100644
--- a/deskutils/cycle/Makefile
+++ b/deskutils/cycle/Makefile
@@ -18,6 +18,8 @@ USE_WX= 3.0+
WX_COMPS= python
NO_BUILD= yes
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -e 's,"msg","${PREFIX}/share/locale",' \
-e 's,"","${DOCSDIR}", ; s,"icons","${DATADIR}/icons",' \
diff --git a/deskutils/cycle/pkg-plist b/deskutils/cycle/pkg-plist
index 08f6e8bd301c..f09698c28056 100644
--- a/deskutils/cycle/pkg-plist
+++ b/deskutils/cycle/pkg-plist
@@ -17,9 +17,9 @@ man/man1/cycle.1.gz
%%DATADIR%%/icons/cycle.xpm
%%DATADIR%%/icons/large/cycle.xpm
%%DATADIR%%/icons/mini/cycle.xpm
-%%DOCSDIR%%/README.html
-%%DOCSDIR%%/README_de.html
-%%DOCSDIR%%/README_ru.html
+%%PORTDOCS%%%%DOCSDIR%%/README.html
+%%PORTDOCS%%%%DOCSDIR%%/README_de.html
+%%PORTDOCS%%%%DOCSDIR%%/README_ru.html
share/locale/ca/LC_MESSAGES/cycle.mo
share/locale/cs/LC_MESSAGES/cycle.mo
share/locale/de/LC_MESSAGES/cycle.mo
@@ -27,7 +27,7 @@ share/locale/es/LC_MESSAGES/cycle.mo
share/locale/gl/LC_MESSAGES/cycle.mo
share/locale/ru/LC_MESSAGES/cycle.mo
share/locale/sk/LC_MESSAGES/cycle.mo
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/icons/mini
@dirrm %%DATADIR%%/icons/large
@dirrm %%DATADIR%%/icons
diff --git a/devel/buildtool/Makefile b/devel/buildtool/Makefile
index 1079d5e1ea71..dcba8d1c7616 100644
--- a/devel/buildtool/Makefile
+++ b/devel/buildtool/Makefile
@@ -12,4 +12,6 @@ COMMENT= Set of portable software build utilities
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -p ${PREFIX} -d ${DOCSDIR}
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/devel/buildtool/pkg-plist b/devel/buildtool/pkg-plist
index 1eb66a81bb92..d098e9553886 100644
--- a/devel/buildtool/pkg-plist
+++ b/devel/buildtool/pkg-plist
@@ -28,13 +28,13 @@ share/buildtool/bt_logic/texinfo.subr
share/buildtool/templates/README.bt
share/buildtool/templates/bt_config.conf.in
share/buildtool/templates/pkgflags
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/DIFFS.bt_sh
-%%DOCSDIR%%/PEOPLE
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DIFFS.bt_sh
+%%PORTDOCS%%%%DOCSDIR%%/PEOPLE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/buildtool
@dirrm share/buildtool/bt_config
@dirrm share/buildtool/bt_logic
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index e9166d40cb18..f375aac12a19 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -25,6 +25,8 @@ SUB_LIST= PORTNAME=${PORTNAME}
SCRIPTS= aasdoc acompc amxmlc asdoc compc copylocale digest \
fcsh fdb mxmlc optimizer
+OPTIONS_DEFINE= DOCS
+
post-extract:
${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/*.exe
@@ -33,17 +35,17 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
.endfor
- ${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
+ @${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
${INSTALL_DATA} ${WRKSRC}/ant/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/
- ${MKDIR} ${STAGEDIR}${DATADIR}/frameworks
+ @${MKDIR} ${STAGEDIR}${DATADIR}/frameworks
${CP} -r ${WRKSRC}/frameworks/ ${STAGEDIR}${DATADIR}/frameworks/
- ${MKDIR} ${STAGEDIR}${DATADIR}/asdoc/templates
+ @${MKDIR} ${STAGEDIR}${DATADIR}/asdoc/templates
${CP} -r ${WRKSRC}/asdoc/templates/ ${STAGEDIR}${DATADIR}/asdoc/templates/
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${CP} -r ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
diff --git a/devel/flex-sdk35/pkg-plist b/devel/flex-sdk35/pkg-plist
index 97e2e02612f5..5d45e57e1a6f 100644
--- a/devel/flex-sdk35/pkg-plist
+++ b/devel/flex-sdk35/pkg-plist
@@ -1215,9 +1215,9 @@ bin/optimizer
%%DATADIR%%/frameworks/themes/Wooden/preview.jpg
%%DATADIR%%/frameworks/themes/Wooden/wooden_bg.jpg
%%DATADIR%%/frameworks/winFonts.ser
-%%DOCSDIR%%/license-mpl.htm
-%%DOCSDIR%%/readme-open.htm
-@dirrmtry %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/license-mpl.htm
+%%PORTDOCS%%%%DOCSDIR%%/readme-open.htm
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
@dirrmtry %%DATADIR%%/frameworks/themes/Wooden
@dirrmtry %%DATADIR%%/frameworks/themes/Smoke
@dirrmtry %%DATADIR%%/frameworks/themes/Institutional
diff --git a/devel/flex_compiler_shell/Makefile b/devel/flex_compiler_shell/Makefile
index 5b6e41e7c80b..93b2d057d03b 100644
--- a/devel/flex_compiler_shell/Makefile
+++ b/devel/flex_compiler_shell/Makefile
@@ -23,10 +23,12 @@ WRKSRC= ${WRKDIR}
NO_BUILD= YES
SUB_FILES= fcsh
+OPTIONS_DEFINE= DOCS
+
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/fcsh ${STAGEDIR}${PREFIX}/bin/
${INSTALL_DATA} ${WRKSRC}/lib/fcsh.jar ${STAGEDIR}${JAVAJARDIR}/flex-sdk/
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/FlexCompilerShell-license.txt ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>
diff --git a/devel/flex_compiler_shell/pkg-plist b/devel/flex_compiler_shell/pkg-plist
index 432a843fd701..3b2322bb7b0d 100644
--- a/devel/flex_compiler_shell/pkg-plist
+++ b/devel/flex_compiler_shell/pkg-plist
@@ -1,4 +1,4 @@
bin/fcsh
%%JAVAJARDIR%%/flex-sdk/fcsh.jar
-%%DOCSDIR%%/FlexCompilerShell-license.txt
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/FlexCompilerShell-license.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index d41748193123..36713d21780d 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -20,4 +20,6 @@ PYDISTUTILS_SETUP= ${PYSETUP}
PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/devel/fnorb/pkg-plist b/devel/fnorb/pkg-plist
index 388261351ab4..f4f45fc100b6 100644
--- a/devel/fnorb/pkg-plist
+++ b/devel/fnorb/pkg-plist
@@ -272,68 +272,68 @@ bin/fnping
%%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyc
%%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyo
%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/LICENSE.HTML
-%%DOCSDIR%%/MANIFEST.in
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.jython
-%%DOCSDIR%%/examples/hello-world/HelloWorld.idl
-%%DOCSDIR%%/examples/hello-world/README
-%%DOCSDIR%%/examples/hello-world/client.py
-%%DOCSDIR%%/examples/hello-world/server.py
-%%DOCSDIR%%/examples/misc/Example.idl
-%%DOCSDIR%%/examples/misc/README
-%%DOCSDIR%%/examples/misc/client.py
-%%DOCSDIR%%/examples/misc/server.py
-%%DOCSDIR%%/examples/naming/README
-%%DOCSDIR%%/examples/naming/Thermometer.idl
-%%DOCSDIR%%/examples/naming/client.py
-%%DOCSDIR%%/examples/naming/server.py
-%%DOCSDIR%%/examples/threaded/HelloWorld.idl
-%%DOCSDIR%%/examples/threaded/README
-%%DOCSDIR%%/examples/threaded/client.py
-%%DOCSDIR%%/examples/threaded/server.py
-%%DOCSDIR%%/examples/tkinter/README
-%%DOCSDIR%%/examples/tkinter/TicToc.idl
-%%DOCSDIR%%/examples/tkinter/client.py
-%%DOCSDIR%%/examples/tkinter/server.py
-%%DOCSDIR%%/examples/unions/README
-%%DOCSDIR%%/examples/unions/Unions.idl
-%%DOCSDIR%%/examples/unions/client.py
-%%DOCSDIR%%/examples/unions/server.py
-%%DOCSDIR%%/tests/datatransfer/DataTransferServer.py
-%%DOCSDIR%%/tests/datatransfer/alltests.py
-%%DOCSDIR%%/tests/datatransfer/chartest.py
-%%DOCSDIR%%/tests/datatransfer/datatransfer.idl
-%%DOCSDIR%%/tests/datatransfer/fixedtest.py
-%%DOCSDIR%%/tests/datatransfer/longtest.py
-%%DOCSDIR%%/tests/datatransfer/orbrunner.py
-%%DOCSDIR%%/tests/datatransfer/seqtest.py
-%%DOCSDIR%%/tests/datatransfer/serverrunner.py
-%%DOCSDIR%%/tests/datatransfer/shorttest.py
-%%DOCSDIR%%/tests/datatransfer/wchartest.py
-%%DOCSDIR%%/tests/datatransfer/wstringtest.py
-%%DOCSDIR%%/tests/interop/CharClient.cpp
-%%DOCSDIR%%/tests/interop/CharServer.cpp
-%%DOCSDIR%%/tests/interop/Client.h
-%%DOCSDIR%%/tests/interop/FixedClient.cpp
-%%DOCSDIR%%/tests/interop/FixedServer.cpp
-%%DOCSDIR%%/tests/interop/Makefile.omniorb
-%%DOCSDIR%%/tests/interop/Makefile.orbacus
-%%DOCSDIR%%/tests/interop/Makefile.tao
-%%DOCSDIR%%/tests/interop/README
-%%DOCSDIR%%/tests/interop/Server.h
-%%DOCSDIR%%/tests/interop/TestCharsClient.py
-%%DOCSDIR%%/tests/interop/TestCharsServer.py
-%%DOCSDIR%%/tests/interop/TestChars_impl.cpp
-%%DOCSDIR%%/tests/interop/TestChars_impl.h
-%%DOCSDIR%%/tests/interop/TestFixedClient.py
-%%DOCSDIR%%/tests/interop/TestFixedServer.py
-%%DOCSDIR%%/tests/interop/TestFixed_impl.cpp
-%%DOCSDIR%%/tests/interop/TestFixed_impl.h
-%%DOCSDIR%%/tests/interop/TestInterop.idl
-%%DOCSDIR%%/tests/interop/Utils.cpp
-%%DOCSDIR%%/tests/interop/Utils.h
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.HTML
+%%PORTDOCS%%%%DOCSDIR%%/MANIFEST.in
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.jython
+%%PORTDOCS%%%%DOCSDIR%%/examples/hello-world/HelloWorld.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/hello-world/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/hello-world/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/hello-world/server.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/misc/Example.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/misc/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/misc/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/misc/server.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/naming/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/naming/Thermometer.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/naming/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/naming/server.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/threaded/HelloWorld.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/threaded/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/threaded/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/threaded/server.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/tkinter/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/tkinter/TicToc.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/tkinter/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/tkinter/server.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/unions/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/unions/Unions.idl
+%%PORTDOCS%%%%DOCSDIR%%/examples/unions/client.py
+%%PORTDOCS%%%%DOCSDIR%%/examples/unions/server.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/DataTransferServer.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/alltests.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/chartest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/datatransfer.idl
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/fixedtest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/longtest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/orbrunner.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/seqtest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/serverrunner.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/shorttest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/wchartest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/datatransfer/wstringtest.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/CharClient.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/CharServer.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Client.h
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/FixedClient.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/FixedServer.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Makefile.omniorb
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Makefile.orbacus
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Makefile.tao
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/README
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Server.h
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestCharsClient.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestCharsServer.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestChars_impl.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestChars_impl.h
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestFixedClient.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestFixedServer.py
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestFixed_impl.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestFixed_impl.h
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/TestInterop.idl
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Utils.cpp
+%%PORTDOCS%%%%DOCSDIR%%/tests/interop/Utils.h
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb/script
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb/parser
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb/orb
@@ -346,14 +346,14 @@ bin/fnping
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb/cos
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb/compiler
@dirrm %%PYTHON_SITELIBDIR%%/Fnorb
-@dirrm %%DOCSDIR%%/tests/interop
-@dirrm %%DOCSDIR%%/tests/datatransfer
-@dirrm %%DOCSDIR%%/tests
-@dirrm %%DOCSDIR%%/examples/unions
-@dirrm %%DOCSDIR%%/examples/tkinter
-@dirrm %%DOCSDIR%%/examples/threaded
-@dirrm %%DOCSDIR%%/examples/naming
-@dirrm %%DOCSDIR%%/examples/misc
-@dirrm %%DOCSDIR%%/examples/hello-world
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests/interop
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests/datatransfer
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/tests
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/unions
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/tkinter
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/threaded
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/naming
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/misc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/hello-world
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 0803511940b8..c943961c07e2 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -25,6 +25,8 @@ DOCSDIR= ${PREFIX}/share/doc/lib${PORTNAME}-${PORTVERSION}
PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -e \
's| ../COPYING|| ; \
diff --git a/devel/pcre++/pkg-plist b/devel/pcre++/pkg-plist
index ecbeaaf5f34c..e8f3b6cdd3b2 100644
--- a/devel/pcre++/pkg-plist
+++ b/devel/pcre++/pkg-plist
@@ -5,39 +5,39 @@ lib/libpcre++.so
lib/libpcre++.so.0
lib/libpcre++.so.0.0.0
man/man3/Pcre.3.gz
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README
-%%DOCSDIR%%/annotated.html
-%%DOCSDIR%%/classPcre-members.html
-%%DOCSDIR%%/classPcre.html
-%%DOCSDIR%%/classPcre_1_1exception-members.html
-%%DOCSDIR%%/classPcre_1_1exception.html
-%%DOCSDIR%%/classpcrepp_1_1Pcre-members.html
-%%DOCSDIR%%/classpcrepp_1_1Pcre.html
-%%DOCSDIR%%/classpcrepp_1_1Pcre_1_1exception-members.html
-%%DOCSDIR%%/classpcrepp_1_1Pcre_1_1exception.html
-%%DOCSDIR%%/config.log
-%%DOCSDIR%%/doxygen.css
-%%DOCSDIR%%/doxygen.png
-%%DOCSDIR%%/files.html
-%%DOCSDIR%%/functions.html
-%%DOCSDIR%%/get_8cc-source.html
-%%DOCSDIR%%/get_8cc.html
-%%DOCSDIR%%/globals.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/namespacepcrepp.html
-%%DOCSDIR%%/namespaces.html
-%%DOCSDIR%%/namespacestd.html
-%%DOCSDIR%%/pcre++_8cc-source.html
-%%DOCSDIR%%/pcre++_8cc.html
-%%DOCSDIR%%/pcre++_8h-source.html
-%%DOCSDIR%%/pcre++_8h.html
-%%DOCSDIR%%/replace_8cc-source.html
-%%DOCSDIR%%/replace_8cc.html
-%%DOCSDIR%%/search_8cc-source.html
-%%DOCSDIR%%/search_8cc.html
-%%DOCSDIR%%/split_8cc-source.html
-%%DOCSDIR%%/split_8cc.html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/annotated.html
+%%PORTDOCS%%%%DOCSDIR%%/classPcre-members.html
+%%PORTDOCS%%%%DOCSDIR%%/classPcre.html
+%%PORTDOCS%%%%DOCSDIR%%/classPcre_1_1exception-members.html
+%%PORTDOCS%%%%DOCSDIR%%/classPcre_1_1exception.html
+%%PORTDOCS%%%%DOCSDIR%%/classpcrepp_1_1Pcre-members.html
+%%PORTDOCS%%%%DOCSDIR%%/classpcrepp_1_1Pcre.html
+%%PORTDOCS%%%%DOCSDIR%%/classpcrepp_1_1Pcre_1_1exception-members.html
+%%PORTDOCS%%%%DOCSDIR%%/classpcrepp_1_1Pcre_1_1exception.html
+%%PORTDOCS%%%%DOCSDIR%%/config.log
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.css
+%%PORTDOCS%%%%DOCSDIR%%/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/files.html
+%%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/get_8cc-source.html
+%%PORTDOCS%%%%DOCSDIR%%/get_8cc.html
+%%PORTDOCS%%%%DOCSDIR%%/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/namespacepcrepp.html
+%%PORTDOCS%%%%DOCSDIR%%/namespaces.html
+%%PORTDOCS%%%%DOCSDIR%%/namespacestd.html
+%%PORTDOCS%%%%DOCSDIR%%/pcre++_8cc-source.html
+%%PORTDOCS%%%%DOCSDIR%%/pcre++_8cc.html
+%%PORTDOCS%%%%DOCSDIR%%/pcre++_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/pcre++_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/replace_8cc-source.html
+%%PORTDOCS%%%%DOCSDIR%%/replace_8cc.html
+%%PORTDOCS%%%%DOCSDIR%%/search_8cc-source.html
+%%PORTDOCS%%%%DOCSDIR%%/search_8cc.html
+%%PORTDOCS%%%%DOCSDIR%%/split_8cc-source.html
+%%PORTDOCS%%%%DOCSDIR%%/split_8cc.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 2c82c7cbc907..f727bb0fb531 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= ENCHANT
+OPTIONS_DEFINE= ENCHANT DOCS
ENCHANT_LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant
diff --git a/editors/conglomerate/pkg-plist b/editors/conglomerate/pkg-plist
index a54ba00eafb2..a8c491d1a651 100644
--- a/editors/conglomerate/pkg-plist
+++ b/editors/conglomerate/pkg-plist
@@ -44,128 +44,128 @@ share/applications/conglomerate.desktop
%%DATADIR%%/templates/dispspec-template.xds
%%DATADIR%%/templates/dispspec.xml
%%DATADIR%%/templates/html.xml
-%%DOCSDIR%%/CongAttributeEditor.html
-%%DOCSDIR%%/CongAttributeEditorCDATA.html
-%%DOCSDIR%%/CongAttributeEditorENUMERATION.html
-%%DOCSDIR%%/CongAttributeEditorLang.html
-%%DOCSDIR%%/CongAttributeWrapper.html
-%%DOCSDIR%%/CongAttributeWrapperCheckButton.html
-%%DOCSDIR%%/CongAttributeWrapperRadioButton.html
-%%DOCSDIR%%/CongCommand.html
-%%DOCSDIR%%/CongCommandHistory.html
-%%DOCSDIR%%/CongDocument.html
-%%DOCSDIR%%/CongDocumentTraversal.html
-%%DOCSDIR%%/CongEditorArea.html
-%%DOCSDIR%%/CongEditorAreaBin.html
-%%DOCSDIR%%/CongEditorAreaBorder.html
-%%DOCSDIR%%/CongEditorAreaComposer.html
-%%DOCSDIR%%/CongEditorAreaContainer.html
-%%DOCSDIR%%/CongEditorAreaEntityDecl.html
-%%DOCSDIR%%/CongEditorAreaEntityRef.html
-%%DOCSDIR%%/CongEditorAreaExpander.html
-%%DOCSDIR%%/CongEditorAreaLabelled.html
-%%DOCSDIR%%/CongEditorAreaLine.html
-%%DOCSDIR%%/CongEditorAreaListitem.html
-%%DOCSDIR%%/CongEditorAreaParagraph.html
-%%DOCSDIR%%/CongEditorAreaPixbuf.html
-%%DOCSDIR%%/CongEditorAreaSpacer.html
-%%DOCSDIR%%/CongEditorAreaSpanTag.html
-%%DOCSDIR%%/CongEditorAreaStructural.html
-%%DOCSDIR%%/CongEditorAreaStructuralTag.html
-%%DOCSDIR%%/CongEditorAreaText.html
-%%DOCSDIR%%/CongEditorAreaTextComment.html
-%%DOCSDIR%%/CongEditorAreaTextFragment.html
-%%DOCSDIR%%/CongEditorAreaUnderline.html
-%%DOCSDIR%%/CongEditorAreaUnknownTag.html
-%%DOCSDIR%%/CongEditorNode.html
-%%DOCSDIR%%/CongEditorNodeElement.html
-%%DOCSDIR%%/CongEditorNodeElementListitem.html
-%%DOCSDIR%%/CongEditorNodeElementParagraph.html
-%%DOCSDIR%%/CongEditorWidget3.html
-%%DOCSDIR%%/CongModification.html
-%%DOCSDIR%%/CongModificationCursorChange.html
-%%DOCSDIR%%/CongModificationSelectionChange.html
-%%DOCSDIR%%/CongModificationSetDtdPtr.html
-%%DOCSDIR%%/CongNodeModification.html
-%%DOCSDIR%%/CongNodeModificationAddAfter.html
-%%DOCSDIR%%/CongNodeModificationAddBefore.html
-%%DOCSDIR%%/CongNodeModificationMakeOrphan.html
-%%DOCSDIR%%/CongNodeModificationRemoveAttribute.html
-%%DOCSDIR%%/CongNodeModificationSetAttribute.html
-%%DOCSDIR%%/CongNodeModificationSetParent.html
-%%DOCSDIR%%/CongNodeModificationSetText.html
-%%DOCSDIR%%/CongPlugin.html
-%%DOCSDIR%%/CongService.html
-%%DOCSDIR%%/CongServiceDocTool.html
-%%DOCSDIR%%/CongServiceDocumentFactory.html
-%%DOCSDIR%%/CongServiceEditorNodeFactory.html
-%%DOCSDIR%%/CongServiceExporter.html
-%%DOCSDIR%%/CongServiceImporter.html
-%%DOCSDIR%%/CongServiceNodePropertyDialog.html
-%%DOCSDIR%%/CongServiceNodeTool.html
-%%DOCSDIR%%/CongServiceTool.html
-%%DOCSDIR%%/CongTraversalNode.html
-%%DOCSDIR%%/CongXPathExpression.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/class-hierarchy.html
-%%DOCSDIR%%/class-overview.html
-%%DOCSDIR%%/conglomerate-CongApp.html
-%%DOCSDIR%%/conglomerate-CongDispspec.html
-%%DOCSDIR%%/conglomerate-CongDispspecElement.html
-%%DOCSDIR%%/conglomerate-CongDispspecRegistry.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeComment.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeDocument.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeDtd.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeElementAdmonition.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeElementSpan.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeElementStructural.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeElementUnknown.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeEntityDecl.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeEntityRef.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeText.html
-%%DOCSDIR%%/conglomerate-CongEditorNodeUnimplemented.html
-%%DOCSDIR%%/conglomerate-CongLocation.html
-%%DOCSDIR%%/conglomerate-CongObject.html
-%%DOCSDIR%%/conglomerate-CongPluginManager.html
-%%DOCSDIR%%/conglomerate-CongRange.html
-%%DOCSDIR%%/conglomerate-CongSelection.html
-%%DOCSDIR%%/conglomerate-CongServicePrintMethod.html
-%%DOCSDIR%%/conglomerate-DTD-Handling.html
-%%DOCSDIR%%/conglomerate-Utility-functions.html
-%%DOCSDIR%%/conglomerate-XML-Nodes.html
-%%DOCSDIR%%/conglomerate-cong-dialog.html
-%%DOCSDIR%%/conglomerate-cong-edit-find-and-replace.html
-%%DOCSDIR%%/conglomerate-cong-eel-graphic-effects.html
-%%DOCSDIR%%/conglomerate-cong-eel.html
-%%DOCSDIR%%/conglomerate-cong-enum-mapping.html
-%%DOCSDIR%%/conglomerate-cong-error-dialog.html
-%%DOCSDIR%%/conglomerate-cong-fake-plugin-hooks.html
-%%DOCSDIR%%/conglomerate-cong-file-selection.html
-%%DOCSDIR%%/conglomerate-cong-font.html
-%%DOCSDIR%%/conglomerate-cong-glade.html
-%%DOCSDIR%%/conglomerate-cong-graph.html
-%%DOCSDIR%%/conglomerate-cong-marshal.html
-%%DOCSDIR%%/conglomerate-cong-overview-view.html
-%%DOCSDIR%%/conglomerate-cong-parser-error.html
-%%DOCSDIR%%/conglomerate-cong-primary-window.html
-%%DOCSDIR%%/conglomerate-cong-progress-checklist.html
-%%DOCSDIR%%/conglomerate-cong-text-cache.html
-%%DOCSDIR%%/conglomerate-cong-tree-view.html
-%%DOCSDIR%%/conglomerate-cong-ui-hooks.html
-%%DOCSDIR%%/conglomerate-cong-vfs.html
-%%DOCSDIR%%/conglomerate-cong-view.html
-%%DOCSDIR%%/conglomerate-global.html
-%%DOCSDIR%%/editor.html
-%%DOCSDIR%%/helper.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/plugins.html
-%%DOCSDIR%%/state.html
-%%DOCSDIR%%/views.html
-%%DOCSDIR%%/xml.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeEditor.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeEditorCDATA.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeEditorENUMERATION.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeEditorLang.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeWrapper.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeWrapperCheckButton.html
+%%PORTDOCS%%%%DOCSDIR%%/CongAttributeWrapperRadioButton.html
+%%PORTDOCS%%%%DOCSDIR%%/CongCommand.html
+%%PORTDOCS%%%%DOCSDIR%%/CongCommandHistory.html
+%%PORTDOCS%%%%DOCSDIR%%/CongDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/CongDocumentTraversal.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorArea.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaBin.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaBorder.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaComposer.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaContainer.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaEntityDecl.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaEntityRef.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaExpander.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaLabelled.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaLine.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaListitem.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaParagraph.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaPixbuf.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaSpacer.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaSpanTag.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaStructural.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaStructuralTag.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaText.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaTextComment.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaTextFragment.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaUnderline.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorAreaUnknownTag.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorNode.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorNodeElement.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorNodeElementListitem.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorNodeElementParagraph.html
+%%PORTDOCS%%%%DOCSDIR%%/CongEditorWidget3.html
+%%PORTDOCS%%%%DOCSDIR%%/CongModification.html
+%%PORTDOCS%%%%DOCSDIR%%/CongModificationCursorChange.html
+%%PORTDOCS%%%%DOCSDIR%%/CongModificationSelectionChange.html
+%%PORTDOCS%%%%DOCSDIR%%/CongModificationSetDtdPtr.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModification.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationAddAfter.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationAddBefore.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationMakeOrphan.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationRemoveAttribute.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationSetAttribute.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationSetParent.html
+%%PORTDOCS%%%%DOCSDIR%%/CongNodeModificationSetText.html
+%%PORTDOCS%%%%DOCSDIR%%/CongPlugin.html
+%%PORTDOCS%%%%DOCSDIR%%/CongService.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceDocTool.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceDocumentFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceEditorNodeFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceExporter.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceImporter.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceNodePropertyDialog.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceNodeTool.html
+%%PORTDOCS%%%%DOCSDIR%%/CongServiceTool.html
+%%PORTDOCS%%%%DOCSDIR%%/CongTraversalNode.html
+%%PORTDOCS%%%%DOCSDIR%%/CongXPathExpression.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/class-hierarchy.html
+%%PORTDOCS%%%%DOCSDIR%%/class-overview.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongApp.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongDispspec.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongDispspecElement.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongDispspecRegistry.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeComment.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeDocument.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeDtd.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeElementAdmonition.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeElementSpan.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeElementStructural.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeElementUnknown.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeEntityDecl.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeEntityRef.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeText.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongEditorNodeUnimplemented.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongLocation.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongObject.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongPluginManager.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongRange.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongSelection.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-CongServicePrintMethod.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-DTD-Handling.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-Utility-functions.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-XML-Nodes.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-dialog.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-edit-find-and-replace.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-eel-graphic-effects.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-eel.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-enum-mapping.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-error-dialog.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-fake-plugin-hooks.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-file-selection.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-font.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-glade.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-graph.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-marshal.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-overview-view.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-parser-error.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-primary-window.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-progress-checklist.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-text-cache.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-tree-view.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-ui-hooks.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-vfs.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-cong-view.html
+%%PORTDOCS%%%%DOCSDIR%%/conglomerate-global.html
+%%PORTDOCS%%%%DOCSDIR%%/editor.html
+%%PORTDOCS%%%%DOCSDIR%%/helper.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/ix01.html
+%%PORTDOCS%%%%DOCSDIR%%/misc.html
+%%PORTDOCS%%%%DOCSDIR%%/plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/state.html
+%%PORTDOCS%%%%DOCSDIR%%/views.html
+%%PORTDOCS%%%%DOCSDIR%%/xml.html
share/gnome/help/conglomerate/C/cong_element_map_ref.xml
share/gnome/help/conglomerate/C/conglomerate.xml
share/gnome/help/conglomerate/C/conventions.xml
@@ -297,7 +297,7 @@ share/pixmaps/conglomerate/conglomerate-logo.png
@dirrm share/gnome/help/conglomerate/C/figures
@dirrm share/gnome/help/conglomerate/C
@dirrm share/gnome/help/conglomerate
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/templates
@dirrm %%DATADIR%%/stylesheets
@dirrm %%DATADIR%%/glade
diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index 3390739ac7b6..c7df0fbc6fdd 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -23,6 +23,8 @@ CONFIGURE_ARGS= --with-oss
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-pro
+OPTIONS_DEFINE= DOCS
+
pre-configure:
@${REINPLACE_CMD} 's,(pkglibdir),(datadir)/doc/@PACKAGE@,' ${WRKSRC}/doc/Makefile.in
diff --git a/emulators/xzx/pkg-plist b/emulators/xzx/pkg-plist
index 7c80831b3ead..7e4fca1dab63 100644
--- a/emulators/xzx/pkg-plist
+++ b/emulators/xzx/pkg-plist
@@ -7,10 +7,10 @@ lib/xzx-pro/plus2.rom
lib/xzx-pro/plus3.rom
lib/xzx-pro/spectrum.rom
man/man1/xzx.1.gz
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/README
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@unexec rm -f %D/lib/xzx-pro/if1.rom
@exec ln -f %D/lib/xzx-pro/if1-v2.rom %D/lib/xzx-pro/if1.rom
@dirrm lib/xzx-pro
diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile
index 309f6e0c23c1..ddc2bc5a0b77 100644
--- a/french/verbiste/Makefile
+++ b/french/verbiste/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/
MAINTAINER= dereckson@gmail.com
COMMENT= French verb conjugator/deconjugator
-OPTIONS_DEFINE= GTK2 GNOME
+OPTIONS_DEFINE= GTK2 GNOME DOCS EXAMPLES
LICENSE= GPLv2
diff --git a/french/verbiste/pkg-plist b/french/verbiste/pkg-plist
index 6b5d382c7aa3..ab7758475a54 100644
--- a/french/verbiste/pkg-plist
+++ b/french/verbiste/pkg-plist
@@ -23,22 +23,22 @@ man/man3/verbiste.3.gz
%%HASGUI%%share/locale/fr/LC_MESSAGES/verbiste.mo
%%HASGUI%%share/locale/el/LC_MESSAGES/verbiste.mo
%%HASGUI%%share/pixmaps/verbiste.png
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/HACKING
-%%DOCSDIR%%/LISEZMOI
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-%%EXAMPLESDIR%%/FrenchDeconjugatorTester.java
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/conjugator.c
-%%EXAMPLESDIR%%/deconjugator.c
-%%EXAMPLESDIR%%/test-french-deconjugator.pl
-%%EXAMPLESDIR%%/trans-tenses.pl
-%%EXAMPLESDIR%%/generate-all-forms.pl
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/HACKING
+%%PORTDOCS%%%%DOCSDIR%%/LISEZMOI
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FrenchDeconjugatorTester.java
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/conjugator.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/deconjugator.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test-french-deconjugator.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/trans-tenses.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generate-all-forms.pl
%%DATADIR%%-0.1/COPYING
%%DATADIR%%-0.1/conjugation-el.xml
%%DATADIR%%-0.1/conjugation-fr.xml
@@ -53,8 +53,8 @@ man/man3/verbiste.3.gz
%%HASGTK%%@dirrmtry share/texmf/tex
%%HASGTK%%@dirrmtry share/texmf
@dirrm %%DATADIR%%-0.1
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/verbiste-0.1/verbiste
@dirrm include/verbiste-0.1
@dirrmtry man/fr/man3
diff --git a/games/lincity-ng/Makefile b/games/lincity-ng/Makefile
index 77606ad4240a..4adc39c06b94 100644
--- a/games/lincity-ng/Makefile
+++ b/games/lincity-ng/Makefile
@@ -25,6 +25,8 @@ CONFIGURE_ARGS= --with-libphysfs=${PREFIX} \
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS}
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -e 's| -O| -I${LOCALBASE}/include&|g' \
${WRKSRC}/Jamrules
diff --git a/games/lincity-ng/pkg-plist b/games/lincity-ng/pkg-plist
index fbf42ca33377..732762c4c51e 100644
--- a/games/lincity-ng/pkg-plist
+++ b/games/lincity-ng/pkg-plist
@@ -1,14 +1,14 @@
bin/lincity-ng
share/applications/lincity-ng.desktop
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/COPYING-data.txt
-%%DOCSDIR%%/COPYING-fonts.txt
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/RELNOTES
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/lincityconfig.xml
-%%DOCSDIR%%/userconfig.xml
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING-data.txt
+%%PORTDOCS%%%%DOCSDIR%%/COPYING-fonts.txt
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELNOTES
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/lincityconfig.xml
+%%PORTDOCS%%%%DOCSDIR%%/userconfig.xml
%%DATADIR%%/colour.pal
%%DATADIR%%/fonts/sans.ttf
%%DATADIR%%/gui/allgone.xml
@@ -1675,4 +1675,4 @@ share/pixmaps/lincity-ng.png
@dirrm %%DATADIR%%/gui
@dirrm %%DATADIR%%/fonts
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index a58c2cc42e6a..786a8de04338 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -14,4 +14,6 @@ USES= gmake pkgconfig
USE_GNOME= gtk20 gnomevfs2 intlhack
GNU_CONFIGURE= yes
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/games/lucidlife/pkg-plist b/games/lucidlife/pkg-plist
index b49b61a2be7b..144b1566fded 100644
--- a/games/lucidlife/pkg-plist
+++ b/games/lucidlife/pkg-plist
@@ -343,20 +343,20 @@ share/pixmaps/lucidlife.png
%%DATADIR%%/patterns/lpa/synthesis/make_hustler.glf
%%DATADIR%%/patterns/lpa/synthesis/make_osc.glf
%%DATADIR%%/patterns/lpa/synthesis/make_pole.glf
-%%DOCSDIR%%/billiard.gif
-%%DOCSDIR%%/blinker_horizontal.gif
-%%DOCSDIR%%/blinker_vertical.gif
-%%DOCSDIR%%/draw.png
-%%DOCSDIR%%/glf_format.html
-%%DOCSDIR%%/glider.gif
-%%DOCSDIR%%/grab.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/max.gif
-%%DOCSDIR%%/patterns.html
-%%DOCSDIR%%/pulsar.gif
-%%DOCSDIR%%/select.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/window.gif
+%%PORTDOCS%%%%DOCSDIR%%/billiard.gif
+%%PORTDOCS%%%%DOCSDIR%%/blinker_horizontal.gif
+%%PORTDOCS%%%%DOCSDIR%%/blinker_vertical.gif
+%%PORTDOCS%%%%DOCSDIR%%/draw.png
+%%PORTDOCS%%%%DOCSDIR%%/glf_format.html
+%%PORTDOCS%%%%DOCSDIR%%/glider.gif
+%%PORTDOCS%%%%DOCSDIR%%/grab.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/max.gif
+%%PORTDOCS%%%%DOCSDIR%%/patterns.html
+%%PORTDOCS%%%%DOCSDIR%%/pulsar.gif
+%%PORTDOCS%%%%DOCSDIR%%/select.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/window.gif
@dirrm %%DATADIR%%/patterns/lpa/synthesis
@dirrm %%DATADIR%%/patterns/lpa/spaceships
@dirrm %%DATADIR%%/patterns/lpa/space_fillers
@@ -401,4 +401,4 @@ share/pixmaps/lucidlife.png
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/graphics
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index a0f7d9b4d9a1..7af6f43baf4e 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS= --datadir="${PREFIX}/lib" \
--with-lib3ds-prefix="${LOCALBASE}"
CPPFLAGS+= -I${LOCALBASE}/include
-OPTIONS_DEFINE= EXAMPLES
+OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
@${REINPLACE_CMD} -e '36s,static ,,' ${WRKSRC}/src/tools/tool_disc.c
diff --git a/graphics/giram/pkg-plist b/graphics/giram/pkg-plist
index 4567051f6c86..cd786c768e75 100644
--- a/graphics/giram/pkg-plist
+++ b/graphics/giram/pkg-plist
@@ -38,7 +38,7 @@ libexec/giram/plug-ins/Box
libexec/giram/plug-ins/Rotate
libexec/giram/plug-ins/Spheres
man/man1/giram.1.gz
-%%DOCSDIR%%/Tutorial
+%%PORTDOCS%%%%DOCSDIR%%/Tutorial
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Cone.pov
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Disc.pov
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Giram.pov
@@ -90,7 +90,7 @@ share/locale/tr/LC_MESSAGES/giram.mo
share/locale/uk/LC_MESSAGES/giram.mo
share/locale/zh_CN/LC_MESSAGES/giram.mo
share/locale/zh_TW/LC_MESSAGES/giram.mo
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/giram/plug-ins
@dirrm libexec/giram
@dirrm lib/giram/0.3/tips
diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile
index 3a880fca8a20..e0e7811d409b 100644
--- a/graphics/gle/Makefile
+++ b/graphics/gle/Makefile
@@ -20,6 +20,8 @@ USE_LDCONFIG= yes
GNU_CONFIGURE= yes
LIBS+= -L${LOCALBASE}/lib -lXext
+OPTIONS_DEFINE= DOCS
+
post-patch:
.for file in ex_angle.c ex_cut_round.c ex_raw.c extrude.c round_cap.c segment.c texgen.c
@${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g" ${WRKSRC}/src/${file}
diff --git a/graphics/gle/pkg-plist b/graphics/gle/pkg-plist
index f062e1bdf187..8762b91df740 100644
--- a/graphics/gle/pkg-plist
+++ b/graphics/gle/pkg-plist
@@ -17,116 +17,116 @@ man/man3/gleSuperExtrusion.3gle.gz
man/man3/gleTextureMode.3gle.gz
man/man3/gleToroid.3gle.gz
man/man3/gleTwistExtrusion.3gle.gz
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/COPYING.artistic
-%%DOCSDIR%%/COPYING.src
-%%DOCSDIR%%/README
-%%DOCSDIR%%/examples/COPYING
-%%DOCSDIR%%/examples/Makefile.examples
-%%DOCSDIR%%/examples/README
-%%DOCSDIR%%/examples/alpha.c
-%%DOCSDIR%%/examples/beam.c
-%%DOCSDIR%%/examples/candlestick.c
-%%DOCSDIR%%/examples/cone.c
-%%DOCSDIR%%/examples/cylinder.c
-%%DOCSDIR%%/examples/helix.c
-%%DOCSDIR%%/examples/helix2.c
-%%DOCSDIR%%/examples/helix3.c
-%%DOCSDIR%%/examples/helix4.c
-%%DOCSDIR%%/examples/helixtex.c
-%%DOCSDIR%%/examples/horn.c
-%%DOCSDIR%%/examples/joinoffset.c
-%%DOCSDIR%%/examples/main.h
-%%DOCSDIR%%/examples/mainjoin.c
-%%DOCSDIR%%/examples/mainsimple.c
-%%DOCSDIR%%/examples/maintex.c
-%%DOCSDIR%%/examples/rundemo
-%%DOCSDIR%%/examples/screw.c
-%%DOCSDIR%%/examples/taper.c
-%%DOCSDIR%%/examples/texas.c
-%%DOCSDIR%%/examples/texture.c
-%%DOCSDIR%%/examples/texture.h
-%%DOCSDIR%%/examples/transport.c
-%%DOCSDIR%%/examples/twistoid.c
-%%DOCSDIR%%/examples/twoid.c
-%%DOCSDIR%%/gle-3.0.lsm
-%%DOCSDIR%%/html/README
-%%DOCSDIR%%/html/angle.gif
-%%DOCSDIR%%/html/angle.orig.gif
-%%DOCSDIR%%/html/basic.gif
-%%DOCSDIR%%/html/basic.orig.gif
-%%DOCSDIR%%/html/blurb.html
-%%DOCSDIR%%/html/build.html
-%%DOCSDIR%%/html/candle.gif
-%%DOCSDIR%%/html/candle.orig.gif
-%%DOCSDIR%%/html/cone.gif
-%%DOCSDIR%%/html/cone.orig.gif
-%%DOCSDIR%%/html/cut.gif
-%%DOCSDIR%%/html/cut.orig.gif
-%%DOCSDIR%%/html/edge.gif
-%%DOCSDIR%%/html/edge.orig.gif
-%%DOCSDIR%%/html/edgenorm.gif
-%%DOCSDIR%%/html/edgenorm.orig.gif
-%%DOCSDIR%%/html/edgesweep.gif
-%%DOCSDIR%%/html/edgesweep.orig.gif
-%%DOCSDIR%%/html/endcap.gif
-%%DOCSDIR%%/html/endcap.orig.gif
-%%DOCSDIR%%/html/facenorm.gif
-%%DOCSDIR%%/html/facenorm.orig.gif
-%%DOCSDIR%%/html/facesweep.gif
-%%DOCSDIR%%/html/facesweep.orig.gif
-%%DOCSDIR%%/html/facet.gif
-%%DOCSDIR%%/html/facet.orig.gif
-%%DOCSDIR%%/html/gle.jpg
-%%DOCSDIR%%/html/helix.gif
-%%DOCSDIR%%/html/helix1.gif
-%%DOCSDIR%%/html/helix2.gif
-%%DOCSDIR%%/html/helix3.gif
-%%DOCSDIR%%/html/helix3.orig.gif
-%%DOCSDIR%%/html/helix4.gif
-%%DOCSDIR%%/html/helix5.gif
-%%DOCSDIR%%/html/helix5.orig.gif
-%%DOCSDIR%%/html/helix6.gif
-%%DOCSDIR%%/html/helix6.orig.gif
-%%DOCSDIR%%/html/helixtex.gif
-%%DOCSDIR%%/html/index.html
-%%DOCSDIR%%/html/join.html
-%%DOCSDIR%%/html/offround.gif
-%%DOCSDIR%%/html/offround.orig.gif
-%%DOCSDIR%%/html/ogla.gif
-%%DOCSDIR%%/html/ogla_sm.gif
-%%DOCSDIR%%/html/opencontour.gif
-%%DOCSDIR%%/html/opencontour.orig.gif
-%%DOCSDIR%%/html/raw.gif
-%%DOCSDIR%%/html/raw.orig.gif
-%%DOCSDIR%%/html/round.gif
-%%DOCSDIR%%/html/round.orig.gif
-%%DOCSDIR%%/html/screw0.gif
-%%DOCSDIR%%/html/screw0.orig.gif
-%%DOCSDIR%%/html/screw1.gif
-%%DOCSDIR%%/html/screw1.orig.gif
-%%DOCSDIR%%/html/screw2.gif
-%%DOCSDIR%%/html/screw2.orig.gif
-%%DOCSDIR%%/html/screwn.gif
-%%DOCSDIR%%/html/screwn.orig.gif
-%%DOCSDIR%%/html/shear.gif
-%%DOCSDIR%%/html/shear.orig.gif
-%%DOCSDIR%%/html/texas.gif
-%%DOCSDIR%%/html/texas.orig.gif
-%%DOCSDIR%%/html/texscr.gif
-%%DOCSDIR%%/html/texscr2.gif
-%%DOCSDIR%%/html/texture.html
-%%DOCSDIR%%/html/textwi.gif
-%%DOCSDIR%%/html/textwi2.gif
-%%DOCSDIR%%/html/tube.html
-%%DOCSDIR%%/html/twist1.gif
-%%DOCSDIR%%/html/twist1.orig.gif
-%%DOCSDIR%%/html/twist2.gif
-%%DOCSDIR%%/html/twist2.orig.gif
-%%DOCSDIR%%/html/twist3.gif
-%%DOCSDIR%%/html/twist3.orig.gif
-%%DOCSDIR%%/html/vrml.html
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.artistic
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.src
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.examples
+%%PORTDOCS%%%%DOCSDIR%%/examples/README
+%%PORTDOCS%%%%DOCSDIR%%/examples/alpha.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/beam.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/candlestick.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/cone.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/cylinder.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/helix.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/helix2.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/helix3.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/helix4.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/helixtex.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/horn.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/joinoffset.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/main.h
+%%PORTDOCS%%%%DOCSDIR%%/examples/mainjoin.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/mainsimple.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/maintex.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/rundemo
+%%PORTDOCS%%%%DOCSDIR%%/examples/screw.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/taper.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/texas.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/texture.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/texture.h
+%%PORTDOCS%%%%DOCSDIR%%/examples/transport.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/twistoid.c
+%%PORTDOCS%%%%DOCSDIR%%/examples/twoid.c
+%%PORTDOCS%%%%DOCSDIR%%/gle-3.0.lsm
+%%PORTDOCS%%%%DOCSDIR%%/html/README
+%%PORTDOCS%%%%DOCSDIR%%/html/angle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/angle.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/basic.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/blurb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/candle.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/candle.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/cone.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/cone.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/cut.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/cut.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edge.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edge.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edgenorm.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edgenorm.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edgesweep.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/edgesweep.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/endcap.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/endcap.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facenorm.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facenorm.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facesweep.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facesweep.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facet.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/facet.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/gle.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/helix.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix3.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix5.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helix6.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/helixtex.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/join.html
+%%PORTDOCS%%%%DOCSDIR%%/html/offround.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/offround.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/ogla.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/ogla_sm.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/opencontour.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/opencontour.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/raw.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/raw.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/round.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/round.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw0.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw0.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw1.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screw2.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screwn.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/screwn.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/shear.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/shear.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/texas.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/texas.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/texscr.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/texscr2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/texture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/textwi.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/textwi2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/tube.html
+%%PORTDOCS%%%%DOCSDIR%%/html/twist1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/twist1.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/twist2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/twist2.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/twist3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/twist3.orig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/vrml.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 2f43fa6eb937..235b29fbcb42 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -48,7 +48,7 @@ PLIST_SUB+= GNASHVER="${GNASHVER}"
USE_LDCONFIG= ${PREFIX}/lib/gnash
-OPTIONS_DEFINE= PLUGIN CYGNAL VAAPI
+OPTIONS_DEFINE= PLUGIN CYGNAL VAAPI DOCS
OPTIONS_SINGLE= MEDIA GUI RENDERER
OPTIONS_SINGLE_MEDIA= FFMPEG FFMPEG2 GSTREAMER
OPTIONS_SINGLE_GUI= GTK2 KDE4
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index f48756089c8e..7b03147ac016 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -230,9 +230,9 @@ man/man1/soldumper.1.gz
%%DATADIR%%/GnashG.png
%%DATADIR%%/gnash-splash.swf
%%DATADIR%%/gnash_128_96.ico
-%%DOCSDIR%%/gnashref.html
-%%DOCSDIR%%/gnashuser.html
-%%DOCSDIR%%/images/rtmp.png
+%%PORTDOCS%%%%DOCSDIR%%/gnashref.html
+%%PORTDOCS%%%%DOCSDIR%%/gnashuser.html
+%%PORTDOCS%%%%DOCSDIR%%/images/rtmp.png
%%GTK2%%share/icons/hicolor/32x32/apps/gnash.xpm
%%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm
share/locale/cs/LC_MESSAGES/gnash.mo
@@ -255,8 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/gnash.mo
@dirrmtry share/icons/hicolor/32x32
@dirrmtry share/icons/hicolor
@dirrmtry share/icons
-@dirrm %%DOCSDIR%%/images
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%
@dirrm lib/gnash
%%CYGNAL%%@dirrmtry lib/cygnal/plugins
diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile
index 802583191dd7..2359404f7a2c 100644
--- a/graphics/openjpeg15/Makefile
+++ b/graphics/openjpeg15/Makefile
@@ -21,4 +21,6 @@ DOS2UNIX_FILES= libopenjpeg/opj_malloc.h
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist
index caee3d3db0f6..ad77a1033da6 100644
--- a/graphics/openjpeg15/pkg-plist
+++ b/graphics/openjpeg15/pkg-plist
@@ -9,12 +9,12 @@ man/man1/image_to_j2k.1.gz
man/man1/j2k_dump.1.gz
man/man1/j2k_to_image.1.gz
man/man3/libopenjpeg.3.gz
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%DATADIR%%/OpenJPEGConfig.cmake
%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/OpenJPEGTargets.cmake
libdata/pkgconfig/libopenjpeg.pc
libdata/pkgconfig/libopenjpeg1.pc
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/freepwing/Makefile b/japanese/freepwing/Makefile
index e4deadf2a3ad..e84bd607ff8b 100644
--- a/japanese/freepwing/Makefile
+++ b/japanese/freepwing/Makefile
@@ -16,4 +16,6 @@ USES= gmake perl5
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pkgdocdir=${DOCSDIR}
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/japanese/freepwing/pkg-plist b/japanese/freepwing/pkg-plist
index 1b27b2de2048..67bed0b4059b 100644
--- a/japanese/freepwing/pkg-plist
+++ b/japanese/freepwing/pkg-plist
@@ -42,23 +42,23 @@ libexec/freepwing/fpwsort
libexec/freepwing/fpwsound
libexec/freepwing/mkdirhier
libexec/freepwing/perl.sh
-%%DOCSDIR%%/catdump.txt
-%%DOCSDIR%%/freepwing-01.html
-%%DOCSDIR%%/freepwing-02.html
-%%DOCSDIR%%/freepwing-03.html
-%%DOCSDIR%%/freepwing-04.html
-%%DOCSDIR%%/freepwing-05.html
-%%DOCSDIR%%/freepwing-06.html
-%%DOCSDIR%%/freepwing-07.html
-%%DOCSDIR%%/freepwing-08.html
-%%DOCSDIR%%/freepwing.css
-%%DOCSDIR%%/freepwing.html
+%%PORTDOCS%%%%DOCSDIR%%/catdump.txt
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-01.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-02.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-03.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-04.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-05.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-06.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-07.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing-08.html
+%%PORTDOCS%%%%DOCSDIR%%/freepwing.css
+%%PORTDOCS%%%%DOCSDIR%%/freepwing.html
%%DATADIR%%/catalogs/catalogs.txt
%%DATADIR%%/catalogs/catalogs
%%DATADIR%%/fpwutils.mk
@dirrm %%DATADIR%%/catalogs
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/freepwing
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/FreePWING/FPWUtils
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/FreePWING
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index c66b4f1c7873..24ca6a7e04e4 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -31,6 +31,8 @@ EXTRACT_AFTER_ARGS= ${WRKDIR}
MAKE_ENV= FONTSDIR=${FONTSDIR}
PLIST_SUB= FONTSDIR=${FONTSDIR}
+OPTIONS_DEFINE= DOCS
+
post-extract:
@${MV} ${WRKDIR}/maru14.bdf.v13.gz ${WRKDIR}/maru14.bdf.gz
@${MV} ${WRKDIR}/maru18.bdf.v10.gz ${WRKDIR}/maru18.bdf.gz
@@ -41,7 +43,7 @@ pre-build:
@(cd ${WRKDIR}; ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf)
post-install:
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${FILESDIR}/LICENSE ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/japanese/marumoji-fonts/pkg-plist b/japanese/marumoji-fonts/pkg-plist
index c61d3066d103..a80838178d9c 100644
--- a/japanese/marumoji-fonts/pkg-plist
+++ b/japanese/marumoji-fonts/pkg-plist
@@ -34,8 +34,8 @@
%%FONTSDIR%%/maru18b.pcf.gz
%%FONTSDIR%%/maru18bi.pcf.gz
%%FONTSDIR%%/maru18i.pcf.gz
-%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
@exec cd %D/%%FONTSDIR%% ; mkfontdir
@unexec cd %D/%%FONTSDIR%% ; mkfontdir
@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/nethack34/files/patch-aa b/japanese/nethack34/files/patch-aa
deleted file mode 100644
index f2a04b1adca2..000000000000
--- a/japanese/nethack34/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/config.h.orig Mon Feb 9 11:56:31 2004
-+++ include/config.h Mon Feb 9 11:59:57 2004
-@@ -222,7 +222,7 @@
- * otherwise it will be the current directory.
- */
- # ifndef HACKDIR
--# define HACKDIR "/usr/games/lib/jnethackdir"
-+# define HACKDIR "%%HACKDIR%%"
- # endif
-
- /*
diff --git a/japanese/nethack34/files/patch-ab b/japanese/nethack34/files/patch-ab
deleted file mode 100644
index d3ee0e028d96..000000000000
--- a/japanese/nethack34/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/system.h.orig Sat Aug 30 09:07:23 2003
-+++ include/system.h Tue Sep 2 00:39:39 2003
-@@ -79,7 +79,9 @@
- # if !defined(__SC__) && !defined(LINUX)
- E long NDECL(random);
- # endif
--# if (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
-+# if defined(__FreeBSD__)
-+E void FDECL(srandom, (unsigned long));
-+# elif (!defined(SUNOS4) && !defined(bsdi) && !defined(__FreeBSD__)) || defined(RANDOM)
- E void FDECL(srandom, (unsigned int));
- # else
- # if !defined(bsdi) && !defined(__FreeBSD__)
diff --git a/japanese/nethack34/files/patch-ac b/japanese/nethack34/files/patch-ac
deleted file mode 100644
index 7b5e921048b7..000000000000
--- a/japanese/nethack34/files/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- include/unixconf.h.orig Mon Feb 9 12:02:12 2004
-+++ include/unixconf.h Mon Feb 9 12:02:48 2004
-@@ -19,7 +19,7 @@
- */
-
- /* define exactly one of the following four choices */
--/* #define BSD 1 */ /* define for 4.n/Free/Open/Net BSD */
-+#define BSD 1 /* define for 4.n/Free/Open/Net BSD */
- /* also for relatives like SunOS 4.x, DG/UX, and */
- /* older versions of Linux */
- /* #define ULTRIX */ /* define for Ultrix v3.0 or higher (but not lower) */
-@@ -143,7 +143,7 @@
- * A stat system call is done on the mailbox every MAILCKFREQ moves.
- */
-
--#define MAIL /* Deliver mail during the game */
-+/* #define MAIL */ /* Deliver mail during the game */
-
- /* The Andrew Message System does mail a little differently from normal
- * UNIX. Mail is deposited in the user's own directory in ~/Mailbox
-@@ -284,7 +284,7 @@
- #endif
-
- #if defined(BSD) || defined(ULTRIX)
--# if !defined(DGUX) && !defined(SUNOS4)
-+# if !defined(DGUX) && !defined(SUNOS4) && !defined(__FreeBSD__)
- #define memcpy(d, s, n) bcopy(s, d, n)
- #define memcmp(s1, s2, n) bcmp(s2, s1, n)
- # endif
diff --git a/japanese/nethack34/files/patch-ad b/japanese/nethack34/files/patch-ad
deleted file mode 100644
index 7231626085ea..000000000000
--- a/japanese/nethack34/files/patch-ad
+++ /dev/null
@@ -1,119 +0,0 @@
---- sys/unix/Makefile.src.orig Mon Feb 9 12:10:20 2004
-+++ sys/unix/Makefile.src Mon Feb 9 12:11:52 2004
-@@ -149,19 +149,29 @@
- # directories. The ones given below is the usual spot for linux systems.
- # The paths are for glibconfig.h and gnomesupport.h respectively.
- #
--GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome
-+GNOMEINC= $(shell ${GNOME_CONFIG} --cflags gnomeui)
-
- # flags for debugging:
- # CFLAGS = -g -I../include
-
--CFLAGS = -W -g -O -I../include
-+CFLAGS += -I../include
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS -I${LOCALBASE}/include
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+CFLAGS += -DQT_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+CFLAGS += -DGNOME_GRAPHICS ${CPPFLAGS}
-+endif
-+
- LFLAGS =
-
- # The Qt and Be window systems are written in C++, while the rest of
- # NetHack is standard C. If using Qt, uncomment the LINK line here to get
- # the C++ libraries linked in.
--CXXFLAGS = $(CFLAGS) -I. -I$(QTDIR)/include
--CXX=g++
-+CXXFLAGS += -I. -I../include ${QTCPPFLAGS}
-+#CXX=g++
- #LINK=g++
- # For cross-compiling, eg. with gcc on Linux (see also CC further up):
- #CXX=arm-linux-g++
-@@ -228,7 +238,26 @@
- #
- #
- WINSRC = $(WINTTYSRC)
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+WINSRC += $(WINX11SRC)
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+WINSRC += $(WINQTSRC)
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+WINSRC += $(WINGNOMESRC)
-+endif
-+
- WINOBJ = $(WINTTYOBJ)
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+WINOBJ += $(WINX11OBJ)
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+WINOBJ += $(WINQTOBJ)
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+WINOBJ += $(WINGNOMEOBJ)
-+endif
-
- # on some systems the termcap library is in -ltermcap or -lcurses
- # on 386 Xenix, the -ltermlib tputs() seems not to work; use -lcurses instead
-@@ -248,19 +277,19 @@
- #
- # libraries for X11
- # If USE_XPM is defined in config.h, you will also need -lXpm here.
--WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11
-+WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -L${LOCALBASE}/lib
- # WINX11LIB = -lXaw -lXmu -lXt -lX11
- # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm
- # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0
- #
- # libraries for Qt
--WINQTLIB = -L$(QTDIR)/lib -lqt
-+WINQTLIB = ${QTCFGLIBS} ${LIBQT} -lgnuregex
- #
- # libraries for KDE (with Qt)
- WINKDELIB = -lkdecore -lkdeui -lXext
- #
- # libraries for Gnome
--WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt
-+WINGNOMELIB = $(shell ${GNOME_CONFIG} --libs gnomeui) ${LDFLAGS}
- #
- # libraries for Gem port
- WINGEMLIB = -le_gem -lgem
-@@ -269,6 +298,15 @@
- WINBELIB = -lbe
-
- WINLIB = $(WINTTYLIB)
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+WINLIB += $(WINX11LIB)
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+WINLIB += $(WINQTLIB)
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+WINLIB += $(WINGNOMELIB)
-+endif
-
- # any other strange libraries your system needs (for Sysunix only -- the more
- # specialized targets should already be right)
-@@ -478,13 +516,13 @@
-
- # Qt windowport meta-object-compiler output
- qt_kde0.moc: ../include/qt_kde0.h
-- $(QTDIR)/bin/moc -o qt_kde0.moc ../include/qt_kde0.h
-+ ${MOC} -o qt_kde0.moc ../include/qt_kde0.h
-
- qt_win.moc: ../include/qt_win.h
-- $(QTDIR)/bin/moc -o qt_win.moc ../include/qt_win.h
-+ ${MOC} -o qt_win.moc ../include/qt_win.h
-
- qttableview.moc: ../include/qttableview.h
-- $(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
-+ ${MOC} -o qttableview.moc ../include/qttableview.h
-
- $(MAKEDEFS): ../util/makedefs.c $(CONFIG_H) ../include/permonst.h \
- ../include/objclass.h ../include/monsym.h \
diff --git a/japanese/nethack34/files/patch-ae b/japanese/nethack34/files/patch-ae
deleted file mode 100644
index 02b54ebe6d66..000000000000
--- a/japanese/nethack34/files/patch-ae
+++ /dev/null
@@ -1,51 +0,0 @@
---- sys/unix/Makefile.top.orig Mon Feb 9 12:12:22 2004
-+++ sys/unix/Makefile.top Mon Feb 9 12:13:05 2004
-@@ -14,18 +14,17 @@
- # MAKE = make
-
- # make NetHack
--PREFIX = /usr
--GAME = jnethack
-+GAME = %%HACKNAME%%
- # GAME = nethack.prg
- GAMEUID = games
--GAMEGRP = bin
-+GAMEGRP = games
-
- # Permissions - some places use setgid instead of setuid, for instance
- # See also the option "SECURE" in include/config.h
--GAMEPERM = 04755
--FILEPERM = 0644
-+GAMEPERM = 02755
-+FILEPERM = 0664
- EXEPERM = 0755
--DIRPERM = 0755
-+DIRPERM = 0775
-
- # GAMEDIR also appears in config.h as "HACKDIR".
- # VARDIR may also appear in unixconf.h as "VAR_PLAYGROUND" else GAMEDIR
-@@ -35,12 +34,12 @@
- # therefore there should not be anything in GAMEDIR that you want to keep
- # (if there is, you'll have to do the installation by hand or modify the
- # instructions)
--GAMEDIR = $(PREFIX)/games/lib/$(GAME)dir
-+GAMEDIR = %%HACKDIR%%
- VARDIR = $(GAMEDIR)
--SHELLDIR = $(PREFIX)/games
-+SHELLDIR = $(PREFIX)/bin
-
- # per discussion in Install.X11 and Install.Qt
--VARDATND =
-+# VARDATND =
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm
- # VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm
- # for Atari/Gem
-@@ -48,7 +47,7 @@
- # for BeOS
- # VARDATND = beostiles
- # for Gnome
--# VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
-+VARDATND = x11tiles pet_mark.xbm rip.xpm mapbg.xpm
-
- VARDATD = data joracles options quest.dat jrumors
- VARDAT = $(VARDATD) $(VARDATND)
diff --git a/japanese/nethack34/files/patch-af b/japanese/nethack34/files/patch-af
deleted file mode 100644
index 9a7b5f4fe852..000000000000
--- a/japanese/nethack34/files/patch-af
+++ /dev/null
@@ -1,41 +0,0 @@
---- sys/unix/Makefile.doc.orig Sun Jun 16 03:02:10 2002
-+++ sys/unix/Makefile.doc Sun Jun 16 03:15:50 2002
-@@ -38,15 +38,15 @@
-
-
- GAME = nethack
--MANDIR = /usr/local/man/man6
-+MANDIR = ${PREFIX}/man/man
- MANEXT = 6
-
- # manual installation for most BSD-style systems
--GAMEMANCREATE = cp nethack.6
--LEVMANCREATE = cp lev_comp.6
--DGNMANCREATE = cp dgn_comp.6
--RCVRMANCREATE = cp recover.6
--DLBMANCREATE = cp dlb.6
-+GAMEMANCREATE = ${BSD_INSTALL_MAN} nethack.6
-+LEVMANCREATE = ${BSD_INSTALL_MAN} lev_comp.6
-+DGNMANCREATE = ${BSD_INSTALL_MAN} dgn_comp.6
-+RCVRMANCREATE = ${BSD_INSTALL_MAN} recover.6
-+DLBMANCREATE = ${BSD_INSTALL_MAN} dlb.6
- # manual installation for most SYSV-style systems
- # GAMEMANCREATE = nroff -man nethack.6 >
- # LEVMANCREATE = nroff -man lev_comp.6 >
-@@ -55,11 +55,11 @@
- # DLBMANCREATE = nroff -man dlb.6 >
-
- manpages:
-- -$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
-- -$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
-- -$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
-- -$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
-- -$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
-+ -$(GAMEMANCREATE) $(MANDIR)$(MANEXT)/$(GAME).$(MANEXT)
-+ -$(LEVMANCREATE) $(MANDIR)$(MANEXT)/lev_comp.$(MANEXT)
-+ -$(DGNMANCREATE) $(MANDIR)$(MANEXT)/dgn_comp.$(MANEXT)
-+ -$(RCVRMANCREATE) $(MANDIR)$(MANEXT)/recover.$(MANEXT)
-+ -$(DLBMANCREATE) $(MANDIR)$(MANEXT)/dlb.$(MANEXT)
-
- # manual creation for distribution
- DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt
diff --git a/japanese/nethack34/files/patch-ag b/japanese/nethack34/files/patch-ag
deleted file mode 100644
index 56aed0a0e35b..000000000000
--- a/japanese/nethack34/files/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
---- sys/unix/Makefile.utl.orig Sun Jun 16 03:02:10 2002
-+++ sys/unix/Makefile.utl Sun Jun 16 03:13:16 2002
-@@ -89,7 +89,17 @@
- # flags for debugging:
- # CFLAGS = -g -I../include
-
--CFLAGS = -O -I../include
-+CFLAGS += -I../include
-+ifeq ("$(GRAPHICS)","X11_GRAPHICS")
-+CFLAGS += -DX11_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","QT_GRAPHICS")
-+CFLAGS += -DQT_GRAPHICS
-+endif
-+ifeq ("$(GRAPHICS)","GNOME_GRAPHICS")
-+CFLAGS += -DGNOME_GRAPHICS
-+endif
-+
- LFLAGS =
-
- LIBS =
diff --git a/japanese/nethack34/files/patch-ai b/japanese/nethack34/files/patch-ai
deleted file mode 100644
index 508c236b9e7c..000000000000
--- a/japanese/nethack34/files/patch-ai
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/files.c.orig Sun Feb 23 23:43:26 2003
-+++ src/files.c Thu Jun 19 11:51:59 2003
-@@ -29,6 +29,7 @@
- #endif
-
- #if defined(UNIX) && defined(QT_GRAPHICS)
-+#include <limits.h>
- #include <dirent.h>
- #endif
-
diff --git a/japanese/nethack34/files/patch-ja b/japanese/nethack34/files/patch-ja
deleted file mode 100644
index 9b865d411e2a..000000000000
--- a/japanese/nethack34/files/patch-ja
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/winX.h.orig Sun Jun 16 13:15:58 2002
-+++ include/winX.h Sun Jun 16 13:21:39 2002
-@@ -378,11 +378,7 @@
- E void FDECL(clear_text_buffer,(struct text_buffer*));
- E void FDECL(free_text_buffer,(struct text_buffer*));
- #ifdef GRAPHIC_TOMBSTONE
--#ifndef XI18N
- E void FDECL(calculate_rip_text, (int));
--#else
--E void FDECL(calculate_rip_text, (int, XFontSet));
--#endif
- #endif
-
-
diff --git a/lang/alisp/Makefile b/lang/alisp/Makefile
index fc85ee3b8245..5a85a2f1d6e8 100644
--- a/lang/alisp/Makefile
+++ b/lang/alisp/Makefile
@@ -12,6 +12,8 @@ COMMENT= Interpreter for purely symbolic LISP
USES= uidfix
USE_LDCONFIG= yes
+OPTIONS_DEFINE= DOCS
+
post-patch: .SILENT
${REINPLACE_CMD} -E -e 's/cc/$$(CC)/' \
-e '/^CFLAGS/{s/=/+=/;s/-g//;s/-O//;}' \
diff --git a/lang/alisp/pkg-plist b/lang/alisp/pkg-plist
index b8b3126464ef..02afa43aca35 100644
--- a/lang/alisp/pkg-plist
+++ b/lang/alisp/pkg-plist
@@ -59,6 +59,6 @@ man/man7/alisp.7.gz
%%DATADIR%%/unsort.l
%%DATADIR%%/xeval.l
%%DATADIR%%/zebra.l
-%%DOCSDIR%%/alisp.txt
+%%PORTDOCS%%%%DOCSDIR%%/alisp.txt
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/lang/mixal/pkg-plist b/lang/mixal/pkg-plist
index d7cbbb72bcad..fd2766599a29 100644
--- a/lang/mixal/pkg-plist
+++ b/lang/mixal/pkg-plist
@@ -7,4 +7,4 @@ man/man1/mixal.1.gz
%%PORTDOCS%%%%DOCSDIR%%/mystery.mix
%%PORTDOCS%%%%DOCSDIR%%/opcodes
%%PORTDOCS%%%%DOCSDIR%%/prime.mix
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/lang/nml/pkg-plist b/lang/nml/pkg-plist
index a43719f7f920..c9d766810ef5 100644
--- a/lang/nml/pkg-plist
+++ b/lang/nml/pkg-plist
@@ -331,9 +331,9 @@ lib/nml/weak.cmx
lib/nml/weak.ml
lib/nml/weak.mli
lib/nml/weak.p.cmx
-%%DOCSDIR%%/Changes
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/contrib/emacs/Makefile
%%DATADIR%%/contrib/emacs/README
%%DATADIR%%/contrib/emacs/inf-n.el
@@ -345,7 +345,7 @@ lib/nml/weak.p.cmx
@dirrm %%DATADIR%%/contrib/emacs
@dirrm %%DATADIR%%/contrib
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/nml/threads
@dirrm lib/nml/caml
@dirrm lib/nml
diff --git a/lang/sketchy/Makefile b/lang/sketchy/Makefile
index f121df7cfb9e..c24f94d059c8 100644
--- a/lang/sketchy/Makefile
+++ b/lang/sketchy/Makefile
@@ -12,6 +12,8 @@ COMMENT= Interpreter for purely applicative Scheme
USES= uidfix
USE_LDCONFIG= yes
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/sketchy.h
@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${WRKSRC}/src/pp.scm
diff --git a/lang/sketchy/pkg-plist b/lang/sketchy/pkg-plist
index 4de6bcfb4812..ce5ba48425c0 100644
--- a/lang/sketchy/pkg-plist
+++ b/lang/sketchy/pkg-plist
@@ -180,183 +180,183 @@ man/man1/skpp.1.gz
%%DATADIR%%/src/unsort.scm
%%DATADIR%%/src/vqueens.scm
%%DATADIR%%/src/zebra.scm
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/library/abs.html
-%%DOCSDIR%%/library/append.html
-%%DOCSDIR%%/library/assoc.html
-%%DOCSDIR%%/library/assp.html
-%%DOCSDIR%%/library/assq.html
-%%DOCSDIR%%/library/assv.html
-%%DOCSDIR%%/library/booleanp.html
-%%DOCSDIR%%/library/c-alphabeticp.html
-%%DOCSDIR%%/library/c-cieqp.html
-%%DOCSDIR%%/library/c-cigep.html
-%%DOCSDIR%%/library/c-cigtp.html
-%%DOCSDIR%%/library/c-cilep.html
-%%DOCSDIR%%/library/c-ciltp.html
-%%DOCSDIR%%/library/c-downcase.html
-%%DOCSDIR%%/library/c-lower-casep.html
-%%DOCSDIR%%/library/c-numericp.html
-%%DOCSDIR%%/library/c-upcase.html
-%%DOCSDIR%%/library/c-upper-casep.html
-%%DOCSDIR%%/library/c-whitespacep.html
-%%DOCSDIR%%/library/caaaar.html
-%%DOCSDIR%%/library/caaar.html
-%%DOCSDIR%%/library/caar.html
-%%DOCSDIR%%/library/case.html
-%%DOCSDIR%%/library/ceqp.html
-%%DOCSDIR%%/library/cgep.html
-%%DOCSDIR%%/library/cgtp.html
-%%DOCSDIR%%/library/clep.html
-%%DOCSDIR%%/library/cltp.html
-%%DOCSDIR%%/library/count.html
-%%DOCSDIR%%/library/depth.html
-%%DOCSDIR%%/library/digits.html
-%%DOCSDIR%%/library/divide.html
-%%DOCSDIR%%/library/equal.html
-%%DOCSDIR%%/library/equalp.html
-%%DOCSDIR%%/library/eqvp.html
-%%DOCSDIR%%/library/evenp.html
-%%DOCSDIR%%/library/exists.html
-%%DOCSDIR%%/library/explode.html
-%%DOCSDIR%%/library/expt.html
-%%DOCSDIR%%/library/factorial.html
-%%DOCSDIR%%/library/filter.html
-%%DOCSDIR%%/library/fold-left.html
-%%DOCSDIR%%/library/fold-right.html
-%%DOCSDIR%%/library/for-all.html
-%%DOCSDIR%%/library/gcd.html
-%%DOCSDIR%%/library/greater.html
-%%DOCSDIR%%/library/gteq.html
-%%DOCSDIR%%/library/headp.html
-%%DOCSDIR%%/library/id.html
-%%DOCSDIR%%/library/if.html
-%%DOCSDIR%%/library/implode.html
-%%DOCSDIR%%/library/index.html
-%%DOCSDIR%%/library/integer.html
-%%DOCSDIR%%/library/integerp.html
-%%DOCSDIR%%/library/intersection.html
-%%DOCSDIR%%/library/iota.html
-%%DOCSDIR%%/library/last.html
-%%DOCSDIR%%/library/lcm.html
-%%DOCSDIR%%/library/length.html
-%%DOCSDIR%%/library/less.html
-%%DOCSDIR%%/library/letstar.html
-%%DOCSDIR%%/library/list-ref.html
-%%DOCSDIR%%/library/list-tail.html
-%%DOCSDIR%%/library/list.html
-%%DOCSDIR%%/library/listp.html
-%%DOCSDIR%%/library/lteq.html
-%%DOCSDIR%%/library/map-car.html
-%%DOCSDIR%%/library/map-cdr.html
-%%DOCSDIR%%/library/map.html
-%%DOCSDIR%%/library/max.html
-%%DOCSDIR%%/library/member.html
-%%DOCSDIR%%/library/memp.html
-%%DOCSDIR%%/library/memq.html
-%%DOCSDIR%%/library/memv.html
-%%DOCSDIR%%/library/min.html
-%%DOCSDIR%%/library/minus.html
-%%DOCSDIR%%/library/modulo.html
-%%DOCSDIR%%/library/natural.html
-%%DOCSDIR%%/library/naturalp.html
-%%DOCSDIR%%/library/ndivide.html
-%%DOCSDIR%%/library/negate.html
-%%DOCSDIR%%/library/negativep.html
-%%DOCSDIR%%/library/neqp.html
-%%DOCSDIR%%/library/newline.html
-%%DOCSDIR%%/library/nexpt.html
-%%DOCSDIR%%/library/ngreater.html
-%%DOCSDIR%%/library/ngteq.html
-%%DOCSDIR%%/library/nless.html
-%%DOCSDIR%%/library/nlteq.html
-%%DOCSDIR%%/library/nminus.html
-%%DOCSDIR%%/library/non-negativep.html
-%%DOCSDIR%%/library/normalize.html
-%%DOCSDIR%%/library/not-equalp.html
-%%DOCSDIR%%/library/not.html
-%%DOCSDIR%%/library/nplus.html
-%%DOCSDIR%%/library/nquotient.html
-%%DOCSDIR%%/library/nremainder.html
-%%DOCSDIR%%/library/ntimes.html
-%%DOCSDIR%%/library/nullp.html
-%%DOCSDIR%%/library/numtostr.html
-%%DOCSDIR%%/library/oddp.html
-%%DOCSDIR%%/library/orderedp.html
-%%DOCSDIR%%/library/pair.html
-%%DOCSDIR%%/library/permute.html
-%%DOCSDIR%%/library/plus.html
-%%DOCSDIR%%/library/positivep.html
-%%DOCSDIR%%/library/pred-iter.html
-%%DOCSDIR%%/library/pred.html
-%%DOCSDIR%%/library/product.html
-%%DOCSDIR%%/library/qsort.html
-%%DOCSDIR%%/library/quotient.html
-%%DOCSDIR%%/library/read-line.html
-%%DOCSDIR%%/library/remainder.html
-%%DOCSDIR%%/library/remove.html
-%%DOCSDIR%%/library/remp.html
-%%DOCSDIR%%/library/remq.html
-%%DOCSDIR%%/library/remv.html
-%%DOCSDIR%%/library/replace.html
-%%DOCSDIR%%/library/reverse.html
-%%DOCSDIR%%/library/s-append.html
-%%DOCSDIR%%/library/s-cieqp.html
-%%DOCSDIR%%/library/s-cigep.html
-%%DOCSDIR%%/library/s-cigtp.html
-%%DOCSDIR%%/library/s-cilep.html
-%%DOCSDIR%%/library/s-ciltp.html
-%%DOCSDIR%%/library/s-length.html
-%%DOCSDIR%%/library/s-ref.html
-%%DOCSDIR%%/library/seqp.html
-%%DOCSDIR%%/library/sgep.html
-%%DOCSDIR%%/library/sgtp.html
-%%DOCSDIR%%/library/slep.html
-%%DOCSDIR%%/library/sltp.html
-%%DOCSDIR%%/library/sqrt.html
-%%DOCSDIR%%/library/string.html
-%%DOCSDIR%%/library/strtonum.html
-%%DOCSDIR%%/library/substitute.html
-%%DOCSDIR%%/library/substring.html
-%%DOCSDIR%%/library/succ.html
-%%DOCSDIR%%/library/sum.html
-%%DOCSDIR%%/library/tailp.html
-%%DOCSDIR%%/library/times.html
-%%DOCSDIR%%/library/union.html
-%%DOCSDIR%%/library/unique.html
-%%DOCSDIR%%/library/vector.html
-%%DOCSDIR%%/library/zerop.html
-%%DOCSDIR%%/license.html
-%%DOCSDIR%%/ndx2.html
-%%DOCSDIR%%/prog/amk.html
-%%DOCSDIR%%/prog/bottles.html
-%%DOCSDIR%%/prog/draw-tree.html
-%%DOCSDIR%%/prog/factors.html
-%%DOCSDIR%%/prog/hyper.html
-%%DOCSDIR%%/prog/infix.html
-%%DOCSDIR%%/prog/pp.html
-%%DOCSDIR%%/prog/prefix.html
-%%DOCSDIR%%/prog/prolog.html
-%%DOCSDIR%%/prog/queens.html
-%%DOCSDIR%%/prog/scmtocps.html
-%%DOCSDIR%%/prog/zebra.html
-%%DOCSDIR%%/progs.html
-%%DOCSDIR%%/sk01.html
-%%DOCSDIR%%/sk02.html
-%%DOCSDIR%%/sk03.html
-%%DOCSDIR%%/sk04.html
-%%DOCSDIR%%/sk05.html
-%%DOCSDIR%%/sk06.html
-%%DOCSDIR%%/sk07.html
-%%DOCSDIR%%/sk08.html
-%%DOCSDIR%%/sk09.html
-%%DOCSDIR%%/sk10.html
-%%DOCSDIR%%/toc2-x.html
-%%DOCSDIR%%/toc2.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/library/abs.html
+%%PORTDOCS%%%%DOCSDIR%%/library/append.html
+%%PORTDOCS%%%%DOCSDIR%%/library/assoc.html
+%%PORTDOCS%%%%DOCSDIR%%/library/assp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/assq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/assv.html
+%%PORTDOCS%%%%DOCSDIR%%/library/booleanp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-alphabeticp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-cieqp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-cigep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-cigtp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-cilep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-ciltp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-downcase.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-lower-casep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-numericp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-upcase.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-upper-casep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/c-whitespacep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/caaaar.html
+%%PORTDOCS%%%%DOCSDIR%%/library/caaar.html
+%%PORTDOCS%%%%DOCSDIR%%/library/caar.html
+%%PORTDOCS%%%%DOCSDIR%%/library/case.html
+%%PORTDOCS%%%%DOCSDIR%%/library/ceqp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/cgep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/cgtp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/clep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/cltp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/count.html
+%%PORTDOCS%%%%DOCSDIR%%/library/depth.html
+%%PORTDOCS%%%%DOCSDIR%%/library/digits.html
+%%PORTDOCS%%%%DOCSDIR%%/library/divide.html
+%%PORTDOCS%%%%DOCSDIR%%/library/equal.html
+%%PORTDOCS%%%%DOCSDIR%%/library/equalp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/eqvp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/evenp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/exists.html
+%%PORTDOCS%%%%DOCSDIR%%/library/explode.html
+%%PORTDOCS%%%%DOCSDIR%%/library/expt.html
+%%PORTDOCS%%%%DOCSDIR%%/library/factorial.html
+%%PORTDOCS%%%%DOCSDIR%%/library/filter.html
+%%PORTDOCS%%%%DOCSDIR%%/library/fold-left.html
+%%PORTDOCS%%%%DOCSDIR%%/library/fold-right.html
+%%PORTDOCS%%%%DOCSDIR%%/library/for-all.html
+%%PORTDOCS%%%%DOCSDIR%%/library/gcd.html
+%%PORTDOCS%%%%DOCSDIR%%/library/greater.html
+%%PORTDOCS%%%%DOCSDIR%%/library/gteq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/headp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/id.html
+%%PORTDOCS%%%%DOCSDIR%%/library/if.html
+%%PORTDOCS%%%%DOCSDIR%%/library/implode.html
+%%PORTDOCS%%%%DOCSDIR%%/library/index.html
+%%PORTDOCS%%%%DOCSDIR%%/library/integer.html
+%%PORTDOCS%%%%DOCSDIR%%/library/integerp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/intersection.html
+%%PORTDOCS%%%%DOCSDIR%%/library/iota.html
+%%PORTDOCS%%%%DOCSDIR%%/library/last.html
+%%PORTDOCS%%%%DOCSDIR%%/library/lcm.html
+%%PORTDOCS%%%%DOCSDIR%%/library/length.html
+%%PORTDOCS%%%%DOCSDIR%%/library/less.html
+%%PORTDOCS%%%%DOCSDIR%%/library/letstar.html
+%%PORTDOCS%%%%DOCSDIR%%/library/list-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/library/list-tail.html
+%%PORTDOCS%%%%DOCSDIR%%/library/list.html
+%%PORTDOCS%%%%DOCSDIR%%/library/listp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/lteq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/map-car.html
+%%PORTDOCS%%%%DOCSDIR%%/library/map-cdr.html
+%%PORTDOCS%%%%DOCSDIR%%/library/map.html
+%%PORTDOCS%%%%DOCSDIR%%/library/max.html
+%%PORTDOCS%%%%DOCSDIR%%/library/member.html
+%%PORTDOCS%%%%DOCSDIR%%/library/memp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/memq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/memv.html
+%%PORTDOCS%%%%DOCSDIR%%/library/min.html
+%%PORTDOCS%%%%DOCSDIR%%/library/minus.html
+%%PORTDOCS%%%%DOCSDIR%%/library/modulo.html
+%%PORTDOCS%%%%DOCSDIR%%/library/natural.html
+%%PORTDOCS%%%%DOCSDIR%%/library/naturalp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/ndivide.html
+%%PORTDOCS%%%%DOCSDIR%%/library/negate.html
+%%PORTDOCS%%%%DOCSDIR%%/library/negativep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/neqp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/newline.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nexpt.html
+%%PORTDOCS%%%%DOCSDIR%%/library/ngreater.html
+%%PORTDOCS%%%%DOCSDIR%%/library/ngteq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nless.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nlteq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nminus.html
+%%PORTDOCS%%%%DOCSDIR%%/library/non-negativep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/normalize.html
+%%PORTDOCS%%%%DOCSDIR%%/library/not-equalp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/not.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nplus.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nquotient.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nremainder.html
+%%PORTDOCS%%%%DOCSDIR%%/library/ntimes.html
+%%PORTDOCS%%%%DOCSDIR%%/library/nullp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/numtostr.html
+%%PORTDOCS%%%%DOCSDIR%%/library/oddp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/orderedp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/pair.html
+%%PORTDOCS%%%%DOCSDIR%%/library/permute.html
+%%PORTDOCS%%%%DOCSDIR%%/library/plus.html
+%%PORTDOCS%%%%DOCSDIR%%/library/positivep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/pred-iter.html
+%%PORTDOCS%%%%DOCSDIR%%/library/pred.html
+%%PORTDOCS%%%%DOCSDIR%%/library/product.html
+%%PORTDOCS%%%%DOCSDIR%%/library/qsort.html
+%%PORTDOCS%%%%DOCSDIR%%/library/quotient.html
+%%PORTDOCS%%%%DOCSDIR%%/library/read-line.html
+%%PORTDOCS%%%%DOCSDIR%%/library/remainder.html
+%%PORTDOCS%%%%DOCSDIR%%/library/remove.html
+%%PORTDOCS%%%%DOCSDIR%%/library/remp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/remq.html
+%%PORTDOCS%%%%DOCSDIR%%/library/remv.html
+%%PORTDOCS%%%%DOCSDIR%%/library/replace.html
+%%PORTDOCS%%%%DOCSDIR%%/library/reverse.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-append.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-cieqp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-cigep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-cigtp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-cilep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-ciltp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-length.html
+%%PORTDOCS%%%%DOCSDIR%%/library/s-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/library/seqp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/sgep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/sgtp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/slep.html
+%%PORTDOCS%%%%DOCSDIR%%/library/sltp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/sqrt.html
+%%PORTDOCS%%%%DOCSDIR%%/library/string.html
+%%PORTDOCS%%%%DOCSDIR%%/library/strtonum.html
+%%PORTDOCS%%%%DOCSDIR%%/library/substitute.html
+%%PORTDOCS%%%%DOCSDIR%%/library/substring.html
+%%PORTDOCS%%%%DOCSDIR%%/library/succ.html
+%%PORTDOCS%%%%DOCSDIR%%/library/sum.html
+%%PORTDOCS%%%%DOCSDIR%%/library/tailp.html
+%%PORTDOCS%%%%DOCSDIR%%/library/times.html
+%%PORTDOCS%%%%DOCSDIR%%/library/union.html
+%%PORTDOCS%%%%DOCSDIR%%/library/unique.html
+%%PORTDOCS%%%%DOCSDIR%%/library/vector.html
+%%PORTDOCS%%%%DOCSDIR%%/library/zerop.html
+%%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/ndx2.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/amk.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/bottles.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/draw-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/factors.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/hyper.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/infix.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/pp.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/prefix.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/prolog.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/queens.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/scmtocps.html
+%%PORTDOCS%%%%DOCSDIR%%/prog/zebra.html
+%%PORTDOCS%%%%DOCSDIR%%/progs.html
+%%PORTDOCS%%%%DOCSDIR%%/sk01.html
+%%PORTDOCS%%%%DOCSDIR%%/sk02.html
+%%PORTDOCS%%%%DOCSDIR%%/sk03.html
+%%PORTDOCS%%%%DOCSDIR%%/sk04.html
+%%PORTDOCS%%%%DOCSDIR%%/sk05.html
+%%PORTDOCS%%%%DOCSDIR%%/sk06.html
+%%PORTDOCS%%%%DOCSDIR%%/sk07.html
+%%PORTDOCS%%%%DOCSDIR%%/sk08.html
+%%PORTDOCS%%%%DOCSDIR%%/sk09.html
+%%PORTDOCS%%%%DOCSDIR%%/sk10.html
+%%PORTDOCS%%%%DOCSDIR%%/toc2-x.html
+%%PORTDOCS%%%%DOCSDIR%%/toc2.html
@dirrm %%DATADIR%%/ext
@dirrm %%DATADIR%%/lib
@dirrm %%DATADIR%%/src
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/library
-@dirrm %%DOCSDIR%%/prog
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/library
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/prog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index a04ae0684f6b..7372a23a9b50 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -18,4 +18,6 @@ USE_OPENLDAP= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.mk>
diff --git a/mail/gnarwl/pkg-plist b/mail/gnarwl/pkg-plist
index fbd0cf0e36db..0eff4db06cb8 100644
--- a/mail/gnarwl/pkg-plist
+++ b/mail/gnarwl/pkg-plist
@@ -3,15 +3,15 @@ etc/gnarwl.cfg.sample
man/man8/damnit.8.gz
man/man8/gnarwl.8.gz
sbin/damnit
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/FAQ.gz
-%%DOCSDIR%%/HISTORY.gz
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/ISPEnv.schema
-%%DOCSDIR%%/ISPEnv2.schema
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/README
-%%DOCSDIR%%/example.ldif
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.gz
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY.gz
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/ISPEnv.schema
+%%PORTDOCS%%%%DOCSDIR%%/ISPEnv2.schema
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/example.ldif
var/lib/gnarwl/.forward
var/lib/gnarwl/badheaders.db.sample
var/lib/gnarwl/blacklist.db.sample
@@ -19,7 +19,7 @@ var/lib/gnarwl/badheaders.txt.sample
var/lib/gnarwl/blacklist.txt.sample
var/lib/gnarwl/header.txt.sample
var/lib/gnarwl/footer.txt.sample
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm var/lib/gnarwl/bin
@dirrm var/lib/gnarwl/block
@dirrm var/lib/gnarwl
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index d1924eb2fd58..aaeb3dd5ac79 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -20,8 +20,8 @@ LIB_DEPENDS= libLASi.so:${PORTSDIR}/devel/lasi \
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
-OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
-OPTIONS_DEFAULT= THREADS X11
+OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS
+OPTIONS_DEFAULT=THREADS X11
USE_GNOME= pango
USE_PERL5= build
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index c410025a56e0..010ec5b492cf 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -112,24 +112,24 @@ libdata/pkgconfig/plplotd.pc
%%TCLTK%%man/man1/plserver.1.gz
%%TCLTK%%man/man1/pltcl.1.gz
man/man1/pltek.1.gz
-%%DOCSDIR%%/ABOUT
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING.LIB
-%%DOCSDIR%%/ChangeLog.release
-%%DOCSDIR%%/Copyright
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PROBLEMS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.1st.csa
-%%DOCSDIR%%/README.1st.nn
-%%DOCSDIR%%/README.csa
-%%DOCSDIR%%/README.drivers
-%%DOCSDIR%%/README.nn
-%%DOCSDIR%%/README.pkg-config
-%%DOCSDIR%%/README.release
-%%DOCSDIR%%/README.testing
-%%DOCSDIR%%/README.wxwidgets
+%%PORTDOCS%%%%DOCSDIR%%/ABOUT
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.release
+%%PORTDOCS%%%%DOCSDIR%%/Copyright
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.1st.csa
+%%PORTDOCS%%%%DOCSDIR%%/README.1st.nn
+%%PORTDOCS%%%%DOCSDIR%%/README.csa
+%%PORTDOCS%%%%DOCSDIR%%/README.drivers
+%%PORTDOCS%%%%DOCSDIR%%/README.nn
+%%PORTDOCS%%%%DOCSDIR%%/README.pkg-config
+%%PORTDOCS%%%%DOCSDIR%%/README.release
+%%PORTDOCS%%%%DOCSDIR%%/README.testing
+%%PORTDOCS%%%%DOCSDIR%%/README.wxwidgets
%%DATADIR%%/cglobe.map
%%DATADIR%%/cmap0_alternate.pal
%%DATADIR%%/cmap0_black_on_white.pal
@@ -637,7 +637,7 @@ man/man1/pltek.1.gz
@dirrm %%DATADIR%%/examples/c
@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm lib/plplot/driversd
@dirrm lib/plplot
%%LUA%%@dirrm %%LUA_MODLIBDIR%%/plplot
diff --git a/math/solitaire/Makefile b/math/solitaire/Makefile
index 5e6367689311..44a98e918010 100644
--- a/math/solitaire/Makefile
+++ b/math/solitaire/Makefile
@@ -19,6 +19,8 @@ NO_BUILD= yes
NO_WRKSUBDIR= yes
STRIP=
+OPTIONS_DEFINE= DOCS
+
do-extract:
@${MKDIR} ${WRKDIR}
@${CP} -r ${DISTDIR}/sol.pl ${DISTDIR}/sol-test.txt ${WRKDIR}
diff --git a/math/solitaire/pkg-plist b/math/solitaire/pkg-plist
index 963ed1e1849c..82b1d2204e38 100644
--- a/math/solitaire/pkg-plist
+++ b/math/solitaire/pkg-plist
@@ -1,4 +1,4 @@
bin/solitaire
-%%DOCSDIR%%/sol.pl
-%%DOCSDIR%%/sol-test.txt
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/sol.pl
+%%PORTDOCS%%%%DOCSDIR%%/sol-test.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/pypanda/Makefile b/misc/pypanda/Makefile
index 36eb0e242683..6b4c91c8ee85 100644
--- a/misc/pypanda/Makefile
+++ b/misc/pypanda/Makefile
@@ -14,6 +14,8 @@ RUN_DEPENDS= ${PYGAME}
USE_PYTHON= yes
+OPTIONS_DEFINE= DOCS
+
do-build:
${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
diff --git a/misc/pypanda/pkg-plist b/misc/pypanda/pkg-plist
index 56df0e8c0ceb..389ea814eb1f 100644
--- a/misc/pypanda/pkg-plist
+++ b/misc/pypanda/pkg-plist
@@ -1,5 +1,5 @@
bin/pypanda
-%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README
%%DATADIR%%/camdown.jpg
%%DATADIR%%/camrefresh.jpg
%%DATADIR%%/pypanda.png
@@ -7,4 +7,4 @@ bin/pypanda
%%DATADIR%%/pypanda.pyc
%%DATADIR%%/pypanda.pyo
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/misc/tpp/Makefile b/misc/tpp/Makefile
index 620820e7a872..bb63cfdf4802 100644
--- a/misc/tpp/Makefile
+++ b/misc/tpp/Makefile
@@ -16,6 +16,8 @@ NO_BUILD= yes
USE_RUBY= yes
RUBY_NO_BUILD_DEPENDS= yes
+OPTIONS_DEFINE= DOCS
+
post-patch:
@${REINPLACE_CMD} -E -e 's,share/man,man,' \
-e 's,(DOC|INS|MAN)PATH),DESTDIR)$$(&,' \
diff --git a/misc/tpp/pkg-plist b/misc/tpp/pkg-plist
index d80d8330212b..72300cd1c6a9 100644
--- a/misc/tpp/pkg-plist
+++ b/misc/tpp/pkg-plist
@@ -1,29 +1,29 @@
bin/tpp
man/man1/tpp.1.gz
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/DESIGN
-%%DOCSDIR%%/README
-%%DOCSDIR%%/THANKS
-%%DOCSDIR%%/contrib/tpp-mode.el
-%%DOCSDIR%%/contrib/tpp.vim
-%%DOCSDIR%%/examples/ac-am.tpp
-%%DOCSDIR%%/examples/align-footer.tpp
-%%DOCSDIR%%/examples/bold.tpp
-%%DOCSDIR%%/examples/colors.tpp
-%%DOCSDIR%%/examples/colors2.tpp
-%%DOCSDIR%%/examples/debian-packaging.tpp
-%%DOCSDIR%%/examples/exec.tpp
-%%DOCSDIR%%/examples/horline.tpp
-%%DOCSDIR%%/examples/huge.tpp
-%%DOCSDIR%%/examples/list.tpp
-%%DOCSDIR%%/examples/manyslides.tpp
-%%DOCSDIR%%/examples/shell.tpp
-%%DOCSDIR%%/examples/slidein.tpp
-%%DOCSDIR%%/examples/source.tpp
-%%DOCSDIR%%/examples/test.tpp
-%%DOCSDIR%%/examples/tpp-features.tpp
-%%DOCSDIR%%/examples/wrap.tpp
-@dirrm %%DOCSDIR%%/contrib
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DESIGN
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/contrib/tpp-mode.el
+%%PORTDOCS%%%%DOCSDIR%%/contrib/tpp.vim
+%%PORTDOCS%%%%DOCSDIR%%/examples/ac-am.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/align-footer.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/bold.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/colors.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/colors2.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/debian-packaging.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/exec.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/horline.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/huge.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/list.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/manyslides.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/shell.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/slidein.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/source.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/test.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/tpp-features.tpp
+%%PORTDOCS%%%%DOCSDIR%%/examples/wrap.tpp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net-p2p/btqueue/Makefile b/net-p2p/btqueue/Makefile
index a1f65170802c..5d681f71b65c 100644
--- a/net-p2p/btqueue/Makefile
+++ b/net-p2p/btqueue/Makefile
@@ -21,8 +21,8 @@ PYDISTUTILS_PKGNAME= BTQueue
DATADIR= ${PREFIX}/share/BTQueue
DOCSDIR= ${PREFIX}/share/doc/BTQueue
-OPTIONS_DEFINE= PYXML
-OPTIONS_DEFAULT= PYXML
+OPTIONS_DEFINE= PYXML DOCS
+OPTIONS_DEFAULT=PYXML
PYXML_DESC= Add dependency on PyXML (needed for crawler only)
.include <bsd.port.options.mk>
diff --git a/net-p2p/btqueue/pkg-plist b/net-p2p/btqueue/pkg-plist
index 0630c664d0cd..861e52790abb 100644
--- a/net-p2p/btqueue/pkg-plist
+++ b/net-p2p/btqueue/pkg-plist
@@ -467,8 +467,8 @@ bin/btshowmetainfo.py
%%PYTHON_SITELIBDIR%%/khashmir/utkhashmir.pyo
%%DATADIR%%/alias.conf
%%DATADIR%%/ip2cc.db
-%%DOCSDIR%%/examples/interest.xml
-%%DOCSDIR%%/examples/tracker.xml
+%%PORTDOCS%%%%DOCSDIR%%/examples/interest.xml
+%%PORTDOCS%%%%DOCSDIR%%/examples/tracker.xml
@dirrm %%PYTHON_SITELIBDIR%%/BitCrawler
@dirrm %%PYTHON_SITELIBDIR%%/BitQueue
@dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
@@ -476,5 +476,5 @@ bin/btshowmetainfo.py
@dirrm %%PYTHON_SITELIBDIR%%/BitTorrent
@dirrm %%PYTHON_SITELIBDIR%%/khashmir
@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%/examples
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/net/tsocks/pkg-plist b/net/tsocks/pkg-plist
index 994c4e8926f7..a80e33706996 100644
--- a/net/tsocks/pkg-plist
+++ b/net/tsocks/pkg-plist
@@ -8,5 +8,5 @@ man/man8/tsocks.8.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.complex.example
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tsocks.conf.simple.example
%%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/news/slnr/pkg-plist b/news/slnr/pkg-plist
index 96c05c95b200..dc786b192ef3 100644
--- a/news/slnr/pkg-plist
+++ b/news/slnr/pkg-plist
@@ -1,8 +1,8 @@
bin/slnr
man/man1/slnr.1.gz
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/default.dot.slnrrc
-%%DOCSDIR%%/porting.notes
-%%DOCSDIR%%/slnr.doc
-%%DOCSDIR%%/soup12.doc
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/default.dot.slnrrc
+%%PORTDOCS%%%%DOCSDIR%%/porting.notes
+%%PORTDOCS%%%%DOCSDIR%%/slnr.doc
+%%PORTDOCS%%%%DOCSDIR%%/soup12.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/science/svmlight/Makefile b/science/svmlight/Makefile
index c1b5a713d5b7..3010f303b59c 100644
--- a/science/svmlight/Makefile
+++ b/science/svmlight/Makefile
@@ -23,6 +23,8 @@ USES= gmake
USE_LDCONFIG= yes
PKGMESSAGE= ${WRKSRC}/LICENSE.txt
+OPTIONS_DEFINE= DOCS
+
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/include/svmlight
${INSTALL_DATA} ${WRKSRC}/*.h ${STAGEDIR}${PREFIX}/include/svmlight
diff --git a/science/svmlight/pkg-plist b/science/svmlight/pkg-plist
index f632c2429740..2b5315213d8e 100644
--- a/science/svmlight/pkg-plist
+++ b/science/svmlight/pkg-plist
@@ -6,6 +6,6 @@ include/svmlight/svm_learn.h
lib/libsvmlight.a
lib/libsvmlight.so
lib/libsvmlight.so.1
-%%DOCSDIR%%/LICENSE.txt
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/svmlight
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index e2fbfd831bed..849f42b6d8ad 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -44,6 +44,8 @@ SUB_FILES= pkg-message
FONTS_FILE= ${WRKDIR}/fonts.dir
+OPTIONS_DEFINE= DOCS
+
.include <bsd.port.pre.mk>
.if defined(WITH_MSWINDOWS_LICENSE)
diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist
index 055ff0090f93..14b4cfc06395 100644
--- a/x11-fonts/webfonts/pkg-plist
+++ b/x11-fonts/webfonts/pkg-plist
@@ -1,4 +1,4 @@
-%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
%%FONTSDIR%%/andalemo.ttf
%%FONTSDIR%%/arial.ttf
%%FONTSDIR%%/arialbd.ttf
@@ -34,6 +34,6 @@
%%FONTSDIR%%/verdanai.ttf
%%FONTSDIR%%/verdanaz.ttf
%%FONTSDIR%%/webdings.ttf
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%FONTSDIR%%
@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-wm/gcompmgr/Makefile b/x11-wm/gcompmgr/Makefile
index 9580b1c626b2..8fcb83105813 100644
--- a/x11-wm/gcompmgr/Makefile
+++ b/x11-wm/gcompmgr/Makefile
@@ -24,6 +24,7 @@ DESKTOP_ENTRIES="gcompmgr" \
"DesktopSettings;Settings;GTK;" \
true
+OPTIONS_DEFINE= DOCS
post-patch:
.for file in depcomp install-sh missing
diff --git a/x11-wm/gcompmgr/pkg-plist b/x11-wm/gcompmgr/pkg-plist
index b415f632dcfd..5d7f754382af 100644
--- a/x11-wm/gcompmgr/pkg-plist
+++ b/x11-wm/gcompmgr/pkg-plist
@@ -1,7 +1,7 @@
bin/gcompmgr
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/TODO
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11-wm/wmanager/pkg-plist b/x11-wm/wmanager/pkg-plist
index f45b38aa179e..045d8a37ab91 100644
--- a/x11-wm/wmanager/pkg-plist
+++ b/x11-wm/wmanager/pkg-plist
@@ -1,11 +1,11 @@
bin/wmanager
-%%DOCS%%%%DOCSDIR%%/FAQ
-%%DOCS%%%%DOCSDIR%%/HISTORY
-%%DOCS%%%%DOCSDIR%%/INSTALL
-%%DOCS%%%%DOCSDIR%%/NEWS
-%%DOCS%%%%DOCSDIR%%/README
-%%DOCS%%%%DOCSDIR%%/TODO
-%%EXAMPLES%%%%EXAMPLESDIR%%/wmanagerrc_sample
-%%EXAMPLES%%%%EXAMPLESDIR%%/xinitrc_sample
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%DOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmanagerrc_sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xinitrc_sample
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index ccbd8fc3a92b..67c1a56c40ba 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -46,7 +46,7 @@ CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= MMX GLX ATSPI STROKE RPLAY FRIBIDI GLIB GTK2 GCONF \
- GTK1 IMLIB
+ GTK1 IMLIB DOCS
OPTIONS_DEFINE_i386= GLX_X86
GLX_X86_DESC= GLX with x86 optimizations
diff --git a/x11/metisse/pkg-plist b/x11/metisse/pkg-plist
index 86d653115444..56a41770d7a4 100644
--- a/x11/metisse/pkg-plist
+++ b/x11/metisse/pkg-plist
@@ -122,16 +122,16 @@ man/man1/fvwm.1.gz
share/applications/fvwmi.desktop
share/applications/mini-fvwmi.desktop
share/applications/opale.desktop
-%%DOCSDIR%%/docs/building.html
-%%DOCSDIR%%/docs/metisse-architecture.png
-%%DOCSDIR%%/docs/running.html
-%%DOCSDIR%%/docs/using.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/metisse.css
-%%DOCSDIR%%/no3d.png
-%%DOCSDIR%%/up.jpg
-@dirrm %%DOCSDIR%%/docs
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/docs/building.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/metisse-architecture.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/running.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/using.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/metisse.css
+%%PORTDOCS%%%%DOCSDIR%%/no3d.png
+%%PORTDOCS%%%%DOCSDIR%%/up.jpg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/fvwm-insitu/ConfigFvwmBacker
share/fvwm-insitu/ConfigFvwmButtons
share/fvwm-insitu/ConfigFvwmDefaults