56 files changed, 108 insertions, 14 deletions

diff --git a/sysutils/atop/Makefile b/sysutils/atop/Makefile
index adec2a1fb552..aa991aa0f008 100644
--- a/sysutils/atop/Makefile
+++ b/sysutils/atop/Makefile
@@ -31,6 +31,8 @@ PORTDOCS=	AUTHOR \
 		README \
 		README.FreeBSD
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/atop ${STAGEDIR}${PREFIX}/bin
 		${LN} -sf atop ${STAGEDIR}${PREFIX}/bin/atopsar
diff --git a/sysutils/backupchecker/Makefile b/sysutils/backupchecker/Makefile
index 4ce96b94f5f8..77ace41585df 100644
--- a/sysutils/backupchecker/Makefile
+++ b/sysutils/backupchecker/Makefile
@@ -19,6 +19,8 @@ USE_PYTHON=	autoplist distutils
 
 PORTDOCS=	README.md
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} "s|'share','man'|'${MANPREFIX}/man'|" ${WRKSRC}/setup.py
 
diff --git a/sysutils/bacula-docs/Makefile b/sysutils/bacula-docs/Makefile
index 5ae310ee58cd..92c1e36c9831 100644
--- a/sysutils/bacula-docs/Makefile
+++ b/sysutils/bacula-docs/Makefile
@@ -14,6 +14,8 @@ NO_BUILD=	yes
 
 PORTDOCS=	*.pdf
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${FIND} ${WRKSRC}/manuals/en \
diff --git a/sysutils/bacula9-docs/Makefile b/sysutils/bacula9-docs/Makefile
index 813afddfe8e1..f2f9518235d3 100644
--- a/sysutils/bacula9-docs/Makefile
+++ b/sysutils/bacula9-docs/Makefile
@@ -18,6 +18,8 @@ NO_BUILD=	yes
 
 PORTDOCS=	*.pdf
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${FIND} ${WRKSRC}/manuals/en \
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index 7e3db182a83f..84d43d147f9a 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -15,4 +15,6 @@ USE_QT=		core dbus gui network testlib widgets xml \
 		buildtools_build qmake_build
 USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/bareos-docs/Makefile b/sysutils/bareos-docs/Makefile
index 5a8c31bd292d..5b0977c8f7e3 100644
--- a/sysutils/bareos-docs/Makefile
+++ b/sysutils/bareos-docs/Makefile
@@ -14,6 +14,8 @@ NO_BUILD=	yes
 
 PORTDOCS=	*.pdf
 
+OPTIONS_DEFINE=	DOCS
+
 do-extract:
 	${MKDIR} ${WRKSRC}
 	${CP} ${DISTDIR}/${PORTNAME}-manual-main-reference.pdf ${WRKSRC}
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 63da9c907917..ab1d3f931fab 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -22,7 +22,7 @@ USES=		desktop-file-utils python:2.7 tar:bz2
 USE_PYTHON=	distutils
 USE_GNOME=	gtk30 intltool pygobject3
 
-OPTIONS_DEFINE=	ZEITGEIST
+OPTIONS_DEFINE=	DOCS ZEITGEIST
 OPTIONS_DEFAULT=ZEITGEIST
 
 ZEITGEIST_DESC=	Provide recent search suggestions
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index cde5ca310838..be8380373019 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -23,4 +23,6 @@ CONFIGURE_ENV+=	PATH=${PATH}:${LOCALBASE}/sbin
 
 PORTDOCS=	README TODO COMPLIANCE
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile
index 49796ec8040c..6889e37c26d6 100644
--- a/sysutils/clonehdd/Makefile
+++ b/sysutils/clonehdd/Makefile
@@ -18,6 +18,8 @@ PLIST_FILES=	sbin/clonehdd man/man8/${PORTNAME}.8.gz
 NO_BUILD=	yes
 PORTDOCS=	CHANGES README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/clonehdd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/clonehdd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
