88 files changed, 197 insertions, 91 deletions

diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
index 90474de680a2..0643dbe80ced 100644
--- a/mail/annoyance-filter/Makefile
+++ b/mail/annoyance-filter/Makefile
@@ -18,6 +18,8 @@ DOCS=		COPYING INSTALL README *.pdf
 
 CFLAGS=		${CPPFLAGS}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-run ${STAGEDIR}${PREFIX}/bin
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index b223abd28717..9c4920718ac4 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -16,6 +16,8 @@ NO_BUILD=	yes
 DOCS=		CHANGELOG FAQ NEWS README TODO
 EXAMPLES=	test_archivemail examples/archivemail_all
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/archivemail ${STAGEDIR}${PREFIX}/bin/archivemail
 	${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index a9baad14256c..2aa554a51722 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fst Bayesian Mail Filter compatible with maildrop and procmail
 
 HAS_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		BDB MYSQL DEBUG
-OPTIONS_DEFAULT=	BDB
+OPTIONS_DEFINE=	BDB MYSQL DEBUG DOCS
+OPTIONS_DEFAULT=BDB
 
 BDB_USE=	BDB=40+
 BDB_CONFIGURE_WITH=	libdb
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 9365150b397c..720b05032450 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -35,6 +35,8 @@ CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
 
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 		@${MKDIR} ${WRKDIR}/ncursesw
 		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
diff --git a/mail/ez-pine-gpg/Makefile b/mail/ez-pine-gpg/Makefile
index 880ce7051b21..0064c4ee7dab 100644
--- a/mail/ez-pine-gpg/Makefile
+++ b/mail/ez-pine-gpg/Makefile
@@ -17,6 +17,8 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 WRKSRC=	${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	(cd ${WRKSRC} && ./install ${STAGEDIR}${PREFIX}/bin)
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 1288825ee0eb..a955d648fb66 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -60,7 +60,7 @@ OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
-OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER
+OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER DOCS
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
diff --git a/mail/ruby-rfilter/Makefile b/mail/ruby-rfilter/Makefile
index e67be6c0a540..9c9537e4d650 100644
--- a/mail/ruby-rfilter/Makefile
+++ b/mail/ruby-rfilter/Makefile
@@ -20,6 +20,8 @@ RUBY_SETUP=	install.rb
 
 DOCS=		NEWS README THANKS TODO doc
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} -name '*~' -delete
 
diff --git a/mail/ruby-rmail/Makefile b/mail/ruby-rmail/Makefile
index 599c1cc43a31..a1a4f61faca5 100644
--- a/mail/ruby-rmail/Makefile
+++ b/mail/ruby-rmail/Makefile
@@ -18,6 +18,8 @@ RUBY_SETUP=	install.rb
 
 DOCS=		NEWS NOTES README THANKS TODO doc
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} -name '*~' -delete
 
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index 1cd776562808..bdc5a09fbe35 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -1,27 +1,29 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-decode
+PORTNAME=	squirrelmail-decode
 PORTVERSION=	1.2
-CATEGORIES=		mail www
+CATEGORIES=	mail www
 MASTER_SITES=	SF/squirrelmail/decode/${PORTVERSION}
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		adamw@FreeBSD.org
-COMMENT=		Decoders to display extra character sets in SquirrelMail
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	Decoders to display extra character sets in SquirrelMail
 
-LICENSE=		GPLv2
+LICENSE=	GPLv2
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
-USES=			tar:bzip2
-NO_BUILD=		yes
+USES=		tar:bzip2
+NO_BUILD=	yes
 
-DOCSDIR=		${PREFIX}/share/doc/squirrelmail/decode
+DOCSDIR=	${PREFIX}/share/doc/squirrelmail/decode
 
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
-PLIST_SUB=		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
+PLIST_SUB=	SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}/functions/decode
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 83e4950986d9..f332cf5faebc 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -25,7 +25,7 @@ USES=		gettext tar:bzip2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.stable/${PORTNAME}
 
-OPTIONS_DEFINE=	DATABASE LDAP
+OPTIONS_DEFINE=	DATABASE LDAP DOCS
 DATABASE_DESC=	PEAR database support (must also install a driver)
 
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
@@ -37,9 +37,9 @@ USERS=		${SMUSER}
 GROUPS=		${SMGROUP}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-			SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
-			SMUSER=${SMUSER} \
-			SMGROUP=${SMGROUP}
+		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
+		SMUSER=${SMUSER} \
+		SMGROUP=${SMGROUP}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index e770db4525f9..de97f9de745e 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python-based SPAM reduction system
 
