Add DOCS option where PORTDOCS is in plist.

63 files changed, 131 insertions, 40 deletions

diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index bcd48a1bc20a..325af6f8e4e2 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -17,6 +17,8 @@ INSTALL_TARGET=	install-strip
 
 DOCS=		doc/bddnotes.ps doc/buddy.ps doc/tech.txt README AUTHORS
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/science/libctl/Makefile b/science/libctl/Makefile
index eea01b8aceb4..7f372cd6c636 100644
--- a/science/libctl/Makefile
+++ b/science/libctl/Makefile
@@ -19,6 +19,8 @@ USE_LDCONFIG=	yes
 
 BROKEN_sparc64=	does not build
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -R ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR}
diff --git a/science/metaf2xml/Makefile b/science/metaf2xml/Makefile
index e83d0bebd35a..ae44cc8df8b0 100644
--- a/science/metaf2xml/Makefile
+++ b/science/metaf2xml/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Parse and Decode METAR, TAF, SYNOP and BUOY and Store as XML
 
-OPTIONS_DEFINE=	APACHE
+OPTIONS_DEFINE=	APACHE DOCS
 OPTIONS_SUB=	yes
 APACHE_DESC=	Install Apache config file for metaf2xml (depends on Apache)
 
diff --git a/science/ruby-netcdf/Makefile b/science/ruby-netcdf/Makefile
index 541d7f153f06..dcf5a6d8ec9d 100644
--- a/science/ruby-netcdf/Makefile
+++ b/science/ruby-netcdf/Makefile
@@ -26,6 +26,8 @@ MAKE_ARGS=	INSTALL_PROG="${INSTALL_PROGRAM}" \
 
 DOCS=		ChangeLog ToDo doc/*
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/demo/* ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/
diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
index 2003557879f7..893111737726 100644
--- a/security/barnyard2/Makefile
+++ b/security/barnyard2/Makefile
@@ -14,7 +14,7 @@ GH_ACCOUNT=	firnsy
 GH_TAGNAME=	v2-${PORTVERSION}
 GH_COMMIT=	272eaf7
 
-OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPV6 MPLS MYSQL MYSQL_SSL ODBC PRELUDE PGSQL PORT_PCAP
+OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPV6 MPLS MYSQL MYSQL_SSL ODBC PRELUDE PGSQL PORT_PCAP DOCS
 NO_OPTIONS_SORT=yes
 
 64BIT_DESC=	Enable 64bit compilation (experimental)
diff --git a/security/bdc/Makefile b/security/bdc/Makefile
index 4f270664793e..64b3825ef9ff 100644
--- a/security/bdc/Makefile
+++ b/security/bdc/Makefile
@@ -25,6 +25,8 @@ BDREL=		5
 
 SUB_LIST=	bdc pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
diff --git a/security/broccoli/Makefile b/security/broccoli/Makefile
index b7be19ce3a4a..35f10f29643b 100644
--- a/security/broccoli/Makefile
+++ b/security/broccoli/Makefile
@@ -36,7 +36,7 @@ PLIST_SUB+=	CLEANUP_PREFIX="@comment "
 CMAKE_ARGS+=	-D CMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
 		-D BRO_ETC_INSTALL_DIR:PATH=${PREFIX}/etc
 
-OPTIONS_DEFINE=	DEBUG PYTHON RUBY
+OPTIONS_DEFINE=	DEBUG PYTHON RUBY DOCS
 OPTIONS_SUB=
 
 DEBUG_DESC=	Compile in debugging mode
diff --git a/security/fcheck/Makefile b/security/fcheck/Makefile
index fbf43f961751..ec78d3198f0f 100644
--- a/security/fcheck/Makefile
+++ b/security/fcheck/Makefile
@@ -23,6 +23,8 @@ USES=		perl5 shebangfix dos2unix
 SHEBANG_FILES=	${WRKSRC}/${PORTNAME}
 DOS2UNIX_FILES=	${WRKSRC}/${PORTNAME}.cfg
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/security/linux-f10-libgpg-error/Makefile b/security/linux-f10-libgpg-error/Makefile
index edc20d9da677..fa91b3a1959e 100644
--- a/security/linux-f10-libgpg-error/Makefile
+++ b/security/linux-f10-libgpg-error/Makefile
@@ -19,4 +19,6 @@ BRANDELF_FILES=	usr/bin/gpg-error
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 DESCR=		${.CURDIR}/../libgpg-error/pkg-descr
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/security/monkeysphere/Makefile b/security/monkeysphere/Makefile
index f7437fc98a79..aceeb71c041e 100644
--- a/security/monkeysphere/Makefile
+++ b/security/monkeysphere/Makefile
@@ -25,6 +25,8 @@ GROUPS=	monkeysphere
 
 MAKE_ARGS+=	ETCPREFIX=${PREFIX} MANPREFIX=${PREFIX}/man ETCSUFFIX=.sample
 
+OPTIONS_DEFINE=	DOCS
+
 # use proper system paths for FreeBSD instead of debian's:
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/monkeysphere|${LOCALBASE}/etc/monkeysphere|g' \
diff --git a/security/py-twofish/Makefile b/security/py-twofish/Makefile
index c937af3cf983..934576c05274 100644
--- a/security/py-twofish/Makefile
+++ b/security/py-twofish/Makefile
@@ -16,6 +16,8 @@ USE_PYTHON=	2
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/_twofish.so ${STAGEDIR}${PYTHON_SITELIBDIR}
diff --git a/security/ruby-camellia/Makefile b/security/ruby-camellia/Makefile
index e7f5cf99a682..dd54dbefc204 100644
--- a/security/ruby-camellia/Makefile
+++ b/security/ruby-camellia/Makefile
@@ -20,6 +20,8 @@ INSTALL_TARGET=	site-install
 DOCS=		README.txt History.txt License.txt
 EXAMPLES=	ext/camellia-example.rb
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
diff --git a/security/sguil-client/Makefile b/security/sguil-client/Makefile
index 83245c7cca96..8a81db99fce6 100644
--- a/security/sguil-client/Makefile
+++ b/security/sguil-client/Makefile
@@ -23,7 +23,7 @@ LICENSE_PERMS=	auto-accept
 LICENSE_FILE=	${WRKSRC}/client/lib/tablelist4.1/COPYRIGHT.txt
 LICENSE_PERMS=	auto-accept
 
-OPTIONS_DEFINE=	AUDIO SANCP WIRESHARK
+OPTIONS_DEFINE=	AUDIO SANCP WIRESHARK DOCS
 AUDIO_DESC=	Install Festival Speech Synthesis
 SANCP_DESC=	Use sancp
 WIRESHARK_DESC=	Install wireshark
diff --git a/security/sguil-sensor/Makefile b/security/sguil-sensor/Makefile
index 7bebc3d97b96..2e32965fb43f 100644
--- a/security/sguil-sensor/Makefile
+++ b/security/sguil-sensor/Makefile
@@ -13,7 +13,7 @@ RUN_DEPENDS=	tcltls>=0:${PORTSDIR}/devel/tcltls \
 		barnyard2:${PORTSDIR}/security/barnyard2-sguil \
 		${LOCALBASE}/lib/tclx8.4/tclx.tcl:${PORTSDIR}/lang/tclX
 
-OPTIONS_DEFINE=	PADS SANCP
+OPTIONS_DEFINE=	PADS SANCP DOCS
 PADS_DESC=	Include pads sensor
 SANCP_DESC=	Include sancp sensor
 
diff --git a/security/sks/Makefile b/security/sks/Makefile
index 0aac403e1862..74eb05bf55ac 100644
--- a/security/sks/Makefile
+++ b/security/sks/Makefile
@@ -25,6 +25,8 @@ MAKE_ENV=	BDBINCLUDE="-I${BDB_INCLUDE_DIR}" \
 
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@: > ${WRKSRC}/Makefile.local
 	@${REINPLACE_CMD} 's/-ccopt -pg //' ${WRKSRC}/Makefile
diff --git a/security/slush/Makefile b/security/slush/Makefile
index 029cfa70630c..cc2532b330e7 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -14,6 +14,8 @@ COMMENT=	A telnet-like application which uses a secure SSL channel
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/control.txt ${STAGEDIR}${DOCSDIR}
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 7d22720aebde..89ce471e6ead 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -63,6 +63,8 @@ SHEBANG_FILES=	src/tools/sss_obfuscate
 USE_RC_SUBR=	${PORTNAME}
 PORTDATA=	*
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index a04e680e891b..8dc3e63240cd 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -23,6 +23,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -fpermissive
 LIBS+=		-L${LOCALBASE}/lib -lintl -lmcrypt
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e 's,SHELL) libtool,SHELL) ${LIBTOOL} --tag=CXX,' \
 		${WRKSRC}/src/Makefile.in
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 213f3732cdbb..28eb5876c02f 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -26,6 +26,8 @@ DOC_FILES=	INSTALL
 LIB_FILES=	CA.pm CERT.pm GUI.pm HELPERS.pm KEY.pm OpenSSL.pm REQ.pm TCONFIG.pm
 LIB2_FILES=	CALLBACK.pm HELPERS.pm TCONFIG.pm WORDS.pm X509_browser.pm X509_infobox.pm
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${SITE_PERL}/${PORTNAME}/GUI
 	${INSTALL_DATA} ${LIB_FILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${SITE_PERL}/${PORTNAME}
diff --git a/security/tlswrap/Makefile b/security/tlswrap/Makefile
index a6a1afba7d4a..2fdcccf0a061 100644
--- a/security/tlswrap/Makefile
+++ b/security/tlswrap/Makefile
@@ -14,6 +14,8 @@ COMMENT=	FTP proxy that wraps data and control with TLS/SSL
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -E 's,^(CC|CFLAGS|LDFLAGS).*=,\1?=,g' \
 		${WRKSRC}/Makefile.in
diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index a787487872ee..1fc8a3ca1516 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -11,7 +11,7 @@ COMMENT=	A web-based firewall log analyzer
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=		MYSQL MYSQLIPV6 PGSQL
+OPTIONS_DEFINE=		MYSQL MYSQLIPV6 PGSQL DOCS
 OPTIONS_DEFAULTS=	MYSQL MYSQLIPV6
 
 MYSQLIPV6_DESC=		Shared library plugin for Mysql IPv6 support
diff --git a/shells/bash-completion/Makefile b/shells/bash-completion/Makefile
index 079596b01411..8c866c8d7fb4 100644
--- a/shells/bash-completion/Makefile
+++ b/shells/bash-completion/Makefile
@@ -20,6 +20,8 @@ USES=		gmake tar:bzip2
 SUB_FILES=	pkg-message
 SUB_LIST+=	RUNFILE=${DATADIR}/bash_completion.sh
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|FLAC|&\|flv\|FLV|;' ${WRKSRC}/bash_completion
 
diff --git a/sysutils/bashburn/Makefile b/sysutils/bashburn/Makefile
index 973d49b7685f..d5538f21d389 100644
--- a/sysutils/bashburn/Makefile
+++ b/sysutils/bashburn/Makefile
@@ -24,7 +24,7 @@ NO_BUILD=	yes
 USES=		shebangfix
 SHEBANG_FILES=	BashBurn.sh
 
-OPTIONS_DEFINE=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
+OPTIONS_DEFINE=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS DOCS
 OPTIONS_DEFAULT=	CDRDAO DVDTOOLS EJECT FLAC LAME MPG123 NORMALIZE SUDO VORBIS
 CDRDAO_DESC=	Disk-At-Once Recording
 DVDTOOLS_DESC=	Frontend to master DVD media
diff --git a/sysutils/byobu/Makefile b/sysutils/byobu/Makefile
index b49cb380bd91..b89c343c3bc1 100644
--- a/sysutils/byobu/Makefile
+++ b/sysutils/byobu/Makefile
@@ -18,6 +18,8 @@ USE_AUTOTOOLS=	aclocal automake
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${FIND} ${WRKSRC} -type f | ${XARGS} \
 		${REINPLACE_CMD} \
diff --git a/sysutils/cfengine22/Makefile b/sysutils/cfengine22/Makefile
index b6a4562ac2af..9e80292173db 100644
--- a/sysutils/cfengine22/Makefile
+++ b/sysutils/cfengine22/Makefile
@@ -34,6 +34,8 @@ CONFIGURE_ENV+=	BERKELEY_DB_CFLAGS=-I${BDB_INCLUDE_DIR} \
 
 INFO=		cfengine-Tutorial cfengine-Reference
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 		@${REINPLACE_CMD} -e '/^docdir/s!=.*!= @docdir@!'\
 				  ${WRKSRC}/doc/Makefile.in \
diff --git a/sysutils/gather/Makefile b/sysutils/gather/Makefile
index 1dae62cf6c82..a3e54aaab83a 100644
--- a/sysutils/gather/Makefile
+++ b/sysutils/gather/Makefile
@@ -22,6 +22,8 @@ MAKE_ENV+=	CONFDIR=${PREFIX}/etc/gather DATADIR=${DATADIR}
 
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gather ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gather.1 ${STAGEDIR}${PREFIX}/man/man1
diff --git a/sysutils/gather/pkg-plist b/sysutils/gather/pkg-plist
index be663e9e50ee..00fca1cfe353 100644
--- a/sysutils/gather/pkg-plist
+++ b/sysutils/gather/pkg-plist
@@ -6,10 +6,6 @@ man/man1/gather.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gather.map.linux
 %%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrmtry %%DOCSDIR%%
-@unexec if cmp -s %D/etc/gather/gather.cfg.sample %D/etc/gather/gather.cfg; then rm -f %D/etc/gather/gather.cfg; else echo "If permanently deleting this package, %D/etc/gather/gather.cfg must be removed manually."; fi
-etc/gather/gather.cfg.sample
-@exec if [ ! -f %D/etc/gather/gather.cfg ]; then cp -p %D/%F %B/gather.cfg; fi
-@unexec if cmp -s %D/etc/gather/gather.map.sample %D/etc/gather/gather.map; then rm -f %D/etc/gather/gather.map; else echo "If permanently deleting this package, %D/etc/gather/gather.map must be removed manually."; fi
-etc/gather/gather.map.sample
-@exec if [ ! -f %D/etc/gather/gather.map ]; then cp -p %D/%F %B/gather.map; fi
+@sample etc/gather/gather.cfg.sample
+@sample etc/gather/gather.map.sample
 @dirrmtry etc/gather
diff --git a/sysutils/healthd/Makefile b/sysutils/healthd/Makefile
index 50cb9ff16df2..f8bf1aea4304 100644
--- a/sysutils/healthd/Makefile
+++ b/sysutils/healthd/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Daemon to monitor vital motherboard parameters
 
 LICENSE=	BSD2CLAUSE
 
-OPTIONS_DEFINE=	IPV6 FULL_CONFIG
+OPTIONS_DEFINE=	IPV6 FULL_CONFIG DOCS
 
 FULL_CONFIG_DESC= 		Remotely reading the full config
 IPV6_CONFIGURE_ENABLE=		ipv6
diff --git a/sysutils/httplog/Makefile b/sysutils/httplog/Makefile
index fa6a3a1f6bc1..e2c52e9c8a34 100644
--- a/sysutils/httplog/Makefile
+++ b/sysutils/httplog/Makefile
@@ -14,6 +14,8 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 PORTDOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	(cd ${WRKSRC} && \
 	${REINPLACE_CMD} -e "s@<wait.h>@<sys/wait.h>@" httplog.c && \
diff --git a/sysutils/jail-primer/Makefile b/sysutils/jail-primer/Makefile
index a408c27b436d..b2fddb7019fc 100644
--- a/sysutils/jail-primer/Makefile
+++ b/sysutils/jail-primer/Makefile
@@ -14,6 +14,8 @@ LICENSE=	BSD2CLAUSE
 USES=		tar:bzip2
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jail.pristine.fetch		\
 		${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/jtopen/Makefile b/sysutils/jtopen/Makefile
index 84bba5223844..969d704078cb 100644
--- a/sysutils/jtopen/Makefile
+++ b/sysutils/jtopen/Makefile
@@ -25,6 +25,8 @@ JAR_FILES=	composer.jar jt400.jar jt400Proxy.jar jt400Servlet.jar jui400.jar \
 		outputwriters.jar reportwriter.jar tes.jar uitools.jar util400.jar
 DOC_FILES=	changes.html license.html readme.html
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 .for i in ${JAR_FILES}
 	${INSTALL_DATA} ${WRKSRC}/lib/${i} ${STAGEDIR}${JAVAJARDIR}
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 037db7bd2011..8ec82510ca9a 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -21,6 +21,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 DOCS=		README TODO AUTHORS
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' \
 		${WRKSRC}/lineak/Makefile.in ${WRKSRC}/lineakd/Makefile.in
diff --git a/sysutils/loganalyzer/Makefile b/sysutils/loganalyzer/Makefile
index 93126a921fcc..fc87913a57f4 100644
--- a/sysutils/loganalyzer/Makefile
+++ b/sysutils/loganalyzer/Makefile
@@ -14,7 +14,7 @@ ANALYZERDIR?=	www/loganalyzer
 PLIST_SUB+=	ANALYZERDIR=${ANALYZERDIR}
 
 OPTIONS_DEFINE=	PHP_MYSQL PDO_DBLIB PDO_FIREBIRD PDO_MYSQL PDO_ODBC PDO_PGSQL \
-	PDO_SQLITE
+	PDO_SQLITE DOCS
 PHP_MYSQL_DESC=		MySQL database support (PHP extension)
 PDO_DBLIB_DESC=		Microsoft SQL Server and Sybase PDO driver
 PDO_FIREBIRD_DESC=	Firebird/Interbase PDO driver
diff --git a/sysutils/memfetch/Makefile b/sysutils/memfetch/Makefile
index 93bb28b1f1a2..c5202443daf3 100644
--- a/sysutils/memfetch/Makefile
+++ b/sysutils/memfetch/Makefile
@@ -20,6 +20,8 @@ SHEBANG_FILES=	mffind.pl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/mffind.pl ${STAGEDIR}${PREFIX}/bin
diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile
index 49f97548a600..8cd7663ba12c 100644
--- a/sysutils/p5-MogileFS-Server/Makefile
+++ b/sysutils/p5-MogileFS-Server/Makefile
@@ -29,6 +29,8 @@ USE_PERL5=	configure
 REINPLACE_ARGS=	-i ''
 USE_RC_SUBR=	mogilefsd mogstored
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/patchelf/Makefile b/sysutils/patchelf/Makefile
index 5890448cd2f5..b1e9c590f4f9 100644
--- a/sysutils/patchelf/Makefile
+++ b/sysutils/patchelf/Makefile
@@ -12,4 +12,6 @@ COMMENT=	Utility to modify the dynamic linker
 USES=		gmake
 GNU_CONFIGURE=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/safe-rm/Makefile b/sysutils/safe-rm/Makefile
index 6e6a1e5d53b1..e41efa2093b0 100644
--- a/sysutils/safe-rm/Makefile
+++ b/sysutils/safe-rm/Makefile
@@ -17,6 +17,8 @@ NO_BUILD=	yes
 
 DOCS=		COPYING Changes README
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 do-install:
diff --git a/sysutils/spinner/Makefile b/sysutils/spinner/Makefile
index 60e046785e1b..84ae6a17f8cc 100644
--- a/sysutils/spinner/Makefile
+++ b/sysutils/spinner/Makefile
@@ -13,6 +13,8 @@ GNU_CONFIGURE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/spinner ${STAGEDIR}${PREFIX}/sbin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile
index 53ca176a3e92..bc57e271276d 100644
--- a/sysutils/tentakel/Makefile
+++ b/sysutils/tentakel/Makefile
@@ -14,7 +14,9 @@ COMMENT=	A program for executing commands on many hosts in parallel
 WRKSRC=		${WRKDIR}/${DISTNAME}/py
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=yes
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc/tentakel|${DOCSDIR_REL}|' \
diff --git a/sysutils/videogen/Makefile b/sysutils/videogen/Makefile
index 27a995997cd2..ed0e6d783624 100644
--- a/sysutils/videogen/Makefile
+++ b/sysutils/videogen/Makefile
@@ -15,6 +15,8 @@ DOCS=		BUGS CHANGES README THANKS
 
 MAKE_JOBS_UNSAFE=yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${LN} -sf ${PORTNAME}.1x ${WRKSRC}/${PORTNAME}.1
 
diff --git a/sysutils/wtail/Makefile b/sysutils/wtail/Makefile
index b17d2d181f3b..ac88d8c9718e 100644
--- a/sysutils/wtail/Makefile
+++ b/sysutils/wtail/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES=	http://www.teaser.fr/~amajorel/wtail/
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Wtail does the equivalent of tail -f on several files at once
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wtail ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 8e7954f40b56..77c8c558b520 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -28,6 +28,8 @@ ALL_TARGET=
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e '/utmp/d' \
 		${WRKSRC}/quota/report.c ${WRKSRC}/quota/util.c
diff --git a/textproc/cwtext/Makefile b/textproc/cwtext/Makefile
index c1172c0cd225..82f77c3680fc 100644
--- a/textproc/cwtext/Makefile
+++ b/textproc/cwtext/Makefile
@@ -16,6 +16,8 @@ ALL_TARGET=	ALL
 
 LICENSE=	GPLv2
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%STAGEDIR%%,${STAGEDIR},g" \
 		${WRKSRC}/makefile
diff --git a/textproc/htmlsection/Makefile b/textproc/htmlsection/Makefile
index dfa159d6e511..587ce41f7df3 100644
--- a/textproc/htmlsection/Makefile
+++ b/textproc/htmlsection/Makefile
@@ -15,6 +15,8 @@ USE_PERL5=	build
 JADOCSDIR=	share/doc/ja/${PORTNAME}
 PLIST_SUB=	JADOCSDIR=${JADOCSDIR}
 
+OPTIONS_DEFINE=	DOCS
+
 pre-build:
 		@(echo perl is set ${PERL} in pre-build:)
 		@(cd ${WRKSRC}; ./findperl.sh ${PERL} > whereperl)
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index 692a74b64a69..b62ac46aa4b6 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -31,4 +31,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 PROJECTHOST=	ibus
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/textproc/multimarkdown/Makefile b/textproc/multimarkdown/Makefile
index 7de09a480c08..5eb823039ccc 100644
--- a/textproc/multimarkdown/Makefile
+++ b/textproc/multimarkdown/Makefile
@@ -26,7 +26,7 @@ WRKSRC=	${WRKDIR}/fletcher-MultiMarkdown-4-${MM4_COMMIT}
 
 ALL_TARGET=	${PORTNAME}
 
-OPTIONS_DEFINE=	CHEAT_SHEET EXTRAS HELPERS
+OPTIONS_DEFINE=	CHEAT_SHEET EXTRAS HELPERS DOCS
 CHEAT_SHEET_DESC=	HTML-based cheat sheat
 EXTRAS_DESC=	Extra scripts and XSLT support
 HELPERS_DESC=	Helper scripts (conflicts with emulators/mtools)
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index f408bc145345..57cc5133cacc 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -16,6 +16,8 @@ USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
 DSV_BASEDIR=	${PYTHONPREFIX_SITELIBDIR}/DSV
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${PRINTF} '#!/bin/sh\n${PYTHON_CMD} ${DSV_BASEDIR}/DSV.py "$$@"\n' \
 	  >${WRKDIR}/DSV.sh
diff --git a/textproc/py-genshi-devel/Makefile b/textproc/py-genshi-devel/Makefile
index a87e2089da1e..63c52e2503d6 100644
--- a/textproc/py-genshi-devel/Makefile
+++ b/textproc/py-genshi-devel/Makefile
@@ -22,6 +22,8 @@ CONFLICTS=	py-genshi-[0-9]*
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/resume/Makefile b/textproc/resume/Makefile
index 4b537630d04f..971ce2638ae5 100644
--- a/textproc/resume/Makefile
+++ b/textproc/resume/Makefile
@@ -18,6 +18,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	${REINPLACE_CMD} -e 's|\.\./\.\./css|css|' ${WRKSRC}/xsl/params.xsl
 	${FIND} ${WRKSRC} -name '*.bak' -delete
diff --git a/textproc/resume/pkg-plist b/textproc/resume/pkg-plist
index 007f8f32c924..b649bcf1b172 100644
--- a/textproc/resume/pkg-plist
+++ b/textproc/resume/pkg-plist
@@ -69,20 +69,20 @@ share/xsl/resume/params.xsl
 @dirrm share/xsl/resume
 @dirrmtry share/xsl
 %%JAVAJARDIR%%/xmlresume-filter.jar
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/brazil.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/canada.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/ireland.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/italy.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/norway.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/nz.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/uk.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/untagged.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/addressing/usa.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/build.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/example1.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/example2.xml
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/addressing
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/brazil.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/canada.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/ireland.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/italy.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/norway.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/nz.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/uk.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/untagged.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/addressing/usa.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.xml
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/addressing
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/textproc/ruby-escape/Makefile b/textproc/ruby-escape/Makefile
index cc440581d358..877cd258cb12 100644
--- a/textproc/ruby-escape/Makefile
+++ b/textproc/ruby-escape/Makefile
@@ -17,6 +17,8 @@ NO_BUILD=	yes
 
 DOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	@${INSTALL_DATA} ${INSTALL_WRKSRC}/escape.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
diff --git a/textproc/ruby-format/Makefile b/textproc/ruby-format/Makefile
index 41672c71a232..6a1d562b204b 100644
--- a/textproc/ruby-format/Makefile
+++ b/textproc/ruby-format/Makefile
@@ -16,6 +16,8 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${RUBY} -i.orig -pe 'gsub(/"(format_test\.pl)/, "\"./\\1")' ${WRKSRC}/test_format.rb
 
diff --git a/textproc/ruby-liquid/Makefile b/textproc/ruby-liquid/Makefile
index 8fca32cbeea5..0336247852e5 100644
--- a/textproc/ruby-liquid/Makefile
+++ b/textproc/ruby-liquid/Makefile
@@ -18,6 +18,8 @@ NO_BUILD=	yes
 SADIR=		${RUBY_SITELIBDIR}
 DOCS=		CHANGELOG README.txt History.txt
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${SADIR}/liquid/tags ${STAGEDIR}${SADIR}/liquid/extras
 	${INSTALL_DATA} ${WRKSRC}/lib/liquid.rb ${STAGEDIR}${SADIR}/
diff --git a/textproc/ruby-rdtool/Makefile b/textproc/ruby-rdtool/Makefile
index dae70b849e3a..61bd07589f66 100644
--- a/textproc/ruby-rdtool/Makefile
+++ b/textproc/ruby-rdtool/Makefile
@@ -26,6 +26,8 @@ RUBY_MODNAME=	rd
 DOCS_EN=	README.rd	doc/rd-draft.rd
 DOCS_JA=	README.rd.ja	doc/rd-draft.rd.ja
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/rd
 	${INSTALL_DATA} ${WRKSRC}/lib/rd/dot.rd2rc ${STAGEDIR}${RUBY_SITELIBDIR}/rd/
diff --git a/textproc/ruby-sary/Makefile b/textproc/ruby-sary/Makefile
index 22e6a52f7e94..cb42c2760ef0 100644
--- a/textproc/ruby-sary/Makefile
+++ b/textproc/ruby-sary/Makefile
@@ -29,6 +29,8 @@ DOCS_EN=	ChangeLog \
 DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
 		${RUBY_RD_HTML_FILES:M*.ja.html}
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rsary.rb ${STAGEDIR}${PREFIX}/bin/
 	${MKDIR}  ${STAGEDIR}${RUBY_MODDOCDIR}/ja
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index 14b051b9d698..11f4ed7fe070 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -27,6 +27,8 @@ INSTALL_TARGET=	site-install
 MAKE_ARGS=	INSTALL_PROG="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} -name CVS -type d -exec ${RM} -r {} ';' -prune
 
diff --git a/textproc/ruby-xmlscan/Makefile b/textproc/ruby-xmlscan/Makefile
index 10dc03b3072f..1b246363675b 100644
--- a/textproc/ruby-xmlscan/Makefile
+++ b/textproc/ruby-xmlscan/Makefile
@@ -23,6 +23,8 @@ DOCS_EN=	ChangeLog \
 		doc/en/*
 DOCS_JA=	doc/ja/*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${CP} -R ${WRKSRC}/lib/xmlscan ${STAGEDIR}${RUBY_SITELIBDIR}/
diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile
index 30f913a25e39..aa6bab7f4389 100644
--- a/textproc/sary/Makefile
+++ b/textproc/sary/Makefile
@@ -15,6 +15,8 @@ USES=		libtool pathfix pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.in
 
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index bed43dcc0ce2..c03beb9215a3 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -24,7 +24,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 OPTIONS_DEFINE=	ICONV ID64 LIBSTEMMER MYSQL OPTIMIZED_CFLAGS PGSQL \
-		SYSLOG UNIXODBC
+		SYSLOG UNIXODBC DOCS
 OPTIONS_DEFAULT=ICONV MYSQL SYSLOG
 
 ICONV_CONFIGURE_WITH=	iconv
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index c23fd24ad143..43fa838ef442 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -20,6 +20,8 @@ PLIST_SUB+=	TCL_VERSION=${TCL_VER}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV+=	TCL_VERSION=${TCL_VER}
 
+OPTIONS_DEFINE=	DOCS
+
 # Remove the old version of expat bundled with the package:
 post-extract:
 	${RM} -rf ${WRKSRC}/expat
diff --git a/textproc/teckit/Makefile b/textproc/teckit/Makefile
index af526419b533..cc1a37a593d0 100644
--- a/textproc/teckit/Makefile
+++ b/textproc/teckit/Makefile
@@ -23,6 +23,8 @@ INSTALL_TARGET=	install-strip
 
 DOCS=		AUTHORS README NEWS docs/*.pdf license/LICENSING.txt
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${CHMOD} ${BINMODE} ${WRKSRC}/configure ${WRKSRC}/install-sh
 
diff --git a/textproc/tinyxml/Makefile b/textproc/tinyxml/Makefile
index 795a5e72e980..c28da33d1cc4 100644
--- a/textproc/tinyxml/Makefile
+++ b/textproc/tinyxml/Makefile
@@ -18,11 +18,8 @@ USE_LDCONFIG=	YES
 SHLIB_MAJOR=	3
 PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 
-.if defined(NOPROFILE) || defined(NO_PROFILE)
-PLIST_SUB+=	PROFILE="@comment "
-.else
-PLIST_SUB+=	PROFILE=""
-.endif
+OPTIONS_DEFINE=	DOCS PROFILE
+OPTIONS_SUB=	yes
 
 post-patch:
 	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.prev
diff --git a/textproc/webcpp/Makefile b/textproc/webcpp/Makefile
index 25555436f896..c73c93d75a74 100644
--- a/textproc/webcpp/Makefile
+++ b/textproc/webcpp/Makefile
@@ -14,6 +14,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	DOCS
+
 .if defined(WANT_FINAL)
 CONFIGURE_ARGS+=	--enable-final
 USES=		gmake