diff --git a/sysutils/cmockery2/Makefile b/sysutils/cmockery2/Makefile
index 7729aef01638..bf8b9cfc4a1e 100644
--- a/sysutils/cmockery2/Makefile
+++ b/sysutils/cmockery2/Makefile
@@ -22,6 +22,8 @@ INSTALL_TARGET=	install-strip
 # Disable gcov on FreeBSD
 # CONFIGURE_ARGS=	--enable-gcov
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^docdir =/s|-$$(VERSION)||' \
 		-e '/^pkgconfigdir =/s|$$(libdir)|$$(prefix)/libdata|' \
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index dae02d72d762..0f68f4b3a326 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -37,6 +37,8 @@ WRKSRC_BZIP2_103=	${WRKDIR}/bzip2-${BZIP2_103}
 
 PORTDOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/CC/CXX/' -e 's,gcc,$${CXX},' \
 		-e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" ${WRKSRC}/Makefile
diff --git a/sysutils/detox/Makefile b/sysutils/detox/Makefile
index cf22e702282e..bbaa03145435 100644
--- a/sysutils/detox/Makefile
+++ b/sysutils/detox/Makefile
@@ -17,6 +17,8 @@ USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	dharple
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/detox
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/inline-detox
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 0cd771d9e0b3..cd4e80690572 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -23,6 +23,8 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/duff/Makefile b/sysutils/duff/Makefile
index f742c56a81e3..1f13a2131c50 100644
--- a/sysutils/duff/Makefile
+++ b/sysutils/duff/Makefile
@@ -19,7 +19,7 @@ SHEBANG_FILES=	join-duplicates.sh
 
 PORTDOCS=	README.SHA
 
-OPTIONS_DEFINE=	JOIN NLS
+OPTIONS_DEFINE=	DOCS JOIN NLS
 OPTIONS_SUB=	yes
 
 JOIN_DESC=		Add run-dependencies for join-duplicates.sh
diff --git a/sysutils/duply/Makefile b/sysutils/duply/Makefile
index cda544e0d230..9b510da53d31 100644
--- a/sysutils/duply/Makefile
+++ b/sysutils/duply/Makefile
@@ -27,6 +27,8 @@ PERIODICFILE?=	300.duply
 PERIODICDIR?=	${PREFIX}/etc/periodic/backup
 SUB_FILES=	pkg-message periodic_duply
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e "s,/etc/duply,${ETCDIR},g" ${WRKSRC}/duply
 
diff --git a/sysutils/fanout/Makefile b/sysutils/fanout/Makefile
index eddcda514155..b53f47da9d33 100644
--- a/sysutils/fanout/Makefile
+++ b/sysutils/fanout/Makefile
@@ -17,6 +17,8 @@ NO_BUILD=	yes
 PLIST_FILES=	bin/fanout bin/fanterm bin/fanmux
 PORTDOCS=	README index.html
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/fanterm
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 1bc3d26ac58c..b21db5884587 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -19,4 +19,6 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
 USE_QT=		core dbus gui network script widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/fpart/Makefile b/sysutils/fpart/Makefile
index 74a683739c69..653d86db8a8c 100644
--- a/sysutils/fpart/Makefile
+++ b/sysutils/fpart/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS=	--disable-embfts
 PLIST_FILES=	bin/fpart man/man1/fpart.1.gz
 PORTDOCS=	Changelog README TODO
 
-OPTIONS_DEFINE=	FPSYNC
+OPTIONS_DEFINE=	FPSYNC DOCS
 OPTIONS_DEFAULT=	FPSYNC
 FPSYNC_DESC=	Install fpsync tool
 FPSYNC_RUN_DEPENDS=	rsync:net/rsync \
diff --git a/sysutils/fswatch-mon/Makefile b/sysutils/fswatch-mon/Makefile
index 098292f6e157..634fa78c29eb 100644
--- a/sysutils/fswatch-mon/Makefile
+++ b/sysutils/fswatch-mon/Makefile
@@ -21,7 +21,7 @@ INFO=	fswatch
 
 CONFLICTS_INSTALL=	fswatch-[0-9]*
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index 9a7c616f3b37..012c281066e5 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -33,6 +33,8 @@ MAKE_ARGS+=	ETCDIR=${ETCDIR} TAG=${DISTVERSIONPREFIX}${PORTVERSION}
 
 ALL_TARGET=	test build
 