-.if defined(WITH_CDB)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-.endif
+OPTIONS_DEFINE=	CDB DOCS EXAMPLES
+CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
 
 USE_PYTHON=	yes
 
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 86b8fc39bab9..7bd279f86915 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -100,33 +100,33 @@ bin/tmda-sendmail
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA/Queue
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA
-%%EXAMPLESDIR%%/collectaddys
-%%EXAMPLESDIR%%/def2html
-%%EXAMPLESDIR%%/dot-tmda/README
-%%EXAMPLESDIR%%/dot-tmda/config
-%%EXAMPLESDIR%%/dot-tmda/crypt_key
-%%EXAMPLESDIR%%/dot-tmda/filters/incoming
-%%EXAMPLESDIR%%/dot-tmda/filters/outgoing
-%%EXAMPLESDIR%%/dot-tmda/lists/blacklist
-%%EXAMPLESDIR%%/dot-tmda/lists/confirmed
-%%EXAMPLESDIR%%/dot-tmda/lists/whitelist
-%%EXAMPLESDIR%%/printcdb
-%%EXAMPLESDIR%%/printdbm
-%%EXAMPLESDIR%%/sendit.sh
-%%EXAMPLESDIR%%/smtp-check-sender
-%%EXAMPLESDIR%%/tmda.el
-%%EXAMPLESDIR%%/tofmipd.init
-%%EXAMPLESDIR%%/tofmipd.sysconfig
-%%EXAMPLESDIR%%/update-internaldomains
-%%EXAMPLESDIR%%/vadduser-tmda
-%%EXAMPLESDIR%%/vmailmgr-vdir.sh
-%%EXAMPLESDIR%%/vpopmail-vdir.sh
-%%EXAMPLESDIR%%/vtmdarc
-%%EXAMPLESDIR%%/wrapfd3.sh
-@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
-@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
-@dirrm %%EXAMPLESDIR%%/dot-tmda
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/collectaddys
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/def2html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/crypt_key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/filters/incoming
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/filters/outgoing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/blacklist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/confirmed
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/whitelist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printcdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printdbm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendit.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-check-sender
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tmda.el
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tofmipd.init
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tofmipd.sysconfig
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update-internaldomains
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vadduser-tmda
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vmailmgr-vdir.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vpopmail-vdir.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vtmdarc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrapfd3.sh
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%DATADIR%%/bounce_expired_dated.txt
 %%DATADIR%%/bounce_fail_dated.txt
 %%DATADIR%%/bounce_fail_keyword.txt
diff --git a/math/diehard/Makefile b/math/diehard/Makefile
index fe57dded58ec..3e05a6a6df40 100644
--- a/math/diehard/Makefile
+++ b/math/diehard/Makefile
@@ -17,6 +17,8 @@ PLIST_SUB=	DOCSDIR="share/doc/${PORTNAME}" DATADIR="share/${PORTNAME}"
 
 DOCSLIST=	NOTES readme
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|operm5\.cov|${DATADIR}/operm5.cov|g;' \
 		${WRKSRC}/cdoperm5.c
diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile
index 2d85d0c4da79..60a9b0c919a0 100644
--- a/math/ocamlgsl/Makefile
+++ b/math/ocamlgsl/Makefile
@@ -25,6 +25,8 @@ HAS_CONFIGURE=		YES
 MAKE_JOBS_UNSAFE=	yes
 WRKSRC=			${WRKDIR}/gsl-ocaml-${PORTVERSION}
 
+OPTIONS_DEFINE=	DOCS
+
 post-configure:
 	@${ECHO_CMD} 'stagedir="${STAGEDIR}"' >> ${WRKSRC}/setup.data
 	@${ECHO_CMD} 'docdir="$$datarootdir/doc/ocaml/$$pkg_name"' >> ${WRKSRC}/setup.data
diff --git a/math/parmgridgen/Makefile b/math/parmgridgen/Makefile
index 713e3da3c769..3d98107e9c38 100644
--- a/math/parmgridgen/Makefile
+++ b/math/parmgridgen/Makefile
@@ -19,6 +19,8 @@ LIB_DEPENDS+=	libmpi.so:${PORTSDIR}/net/openmpi
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} 's|make|$$(MAKE)|g' ${WRKSRC}/Makefile
 #respect CFLAGS