+OPTIONS_DEFINE=	DOCS
+
 do-patch:
 	(cd ${WRKSRC}; ${PATCH} vendor/src/github.com/mitchellh/go-libucl/libucl.go < vendor/patches/github.com/mitchellh/go-libucl/libucl.go.patch )
 
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 2b23b8ccc391..48eed0ad7946 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -34,7 +34,7 @@ USE_QT=		core dbus gui network webkit widgets xml \
 # The ffmpeg-plugin needs patching
 CMAKE_ARGS=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=FALSE
 
-OPTIONS_DEFINE=		CDRDAO DVDPLUSRW EMOVIX VCDIMAGER
+OPTIONS_DEFINE=		CDRDAO DVDPLUSRW EMOVIX VCDIMAGER DOCS
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 CDRDAO_DESC=		Burning: cdrdao
diff --git a/sysutils/kbackup/Makefile b/sysutils/kbackup/Makefile
index 5a26f720ba51..5a2e01472e66 100644
--- a/sysutils/kbackup/Makefile
+++ b/sysutils/kbackup/Makefile
@@ -14,4 +14,6 @@ USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
 USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
index e2e9fe61a75b..8a7fde9b8a7c 100644
--- a/sysutils/kcron/Makefile
+++ b/sysutils/kcron/Makefile
@@ -17,4 +17,6 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons ecm \
 USE_QT=		core gui network printsupport widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdebugsettings/Makefile b/sysutils/kdebugsettings/Makefile
index 7c034fdf1333..ab53641bc662 100644
--- a/sysutils/kdebugsettings/Makefile
+++ b/sysutils/kdebugsettings/Makefile
@@ -13,4 +13,6 @@ USE_KDE=	completion config configwidgets coreaddons dbusaddons \
 USE_QT=		core dbus gui testlib widgets \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index b0c743d4e637..a204ff06d422 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -14,4 +14,6 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons doctools \
 USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdialog/Makefile b/sysutils/kdialog/Makefile
index d1d8c90a5255..229a9965e8da 100644
--- a/sysutils/kdialog/Makefile
+++ b/sysutils/kdialog/Makefile
@@ -17,4 +17,6 @@ USE_QT=		core dbus gui network printsupport widgets xml \
 		buildtools_build qmake_build
 USE_XORG=	x11
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 391cf8321ea8..bb2b441638b3 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -14,4 +14,6 @@ USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 USE_QT=		core dbus gui widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index e62eb4712972..31b667a652f3 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -21,4 +21,6 @@ USE_QT=		core dbus gui network widgets xml \
 		buildtools_build qmake_build
 SHEBANG_FILES=	searchhandlers/khc_mansearch.pl
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
index 7c0287f757d9..32bd2cd49c5e 100644
--- a/sysutils/ksystemlog/Makefile
+++ b/sysutils/ksystemlog/Makefile
@@ -14,4 +14,6 @@ USE_KDE=	archive auth codecs completion config configwidgets coreaddons \
 USE_QT=		core dbus gui network printsupport testlib widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/lava/Makefile b/sysutils/lava/Makefile
index 33e3a88661a0..f4211cadb8dc 100644
--- a/sysutils/lava/Makefile
+++ b/sysutils/lava/Makefile
@@ -23,6 +23,8 @@ NO_ARCH=	yes
 PLIST_FILES=	bin/${PORTNAME}.sh
 PORTDOCS=	README.md
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/
diff --git a/sysutils/liburcu/Makefile b/sysutils/liburcu/Makefile
index f05e3f5eb9c0..d2605b01ef87 100644
--- a/sysutils/liburcu/Makefile
+++ b/sysutils/liburcu/Makefile
@@ -26,4 +26,6 @@ CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/lttng-tools/Makefile b/sysutils/lttng-tools/Makefile
index db64664869f1..53e8c2ed3e26 100644
--- a/sysutils/lttng-tools/Makefile
+++ b/sysutils/lttng-tools/Makefile
@@ -31,6 +31,8 @@ CONFIGURE_ARGS=	--with-lttng-ust-prefix=${LOCALBASE} \
 	    --disable-maintainer-mode
 INSTALL_TARGET=		install-strip
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.3 ${STAGEDIR}${MANPREFIX}/man/man3/
diff --git a/sysutils/lttng-ust/Makefile b/sysutils/lttng-ust/Makefile
index 4d2df52acf22..a569eccbba3f 100644
--- a/sysutils/lttng-ust/Makefile
+++ b/sysutils/lttng-ust/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g' \
 	    ${PATCH_WRKSRC}/tools/lttng-gen-tp
diff --git a/sysutils/memdump/Makefile b/sysutils/memdump/Makefile
index e91d516cf493..cdbcade6de73 100644
--- a/sysutils/memdump/Makefile
+++ b/sysutils/memdump/Makefile
@@ -20,6 +20,8 @@ MAKE_ARGS=	OPT="${CFLAGS}" DEBUG=''
 PORTDOCS=	README
 PLIST_FILES=	bin/memdump man/man1/memdump.1.gz
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/memdump ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/memdump.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index 5d0f6c867680..73cf54a4e280 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -53,6 +53,8 @@ WWW_FILES=	logo_top.png \
 PORTDOCS=	*
 PORTDATA=	*.pm
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 pre-everything::
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index 94f1ad0432f1..17e7526a6b52 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -25,6 +25,8 @@ PORTDOCS=	README changes.txt lesskeys.rc most-fun.txt most.doc most.rc
 
 PORTSCOUT=	skipv:5.0.0a
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
 		${WRKSRC}/src/jdmacros.h
diff --git a/sysutils/nbosd/Makefile b/sysutils/nbosd/Makefile
index aa81465aa292..11ff52ca16e0 100644
--- a/sysutils/nbosd/Makefile
+++ b/sysutils/nbosd/Makefile
@@ -15,6 +15,8 @@ LIB_DEPENDS=	libxosd.so:misc/xosd
 PLIST_FILES=	bin/nbosd
 PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nbosd ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/openhpi/Makefile b/sysutils/openhpi/Makefile
index 20bdc52b7c54..ba55ba2b0b4a 100644
--- a/sysutils/openhpi/Makefile
+++ b/sysutils/openhpi/Makefile
@@ -29,6 +29,8 @@ USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_RC_SUBR=	openhpid
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} 's/-lstdc++//' \
 		${WRKSRC}/baselib/Makefile.in \
diff --git a/sysutils/py-bcfg2/Makefile b/sysutils/py-bcfg2/Makefile
index 735341b719a0..cce0af9995bc 100644
--- a/sysutils/py-bcfg2/Makefile
+++ b/sysutils/py-bcfg2/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}daemon>=0:devel/py-daemon@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR}
 
-OPTIONS_DEFINE=	CHEETAH GENSHI
+OPTIONS_DEFINE=	CHEETAH GENSHI DOCS
 CHEETAH_DESC=	Support Cheetah Templates
 GENSHI_DESC=	Support Genshi Templates
 