diff --git a/math/pecl-big_int/Makefile b/math/pecl-big_int/Makefile
index 02ada663f217..253a40010cdc 100644
--- a/math/pecl-big_int/Makefile
+++ b/math/pecl-big_int/Makefile
@@ -21,6 +21,8 @@ EXAMPLES=	bitset.php example.php rand.php RSA.php std_header.php
 
 CONFIGURE_ARGS=	--enable-big-int=shared
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/math/pecl-big_int/pkg-plist b/math/pecl-big_int/pkg-plist
index 982efe9af06e..5e11de094436 100644
--- a/math/pecl-big_int/pkg-plist
+++ b/math/pecl-big_int/pkg-plist
@@ -3,10 +3,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/RSA.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/bitset.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/rand.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/std_header.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RSA.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitset.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rand.php
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/std_header.php
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/math/py-nzmath/Makefile b/math/py-nzmath/Makefile
index 64700bba4256..83eacb8b4938 100644
--- a/math/py-nzmath/Makefile
+++ b/math/py-nzmath/Makefile
@@ -15,6 +15,8 @@ USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	NZMATH
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/data/discriminant.csv ${STAGEDIR}${DATADIR}
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index d7796daf2550..b38633185a03 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -23,6 +23,8 @@ PYDISTUTILS_AUTOPLIST=	yes
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}
diff --git a/math/ruby-fftw3/Makefile b/math/ruby-fftw3/Makefile
index c6fbb4ed2039..11d12052b96e 100644
--- a/math/ruby-fftw3/Makefile
+++ b/math/ruby-fftw3/Makefile
@@ -29,6 +29,8 @@ CONFIGURE_ARGS+=	--with-narray-include=${LOCALBASE}/lib/ruby/gems/${RUBY_VER}/ge
 
 DOCS=		LICENSE.txt doc/*
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 .for f in ${DOCS}
diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile
index 61112cda00ac..cd06dece8004 100644
--- a/math/ruby-gsl/Makefile
+++ b/math/ruby-gsl/Makefile
@@ -24,6 +24,8 @@ CONFIGURE_ARGS=	-- --with-opt-dir="${LOCALBASE}"
 
 DOCS=		AUTHORS ChangeLog THANKS rdoc
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} '(' -name '.DS_Store' -o -name '*~' ')' -delete
 
diff --git a/math/ruby-narray/Makefile b/math/ruby-narray/Makefile
index fb71503ef000..dc923937debe 100644
--- a/math/ruby-narray/Makefile
+++ b/math/ruby-narray/Makefile
@@ -24,6 +24,8 @@ MAKE_ARGS=	INSTALL_PROG="${INSTALL_PROGRAM}" \
 DOC_EN=		ChangeLog	README.en	SPEC.en
 DOC_JA=		README.ja	SPEC.ja
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}/ja
 .for f in ${DOC_EN}
diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 0e1f739eb0c9..0ad98b2faf7d 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -17,6 +17,8 @@ MAKE_ENV+=	LIBCGETOPT=0
 
 DOCS=		Changelog README
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e 's|CC=gcc|CC=${CC}|' ${WRKSRC}/Makefile
 
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index c11a88a6077b..efd180a1de76 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	SMB
+OPTIONS_DEFINE=	SMB DOCS
 
 .include <bsd.port.options.mk>
 
diff --git a/misc/ruby-progressbar/Makefile b/misc/ruby-progressbar/Makefile
index c0e85efe4ad5..a66b7f58cc4a 100644
--- a/misc/ruby-progressbar/Makefile
+++ b/misc/ruby-progressbar/Makefile
@@ -18,6 +18,8 @@ NO_BUILD=	yes
 RUBY_RD_FILES=	progressbar.en.rd progressbar.ja.rd
 DOCS=	ChangeLog ${RUBY_RD_FILES}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTNAME}.rb ${STAGEDIR}${RUBY_SITELIBDIR}
diff --git a/misc/tcb/Makefile b/misc/tcb/Makefile
index fa589631e0ff..f8f65cf29937 100644
--- a/misc/tcb/Makefile
+++ b/misc/tcb/Makefile
@@ -13,6 +13,8 @@ COMMENT=	File viewer for terminal
 
 USES=		gmake
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/tcb ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/tcb
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index bb9f4fbeeec1..53c1a82e4fe9 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DOCS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s| desktop-links docs | |' \
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index c25b247f7143..d28365dafd44 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -20,6 +20,8 @@ USE_XORG=	xpm
 USES=		gmake shebangfix
 SHEBANG_FILES=	GrabScores.excite
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmScoreBoard ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/GrabScores.excite ${STAGEDIR}${PREFIX}/bin
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index 0493362e8f4c..cf4ff2faf6c6 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -24,6 +24,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomehack gnomeprefix gtkhtml3 intlhack libgsf
 
+OPTIONS_DEFINE=	DOCS
+
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./waf configure \
 		--prefix=${STAGEDIR}${PREFIX} --destdir=${STAGEDIR}${PREFIX} \
diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index b0b79eefe98c..d76b6f84e000 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -11,6 +11,8 @@ COMMENT=	DOS-XTREE(tm) look-a-like file manager
 
 ALL_TARGET=	ytree
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ytree ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/ytree.conf ${STAGEDIR}${PREFIX}/etc/ytree.conf.sample
diff --git a/multimedia/arista/Makefile b/multimedia/arista/Makefile
index 25ff6eb137e1..d15c1fcf27de 100644
--- a/multimedia/arista/Makefile
+++ b/multimedia/arista/Makefile
@@ -16,6 +16,8 @@ USE_GNOME=	pygnomedesktop
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|Icon=.*|Icon=arista.svg|g' \
 		${WRKSRC}/arista.desktop
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index c687d89a35ce..6f5627fc3db0 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -23,7 +23,7 @@ INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L
+OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L DOCS
 OPTIONS_DEFAULT=IMLIB2
 OPTIONS_SUB=	yes
 
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index 3162115cfa93..0295b7c1473b 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -43,7 +43,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
 		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
 		OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
-		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID
+		VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
 
 OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER THEORA \
 			VORBIS VPX X264 XVID
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 1207ebe0e9f6..3e9ca536774e 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libgavl.so:${PORTSDIR}/multimedia/gavl
 
 OPTIONS_DEFINE=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
 		MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \
-		SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS
+		SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS DOCS
 OPTIONS_DEFAULT=	A52 CDIO DCA DVDREAD FAAD FFMPEG FLAC GMERLIN MAD \
 		MJPEGTOOLS MPEG2 MUSEPACK OPENJPEG OPTIMIZED_CFLAGS PNG \
 		SAMBA SCHROEDINGER SPEEX THEORA TIFF VDPAU VORBIS
diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile
index 1bcf9ffb61ec..3ef4b1524177 100644
--- a/multimedia/gmerlin/Makefile
+++ b/multimedia/gmerlin/Makefile
@@ -34,7 +34,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib `pkg-config --libs gtk+-x11-2.0`
 INFO=		gmerlin
 
 OPTIONS_DEFINE= 	ALSA CDDB CDIO ESOUND JACK JPEG LIBVISUAL \
-			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
+			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF DOCS
 OPTIONS_DEFAULT=	CDDB CDIO JACK JPEG LIBVISUAL \
 			OPTIMIZED_CFLAGS PNG PULSEAUDIO QUICKTIME TIFF
 OPTIONS_SUB=		yes
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index 4190f128165c..dfeb44edb69d 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -17,7 +17,7 @@ INSTALL_TARGET=	install-strip
 USES=		gmake libtool pathfix tar:bzip2
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOXYGEN
+OPTIONS_DEFINE=	DOXYGEN DOCS
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 720348d01c2b..5b5f21d7f9ec 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -46,6 +46,8 @@ DOCS=	Changelog.de Changelog.en Changelog.fr \
 		README.dvdwizard.DE README.dvdwizard.EN README.dvdwizard.FR \
 		TODO freebsd.doc
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|playwave[[:space:]]+-r[[:space:]]+|wavplay -s|' \
diff --git a/multimedia/lxdvdrip/pkg-plist b/multimedia/lxdvdrip/pkg-plist
index edcbd525c6aa..27786bbd6108 100644
--- a/multimedia/lxdvdrip/pkg-plist
+++ b/multimedia/lxdvdrip/pkg-plist
@@ -7,9 +7,9 @@ bin/vamps_lxdvdrip
 etc/lxdvdrip.conf.sample
 @exec [ -f %B/lxdvdrip.conf ] || cp %B/%f %B/lxdvdrip.conf
 %%DATADIR%%/lxdvdrip.wav
-%%EXAMPLESDIR%%/lxdvdrip.conf.DE
-%%EXAMPLESDIR%%/lxdvdrip.conf.EN
-%%EXAMPLESDIR%%/lxdvdrip.conf.FR
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lxdvdrip.conf.DE
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lxdvdrip.conf.EN
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lxdvdrip.conf.FR
 man/man1/lxdvdrip.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/Changelog.de
 %%PORTDOCS%%%%DOCSDIR%%/Changelog.en
@@ -24,4 +24,4 @@ man/man1/lxdvdrip.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/freebsd.doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/multimedia/subtitleripper/Makefile b/multimedia/subtitleripper/Makefile
index 26c89e549eae..5b68f0751227 100644
--- a/multimedia/subtitleripper/Makefile
+++ b/multimedia/subtitleripper/Makefile
@@ -41,6 +41,8 @@ PROGRAM_FILES=	\
 SCRIPT_FILES=	\
 		pgm2txt
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CC[[:space:]]*=).*$$|\1${CC}|' \
diff --git a/multimedia/universal-media-server/Makefile b/multimedia/universal-media-server/Makefile
index 42901f2ea85d..3301fe61198f 100644
--- a/multimedia/universal-media-server/Makefile
+++ b/multimedia/universal-media-server/Makefile
@@ -17,7 +17,7 @@ JAVA_VERSION=	1.7+
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	true
 
-OPTIONS_DEFINE=		MEDIAINFO FLAC DCRAW TSMUXER FFMPEG MPLAYER VLC MENCODER
+OPTIONS_DEFINE=		MEDIAINFO FLAC DCRAW TSMUXER FFMPEG MPLAYER VLC MENCODER DOCS
 OPTIONS_DEFAULT=	MEDIAINFO FLAC DCRAW
 
 MEDIAINFO_DESC=		Metadata information about video & audio files
diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index 4028b127e3a5..b4a0266ae7f5 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -76,7 +76,7 @@ DESKTOP_ENTRIES="XBMC" \
 WRKSRC=	${WRKDIR}/${PORTNAME}-${DISTVERSION}-Gotham
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC LAME \
+OPTIONS_DEFINE=	AIRPLAY AIRTUNES AVAHI CEC DOCS LAME \
 		LIBBLURAY HAL LIRC MYSQL NONFREE PULSEAUDIO RTMP SFTP \
 		SMB VAAPI VDPAU VORBIS WEBSERVER XRANDR
 AIRPLAY_DESC=	AirPlay support via libplist
diff --git a/multimedia/y4mscaler/Makefile b/multimedia/y4mscaler/Makefile
index 23b4b8523fd8..e263661be0a7 100644
--- a/multimedia/y4mscaler/Makefile
+++ b/multimedia/y4mscaler/Makefile
@@ -21,6 +21,8 @@ USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 DOCS=		COPYING ChangeLog INSTALL README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/Makefile
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index d6c33f00685d..2c58a4f069bd 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -16,7 +16,7 @@ USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	ICONV P2P TCL OTR REMOTE XMPP
+OPTIONS_DEFINE=	ICONV P2P TCL OTR REMOTE XMPP DOCS
 OPTIONS_DEFAULT=ICONV P2P TCL OTR REMOTE
 P2P_DESC=	Enable Peer2peer connection support
 OTR_DESC=	Enable OTR encryption support
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index f4894d3c4a7c..6c523c0a2326 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		libgnutls.so:${PORTSDIR}/security/gnutls \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
-OPTIONS_DEFINE= IPV6 MYSQL PGSQL
+OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index 28066bae8ad2..f917a368e84e 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 
 CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 
-OPTIONS_DEFINE=	GEOIP MYSQL SASL
+OPTIONS_DEFINE=	GEOIP MYSQL SASL DOCS
 OPTIONS_DEFAULT=MYSQL SASL
 
 USES=		bison ncurses perl5
diff --git a/net-mgmt/gps/Makefile b/net-mgmt/gps/Makefile
index 2cf32cf55c5d..ed262390e664 100644
--- a/net-mgmt/gps/Makefile
+++ b/net-mgmt/gps/Makefile
@@ -20,6 +20,8 @@ USES=		gmake
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet10-config
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-Wall -O3|${CFLAGS}|; \
diff --git a/net-mgmt/icinga2/Makefile b/net-mgmt/icinga2/Makefile
index cee66e553a9a..14163313812b 100644
--- a/net-mgmt/icinga2/Makefile
+++ b/net-mgmt/icinga2/Makefile
@@ -20,6 +20,7 @@ USE_LDCONFIG=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 
+OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
 
diff --git a/net-mgmt/nagiosgraph/Makefile b/net-mgmt/nagiosgraph/Makefile
index ae67d4a43947..ebc7e0f587a2 100644
--- a/net-mgmt/nagiosgraph/Makefile
+++ b/net-mgmt/nagiosgraph/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Generate rrdtool graphs using performance data from nagios plugins
 
 RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
 
+OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		NAGIOS
 OPTIONS_SINGLE_NAGIOS=	NAGIOS35 NAGIOS4
 OPTIONS_DEFAULT=	NAGIOS35
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 41ab741c72c7..6eac1eb9f2f1 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -17,7 +17,7 @@ USE_PERL5=	configure
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${RM} ${WRKSRC}/lib/SNMP_Session.pm.orig
diff --git a/net-mgmt/pancho/Makefile b/net-mgmt/pancho/Makefile
index 2c47d3d3629e..e875f911e051 100644
--- a/net-mgmt/pancho/Makefile
+++ b/net-mgmt/pancho/Makefile
@@ -20,6 +20,8 @@ USE_PERL5=	configure
 
 DOCS=		README README.plugins Plugin.sample
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${MV} ${WRKSRC}/lib/Pancho/Plugins/README ${WRKSRC}/README.plugins
 	@${MV} ${WRKSRC}/lib/Pancho/Plugins/Plugin.sample ${WRKSRC}/
diff --git a/net-mgmt/sx/Makefile b/net-mgmt/sx/Makefile
index 6108b78488f9..dc91ff9dad05 100644
--- a/net-mgmt/sx/Makefile
+++ b/net-mgmt/sx/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" --prefix="${STAGE}${PREFIX}" \
 		--sysconfdir="${ETCDIR}"
 
-OPTIONS_DEFINE=	SXSERVER
+OPTIONS_DEFINE=	SXSERVER DOCS
 SXSERVER_DESC=	Enable sxhttpd server
 OPTIONS_DEFAULT=SXSERVER
 
diff --git a/net-p2p/py-py2play/Makefile b/net-p2p/py-py2play/Makefile
index f6d8e0125b2a..e63f57418d41 100644
--- a/net-p2p/py-py2play/Makefile
+++ b/net-p2p/py-py2play/Makefile
@@ -20,6 +20,8 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Py2Play
 EXAMPLESDIR=	${PREFIX}/share/examples/py-py2play
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/startdemo ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net-p2p/transmission-cli/Makefile b/net-p2p/transmission-cli/Makefile
index f4c2d1b481ee..9cf6a5edb5c6 100644
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@@ -23,7 +23,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
 
-OPTIONS_DEFINE=	LITE
+OPTIONS_DEFINE=	LITE DOCS
 
 .include <bsd.port.options.mk>
 
diff --git a/net/aslookup/Makefile b/net/aslookup/Makefile
index 53a33e5a0e84..88142d5869f9 100644
--- a/net/aslookup/Makefile
+++ b/net/aslookup/Makefile
@@ -11,6 +11,8 @@ DISTNAME=	${PORTNAME}-alpha${PORTVERSION}
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool that searches the sequence of AS numbers
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -E -e "s|CFLAGS.*=|CFLAGS +=|" \
 		-e "s|CC.*=|CC ?=|" ${WRKSRC}/Makefile
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index 3db12a15fd0f..cfaba67e1335 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -24,4 +24,6 @@ USE_AUTOTOOLS=	libtoolize autoheader automake aclocal
 AUTOMAKE_ARGS+=	--add-missing
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 0f5ecfdbd45e..328c245c6eb5 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	haproxy-[1234567890]\*
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		PCRE OPENSSL
+OPTIONS_DEFINE=		PCRE OPENSSL DOCS
 OPTIONS_SINGLE=		PCRE
 OPTIONS_SINGLE_PCRE=	DPCRE SPCRE
 DPCRE_DESC=		Link dynamically
diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index cb4903b5b404..74439bd4e1c4 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -18,7 +18,7 @@ USES=		gmake
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		OPENSSL
+OPTIONS_DEFINE=		OPENSSL DOCS
 OPTIONS_RADIO=		PCRE
 OPTIONS_RADIO_PCRE=	DPCRE SPCRE
 DPCRE_DESC=		Link dynamically
diff --git a/net/ipsvd/Makefile b/net/ipsvd/Makefile
index a7624c397b3d..d37a03805d96 100644
--- a/net/ipsvd/Makefile
+++ b/net/ipsvd/Makefile
@@ -14,6 +14,8 @@ ALL_TARGET=	default
 
 DOCS=		package/CHANGES package/COPYING package/README doc/*.html
 
+OPTIONS_DEFINE=	DOCS
+
 do-configure:
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
 	@${ECHO_CMD} "${CC} ${LDFLAGS}" > ${WRKSRC}/src/conf-ld
@@ -30,6 +32,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/man/*.${n} ${STAGEDIR}${MANPREFIX}/man/man${n}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 65a454a1d419..e8ee0399d5c4 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 CONFLICTS?=	libnids-libnet11-[0-9]*
 
-OPTIONS_DEFINE=	GLIB2
+OPTIONS_DEFINE=	GLIB2 DOCS
 OPTIONS_DEFAULT=GLIB2
 GLIB2_DESC=	Use GLIB2 for multiprocessing support
 OPTIONS_SUB=	yes
diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile
index 21effcf5d61f..4e2def439e39 100644
--- a/net/lualdap/Makefile
+++ b/net/lualdap/Makefile
@@ -24,6 +24,8 @@ MAKE_ARGS+=	LUA_LIBDIR="${LUA_LIBDIR}" \
 
 ALL_TARGET=
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/lualdap.so.${PORTVERSION} ${STAGEDIR}${LUA_MODLIBDIR}/${PORTNAME}.so
diff --git a/net/ntp-devel/Makefile.inc b/net/ntp-devel/Makefile.inc
index 12e15ed728f1..7f81d679efe2 100644
--- a/net/ntp-devel/Makefile.inc
+++ b/net/ntp-devel/Makefile.inc
@@ -52,7 +52,9 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		TRIMTAIP \
   		TRIMTSIP \
   		WHARTON	 \
-  		VARITEXT
+  		VARITEXT \
+  		DOCS \
+  		EXAMPLES
 
 OPTIONS_DEFAULT=	SSL \
 		NTP_SIGND \
diff --git a/net/ntp/Makefile.inc b/net/ntp/Makefile.inc
index fd80df0690ba..6a9ee96b355b 100644
--- a/net/ntp/Makefile.inc
+++ b/net/ntp/Makefile.inc
@@ -50,7 +50,9 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		TRIMTAIP \
   		TRIMTSIP \
   		WHARTON	 \
-  		VARITEXT
+  		VARITEXT \
+  		DOCS \
+  		EXAMPLES
 
 OPTIONS_DEFAULT=	SSL \
 		NTP_SIGND \
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 3ebc52f69e02..6a8ccb0b387d 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -27,7 +27,7 @@ USES=		gmake
 USE_RC_SUBR=	openradius
 SUB_LIST=	LOGFILE="${LOGFILE}"
 
-OPTIONS_DEFINE=	LDAP
+OPTIONS_DEFINE=	LDAP DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
diff --git a/net/ruby-dict/Makefile b/net/ruby-dict/Makefile
index 09193c880fca..a5a011cd1c3d 100644
--- a/net/ruby-dict/Makefile
+++ b/net/ruby-dict/Makefile
@@ -20,6 +20,8 @@ RUBY_SHEBANG_FILES=	${WRKSRC}/rdict
 
 DOCS=		Changelog README doc/dict.html doc/rdict.html
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rdict ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
diff --git a/net/ruby-icmp/Makefile b/net/ruby-icmp/Makefile
index 89f126f1f9ed..77a1ac17edb9 100644
--- a/net/ruby-icmp/Makefile
+++ b/net/ruby-icmp/Makefile
@@ -19,6 +19,8 @@ INSTALL_TARGET=	site-install
 
 EXAMPLES=	sample/*
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index b2a6a87df0b5..66f701438746 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to LDAP API based on RFC1823
 
+OPTIONS_DEFINE=	DOCS
+
 WITH_LDAP_BACKEND?=	openldap2
 
 .if ${WITH_LDAP_BACKEND} == ldapsdk
diff --git a/net/ruby-net-geoip/Makefile b/net/ruby-net-geoip/Makefile
index 457233bde49b..453e97440155 100644
--- a/net/ruby-net-geoip/Makefile
+++ b/net/ruby-net-geoip/Makefile
@@ -21,6 +21,8 @@ INSTALL_TARGET=	site-install
 
 DOCS=	README
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 .for f in ${DOCS}
diff --git a/net/ruby-tserver/Makefile b/net/ruby-tserver/Makefile
index 3584dc03a324..44f04bdbc3fe 100644
--- a/net/ruby-tserver/Makefile
+++ b/net/ruby-tserver/Makefile
@@ -17,6 +17,8 @@ RUBY_SHEBANG_FILES=	${WRKSRC}/sample/*
 
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/tserver.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index a655e577d712..84c9ea624461 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -19,6 +19,8 @@ COMMENT=	Packet sniffer program. For educational use
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${STAGEDIR}${MANPREFIX}/man/man5
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index 4946b129ce87..cfafca3ef1d0 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -13,7 +13,7 @@ COMMENT=	PPP over SSL virtual private networking (client part)
 
 LICENSE=	BSD3CLAUSE
 
-OPTIONS_DEFINE=	GUI
+OPTIONS_DEFINE=	GUI DOCS
 GUI_DESC=	GTK 1.2 graphical interface
 
 CONFIGURE_ARGS=	--disable-server --with-iconv=${ICONV_PREFIX}
diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile
index e63e8706d26e..b1b2ed198a18 100644
--- a/net/ssltunnel-server/Makefile
+++ b/net/ssltunnel-server/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PPP over SSL virtual private networking (server part)
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-OPTIONS_DEFINE=	TCPWRAPPERS
+OPTIONS_DEFINE=	TCPWRAPPERS DOCS
 TCPWRAPPERS_DESC=	libwrap support
 
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index dc5dfc093954..ac501ce3e98f 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -24,6 +24,8 @@ GROUPS=		tacacs
 CONFLICTS=	ru-tac+ia-[0-9]* tac_plus-libradius-[0-9]*
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 # check expiration dates against 'expire' field of master.passwd file
 .if defined(TAC_EXPIRE_MASTER_PASSWD)
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-bb
diff --git a/net/tcpsg/Makefile b/net/tcpsg/Makefile
index 58c7c42bd77f..cc9ec189c79c 100644
--- a/net/tcpsg/Makefile
+++ b/net/tcpsg/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Simple TCP port forwarder
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/tcpsg.c
 
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 13cdd6f51efe..45495c0f96d4 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -40,7 +40,7 @@ USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto
 
 CFLAGS+=	-fPIC
 
-OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER HPJPG
+OPTIONS_DEFINE=		GNUTLS NLS PAM VIEWER HPJPG DOCS
 OPTIONS_DEFAULT=	GNUTLS NLS PAM VIEWER
 VIEWER_DESC=		Build vncviewer
 HPJPG_DESC=		Build with High-Performance JPEG support
diff --git a/news/multisuck/Makefile b/news/multisuck/Makefile
index c628118da726..77ed0b64fd33 100644
--- a/news/multisuck/Makefile
+++ b/news/multisuck/Makefile
@@ -11,6 +11,8 @@ COMMENT=	Multi-server/conn news suck
 
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	EXAMPLES
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/msuck ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/news/multisuck/pkg-plist b/news/multisuck/pkg-plist
index 15893a7ec578..684baab79537 100644
--- a/news/multisuck/pkg-plist
+++ b/news/multisuck/pkg-plist
@@ -1,5 +1,5 @@
 bin/msuck
-%%PORTDOCS%%%%EXAMPLESDIR%%/filters.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/newsrc.sample
-%%PORTDOCS%%%%EXAMPLESDIR%%/suck.cfg.sample
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/filters.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/newsrc.sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/suck.cfg.sample
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index 7295b937c6dc..5b1aeeaa7bb1 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -20,6 +20,8 @@ NO_BUILD=	yes
 USES=		perl5 shebangfix
 SHEBANG_FILES=	newsgrab.pl
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/newsgrab.pl ${STAGEDIR}${PREFIX}/bin/newsgrab
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/newsgrab
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 053035ff9d2f..964ae6e29d97 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -15,6 +15,8 @@ USES=		gmake
 USE_GCC=	any
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${LN} -s nget-${PORTVERSION} ${WRKDIR}/${DISTNAME}
 
diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 275e33dd63de..19e1f3c4f839 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -25,6 +25,8 @@ PLIST_SUB+=	SPOOL_DIR=${SPOOL_DIR}
 DOCS=		ChangeLog docs/FAQ INSTALL docs/INTERNALS README \
 		docs/testing.txt docs/noffle.lsm
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 	's|/etc/noffle.conf|${PREFIX}/etc/noffle.conf|g' \
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index c9e572b6773f..307e31acbd77 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	${PTHREAD_LIBS}
 CFLAGS+=	${PTHREAD_CFLAGS}
 
-OPTIONS_DEFINE=	7Z PAR PYTHON RAR
+OPTIONS_DEFINE=	7Z PAR PYTHON RAR DOCS
 OPTIONS_SINGLE=	TLSLIB
 OPTIONS_SINGLE_TLSLIB=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=	GNUTLS PAR PYTHON RAR
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index c17ed29b4ac5..55a6ff5e2a76 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--enable-ipv6 --disable-inews --with-slrnpull \
 
 ALL_TARGET=	all
 
-OPTIONS_DEFINE=	NLS SSL DEVIEW
+OPTIONS_DEFINE=	NLS SSL DEVIEW DOCS
 OPTIONS_DEFAULT=NLS SSL
 OPTIONS_SUB=	yes
 NLS_USES=		gettext
diff --git a/news/slrnconf/Makefile b/news/slrnconf/Makefile
index f13d2d28f3a7..8b9b0aa991a1 100644
--- a/news/slrnconf/Makefile
+++ b/news/slrnconf/Makefile
@@ -17,6 +17,8 @@ USE_BZIP2=	yes
 USES=		perl5
 MAKE_ARGS+=	PREFIX=${PREFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/help
 	${INSTALL_DATA} ${WRKSRC}/help/* ${STAGEDIR}${DATADIR}/help
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index 486fe99df010..2c1841ed5b39 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -20,6 +20,8 @@ RUN_DEPENDS=	\
 NO_BUILD=	YES
 USES=		perl5
 
+OPTIONS_DEFINE=	DOCS
+
 pre-patch:
 	@${MV} ${WRKSRC}/ubh ${WRKSRC}/ubh.old
 	@${SED} -e '1,1s:/usr/bin/perl:${PERL5}:' \
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index 1b0853d79fc5..f791e0b63efe 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -27,6 +27,8 @@ USES=		gettext
 
 XPN=	${PORTNAME}.py
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${XPN} ${STAGEDIR}${DATADIR}/${XPN}
diff --git a/news/xrn/Makefile b/news/xrn/Makefile
index e5371cfeed00..dbc5770a1f7d 100644
--- a/news/xrn/Makefile
+++ b/news/xrn/Makefile
@@ -17,6 +17,8 @@ USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 DOCS=		COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -E -e "s|^#error.+||g" \
 		-e "s|/usr/lib/sendmail|/usr/sbin/sendmail|g" \
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 4b9239626075..217bcfd820c1 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -13,12 +13,11 @@ COMMENT=	Python module for producing high quality PostScript graphics
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFAULT=	EXAMPLES
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-PYSCRIPT_MANUAL=	doc/manual/pyscript.pdf
+PYSCRIPT_MANUAL=doc/manual/pyscript.pdf
 
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
 USE_TEX=	latex dvipsk
 
diff --git a/print/py-trml2pdf/Makefile b/print/py-trml2pdf/Makefile
index 59e663ec980f..48bf47928628 100644
--- a/print/py-trml2pdf/Makefile
+++ b/print/py-trml2pdf/Makefile
@@ -22,6 +22,8 @@ USE_PYTHON=	yes
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf
 	@${INSTALL_SCRIPT} ${WRKSRC}/trml2pdf/* ${STAGEDIR}${PYTHON_SITELIBDIR}/trml2pdf
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 465e3eb16281..d8d2536ea367 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -36,6 +36,8 @@ USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DWANT_HUNSPELL=YES -Wno-ferror-limit
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${LN} -sf ${DATADIR}/icons/scribus.png ${STAGEDIR}${PREFIX}/share/pixmaps/