diff --git a/sysutils/py-supervisor/Makefile b/sysutils/py-supervisor/Makefile
index b63008b3fc5e..78e1b2d864f8 100644
--- a/sysutils/py-supervisor/Makefile
+++ b/sysutils/py-supervisor/Makefile
@@ -31,6 +31,8 @@ SHEBANG_FILES=	supervisor/scripts/*.py supervisor/tests/fixtures/*.py
 python_OLD_CMD=	"/usr/bin/env python"
 python_OLD_CMD+=	"<<PYTHON>>"
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' ${WRKSRC}/supervisor/options.py
 
diff --git a/sysutils/qdirstat/Makefile b/sysutils/qdirstat/Makefile
index feb71726ff3d..b0055f3943c8 100644
--- a/sysutils/qdirstat/Makefile
+++ b/sysutils/qdirstat/Makefile
@@ -18,6 +18,8 @@ USE_GL=		gl
 USE_QT=		buildtools_build core gui widgets
 SHEBANG_FILES=	scripts/qdirstat-cache-writer
 
+OPTIONS_DEFINE=	DOCS
+
 pre-configure:
 	${REINPLACE_CMD} -e 's,/usr/,${PREFIX}/,g' \
 		${WRKSRC}/doc/doc.pro
diff --git a/sysutils/read-edid/Makefile b/sysutils/read-edid/Makefile
index d2a9870cffa9..c5c1a31e26a3 100644
--- a/sysutils/read-edid/Makefile
+++ b/sysutils/read-edid/Makefile
@@ -16,4 +16,6 @@ USES=		cmake localbase
 PLIST_FILES=	bin/get-edid bin/parse-edid man/man1/get-edid.1.gz
 PORTDOCS=	AUTHORS ChangeLog LICENSE README
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/sas2ircu/Makefile b/sysutils/sas2ircu/Makefile
index f9968ed5b0a6..d02e320a12ea 100644
--- a/sysutils/sas2ircu/Makefile
+++ b/sysutils/sas2ircu/Makefile
@@ -26,17 +26,17 @@ NO_WRKSRC=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Binaries only available for i386 and amd64 from Broadcom
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
+	${INSTALL_PROGRAM} ${WRKSRC}/sas2ircu_freebsd_${ARCH}_rel/sas2ircu\
+		${STAGEDIR}${PREFIX}/sbin
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme_Release_Notes_SAS2IRCU_Phase_${PORTVERSION}.txt\
 		${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/SAS2IRCU_Phase20.0-${PORTVERSION}.pdf\
 		${STAGEDIR}${DOCSDIR}
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/sas2ircu_freebsd_${ARCH}_rel/sas2ircu\
-		${STAGEDIR}${PREFIX}/sbin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/scct/Makefile b/sysutils/scct/Makefile
index 3b3f85890f7f..0f91697c67ad 100644
--- a/sysutils/scct/Makefile
+++ b/sysutils/scct/Makefile
@@ -20,6 +20,8 @@ GH_ACCOUNT=	Jehops
 PLIST_FILES=	bin/scct
 PORTDOCS=	README.org
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scct ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/signon-kwallet-extension/Makefile b/sysutils/signon-kwallet-extension/Makefile
index 76c5a7dc3c36..a8934525537b 100644
--- a/sysutils/signon-kwallet-extension/Makefile
+++ b/sysutils/signon-kwallet-extension/Makefile
@@ -17,4 +17,6 @@ USE_LDCONFIG=	${KDE_PREFIX}/${SE_DIR}
 PLIST_FILES=	${SE_DIR}/libkeyring-kwallet.so
 SE_DIR=		lib/signon/extensions
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signon-qt5/Makefile
index 1a979e70610a..825faa704fa0 100644
--- a/sysutils/signon-qt5/Makefile
+++ b/sysutils/signon-qt5/Makefile
@@ -22,6 +22,8 @@ GL_ACCOUNT=	accounts-sso
 GL_PROJECT=	signond
 GL_COMMIT=	aa1bcf3c9218addbdb376a40151b689409046125
 
+OPTIONS_DEFINE=	DOCS
+
 pre-configure:
 	#make it find qdbusxml2ccp (as ${QT_BINDIR} is not in PATH)
 	${REINPLACE_CMD} -e 's,qdbusxml2cpp,${QT_BINDIR}/qdbusxml2cpp,' \
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 7b0b7d83550a..6f4fbe99ed9e 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -14,4 +14,6 @@ USE_KDE=	activities-stats auth bookmarks codecs config configwidgets \
 USE_QT=		core dbus gui widgets xml \
 		buildtools_build qmake_build
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.mk>
diff --git a/sysutils/tkdvd/Makefile b/sysutils/tkdvd/Makefile
index fcd8eb4464b7..ee7d7eea5142 100644
--- a/sysutils/tkdvd/Makefile
+++ b/sysutils/tkdvd/Makefile
@@ -28,6 +28,8 @@ DESKTOP_ENTRIES="TkDVD" \
 		"AudioVideo;DiscBurning;" \
 		true
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile
index 4e64b9eec67a..07b8fe5bd00d 100644
--- a/sysutils/tree/Makefile
+++ b/sysutils/tree/Makefile
@@ -19,6 +19,8 @@ PLIST_FILES=	bin/tree \
 
 PORTDOCS=	CHANGES README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tree ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/sysutils/ts/Makefile b/sysutils/ts/Makefile
index 0dae8c5e8612..6391a68524bb 100644
--- a/sysutils/ts/Makefile
+++ b/sysutils/ts/Makefile
@@ -16,6 +16,8 @@ PLIST_FILES=	bin/ts \
 		man/man8/ts.8.gz
 PORTDOCS=	OBJECTIVES PROTOCOL README TRICKS
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e '/^GLIBCFLAGS/d;/^CFLAGS/d'\
 		${WRKSRC}/Makefile
diff --git a/sysutils/tw_cli/Makefile b/sysutils/tw_cli/Makefile
index a32ff9fe60e7..423441a8d854 100644
--- a/sysutils/tw_cli/Makefile
+++ b/sysutils/tw_cli/Makefile
@@ -29,6 +29,8 @@ PORTDOCS=	tw_cli.8.html
 PLIST_FILES=	etc/periodic/daily/407.status-3ware-raid\
 		man/man8/tw_cli.8.gz sbin/tw_cli
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${ARCH:S,i386,x86,:S,amd64,x86_64,}/tw_cli\
 		${STAGEDIR}${PREFIX}/sbin/tw_cli
diff --git a/sysutils/ucspi-ssl/Makefile b/sysutils/ucspi-ssl/Makefile
index 4d4ab5763444..d6b7c58917b8 100644
--- a/sysutils/ucspi-ssl/Makefile
+++ b/sysutils/ucspi-ssl/Makefile
@@ -21,6 +21,8 @@ WRKSRC=		${WRKDIR}/host/superscript.com/net/${DISTNAME}
 
 SCRIPTS_TO_INSTALL=	https@ sslcat sslconnect
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 post-patch:
diff --git a/sysutils/watchman/Makefile b/sysutils/watchman/Makefile
index 0c1c76522b8e..b58c916239ac 100644
--- a/sysutils/watchman/Makefile
+++ b/sysutils/watchman/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	bin/${PORTNAME} \
 		"@dir(,,2777) /var/run/${PORTNAME}"
 PORTDOCS=	README.markdown
 
-OPTIONS_DEFINE=	BACKTRACE PCRE
+OPTIONS_DEFINE=	BACKTRACE PCRE DOCS
 OPTIONS_DEFAULT=BACKTRACE PCRE
 
 BACKTRACE_DESC=		Stack backtrace support via (lib)execinfo
diff --git a/sysutils/xjobs/Makefile b/sysutils/xjobs/Makefile
index bfe93bca5644..d6f8a8ebefad 100644
--- a/sysutils/xjobs/Makefile
+++ b/sysutils/xjobs/Makefile
@@ -17,6 +17,8 @@ USES=		tar:tgz
 
 PORTDOCS=	ChangeLog README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/sysutils/zap/Makefile b/sysutils/zap/Makefile
index 77dd96cacc73..4278181ea093 100644
--- a/sysutils/zap/Makefile
+++ b/sysutils/zap/Makefile
@@ -21,6 +21,8 @@ PORTDOCS=	README.org
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
diff --git a/sysutils/zfsnap2/Makefile b/sysutils/zfsnap2/Makefile
index dee524ffef40..f17ba3d31bdf 100644
--- a/sysutils/zfsnap2/Makefile
+++ b/sysutils/zfsnap2/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 NO_BUILD=	yes
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=		BASH ZSH
+OPTIONS_DEFINE=		BASH ZSH DOCS
 OPTIONS_DEFAULT=	BASH ZSH
 OPTIONS_SUB=	yes