diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index 8b6937a5a923..c5dceca31f1a 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -20,6 +20,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:S/.//}
 ALL_TARGET=	beav
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -DUNIX -DBSD -DNOPROTO"
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|(OFILES):|$$(OFILES):|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/beav.1
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index b1a3bd306a98..e8c8f3fe654a 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -17,6 +17,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's| regex\.c | |g ; \
 		 s| -g | |g' ${WRKSRC}/Makefile.in
diff --git a/editors/yasnippet/Makefile b/editors/yasnippet/Makefile
index f8629a753e5c..d4473fb2467c 100644
--- a/editors/yasnippet/Makefile
+++ b/editors/yasnippet/Makefile
@@ -16,6 +16,8 @@ USE_EMACS=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${FIND} ${WRKSRC}/snippets -type d -empty | ${XARGS} ${RMDIR}
 
diff --git a/editors/yui/Makefile b/editors/yui/Makefile
index ea4eec44dab3..09778dfc472b 100644
--- a/editors/yui/Makefile
+++ b/editors/yui/Makefile
@@ -18,6 +18,8 @@ MAKE_ENV+=	LIBPATH=${PREFIX}/lib
 
 BROKEN_sparc64=	Does not compile on sparc64
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${LN} -sf help_eng.html ${STAGEDIR}${PREFIX}/lib/yui/yhelp.html
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
index aa835860e9d6..ba3b2d430060 100644
--- a/emulators/fs-uae/Makefile
+++ b/emulators/fs-uae/Makefile
@@ -22,6 +22,8 @@ USE_GNOME=	glib20
 INSTALLS_ICONS=	yes
 MAKE_ARGS+=	prefix=${PREFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900000
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index c7e74e8dfa3e..cad07243d163 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -27,6 +27,8 @@ PYDISTUTILS_PKGNAME=	GNS3
 
 DESKTOP_ENTRIES=	"GNS3" "${COMMENT}" "" "${PORTNAME}" "System;Emulator;" true
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' -e 's|/share/man|/man|g' ${WRKSRC}/setup.py
 
diff --git a/emulators/jzintv/Makefile b/emulators/jzintv/Makefile
index 35e977b4003f..b97f6764def4 100644
--- a/emulators/jzintv/Makefile
+++ b/emulators/jzintv/Makefile
@@ -22,7 +22,7 @@ USE_SDL=	sdl
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
 
-OPTIONS_DEFINE=	TOOLS
+OPTIONS_DEFINE=	TOOLS DOCS EXAMPLES
 OPTIONS_SUB=	yes
 TOOLS_DESC=	Install additional tools
 
diff --git a/emulators/klh10/Makefile b/emulators/klh10/Makefile
index 09c62ed3104f..31fde08d779a 100644
--- a/emulators/klh10/Makefile
+++ b/emulators/klh10/Makefile
@@ -16,6 +16,8 @@ ONLY_FOR_ARCHS=	i386
 BUILD_WRKSRC=	${WRKSRC}/bld/fbx86
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
+OPTIONS_DEFINE=	DOCS
+
 # someday add support for base-kl and base-ks targets
 MAKE_ENV=		KLH10_HOME="${DATADIR}"
 ALL_TARGET=		base-ks-its
diff --git a/emulators/libspectrum/Makefile b/emulators/libspectrum/Makefile
index 4ac421089e29..01be2eba5802 100644
--- a/emulators/libspectrum/Makefile
+++ b/emulators/libspectrum/Makefile
@@ -19,7 +19,7 @@ USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 USES=		gmake pkgconfig libtool
 
-OPTIONS_DEFINE=	AUDIOFILE
+OPTIONS_DEFINE=	AUDIOFILE DOCS
 AUDIOFILE_DESC=	Support loading from .wav files
 
 AUDIOFILE_LIB_DEPENDS=	libaudiofile.so:${PORTSDIR}/audio/libaudiofile
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6288b880ebc4..835d086ba371 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote
 
-OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM
+OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
 OFX_DESC=	OFX support
diff --git a/ftp/omi/Makefile b/ftp/omi/Makefile
index 9dfde714a582..b01ad65c64eb 100644
--- a/ftp/omi/Makefile
+++ b/ftp/omi/Makefile
@@ -15,6 +15,8 @@ COMMENT=	"mirror" subtrees of FTP servers
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	freebsd
 
+OPTIONS_DEFINE=	DOCS
+
 pre-patch:
 	${REINPLACE_CMD} -E -e "s@^(OPTFLAGS).*@\1=${CFLAGS}@" \
 		${WRKSRC}/Makefile
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index 23db725ddadf..e0a37e85cec3 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--with-locale-dir=${PREFIX}/share/locale \
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	DANTE GTK2 NLS
+OPTIONS_DEFINE=	DANTE GTK2 NLS DOCS
 DANTE_DESC=	Enable SOCKS proxy support
 OPTIONS_DEFAULT=	GTK2
 OPTIONS_SUB=	yes
diff --git a/ftp/py-ftputil/Makefile b/ftp/py-ftputil/Makefile
index 4bd1f3062dc8..1349dbdc81c3 100644
--- a/ftp/py-ftputil/Makefile
+++ b/ftp/py-ftputil/Makefile
@@ -17,6 +17,8 @@ USE_PYDISTUTILS=	yes
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOC_FILES=	README.html README.txt ftputil.html ftputil.txt ftputil_ru_utf8.txt
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 do-fetch:
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 5936ff4e7e30..b5dc1e972cac 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Modular FTP server configurable online using SITE commands
 
 LICENSE=	GPLv2 # (or later)
 
-OPTIONS_DEFINE=	ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL
+OPTIONS_DEFINE=	ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
 OPTIONS_RADIO=	TLS ZEROCONF
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL
 OPTIONS_RADIO_ZEROCONF=	AVAHI HOWL
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 4ee141207da1..993fa79b5a7e 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -30,6 +30,8 @@ CONFIGURE_ARGS=	--enable-compile-optim=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/html && ${FIND} . | ${CPIO} -pdm -L -R \
diff --git a/games/angband/Makefile b/games/angband/Makefile
index 4e5eea21a204..64e7948699fa 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Rogue-like game with color, X11 support
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=		SDL X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFINE=	SDL X11 DOCS
+OPTIONS_DEFAULT=X11
 
 USES=		gmake ncurses
 GNU_CONFIGURE=	yes
diff --git a/games/bass/Makefile b/games/bass/Makefile
index fe981589ca2c..34b02653e32e 100644
--- a/games/bass/Makefile
+++ b/games/bass/Makefile
@@ -24,6 +24,8 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/sky.dnr ${STAGEDIR}${DATADIR}
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index 709dde1b75c4..9bb040083b3c 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -26,7 +26,7 @@ MAKE_ARGS+=	RELEASE=1
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	NLS
+OPTIONS_DEFINE=	NLS DOCS
 OPTIONS_DEFAULT=NCURSES
 OPTIONS_SINGLE=	UI
 OPTIONS_SINGLE_UI=	NCURSES SDL
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 9e2f2babc286..79d7426efbd5 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -18,6 +18,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		gmake
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 6d2e606e45e5..fec298a155df 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -25,6 +25,8 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} `${SDL_CONFIG} --libs`
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} 's|^pkgsounddir = .*|pkgsounddir = ${DATADIR}/sounds|' \
 		${WRKSRC}/src/Makefile.in
diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index f7a4b36bae45..b22fd86e9dfd 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -14,7 +14,7 @@ ONLY_FOR_ARCHS=	i386	# Alphas don't have libvgl yet...
 
 MAKEFILE=	Makefile.fbsd
 
-OPTIONS_DEFINE=	SOUND
+OPTIONS_DEFINE=	SOUND DOCS
 
 .include <bsd.port.options.mk>
 
diff --git a/games/evq3/Makefile b/games/evq3/Makefile
index c11715420540..0b6447a57985 100644
--- a/games/evq3/Makefile
+++ b/games/evq3/Makefile
@@ -22,7 +22,7 @@ ALL_TARGET=	release
 WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	-DMAP_ANONYMOUS=MAP_ANON
 
-OPTIONS_DEFINE=	CURL CURL_DLOPEN GAMELIBS OPENAL OPENAL_DLOPEN VOIP VORBIS OPTIMIZED_CFLAGS
+OPTIONS_DEFINE=	CURL CURL_DLOPEN GAMELIBS OPENAL OPENAL_DLOPEN VOIP VORBIS OPTIMIZED_CFLAGS DOCS
 OPTIONS_DEFAULT=	CLIENT CURL CURL_DLOPEN DEDICATED OPTIMIZED_CFLAGS SMP VORBIS
 OPTIONS_MULTI=	TYPE
 OPTIONS_MULTI_TYPE=	CLIENT DEDICATED SMP
diff --git a/games/fotaq/Makefile b/games/fotaq/Makefile
index 2d534c16bbff..0c7e638f3c9f 100644
--- a/games/fotaq/Makefile
+++ b/games/fotaq/Makefile
@@ -20,6 +20,8 @@ SUB_FILES=	pkg-message
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${INSTALL_DATA} ${WRKSRC}/queen.1c ${STAGEDIR}${DATADIR}
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 96f3cfcbc3af..bf2b04811e5e 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --program-transform-name= \
 		--enable-aimodules --enable-shared \
 		--enable-fcdb=sqlite3
 
-OPTIONS_DEFINE?=	NLS X11 SDL MYSQL IPV6
+OPTIONS_DEFINE?=	NLS X11 SDL MYSQL IPV6 DOCS
 OPTIONS_DEFAULT?=	NLS X11 IPV6
 OPTIONS_SUB=		yes
 SDL_CONFIGURE_ON=	--enable-client=gtk,sdl
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index 57f83f8da4cc..c26b914dcf42 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -15,6 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
+OPTIONS_DEFINE=	DOCS
+
 USES=		cmake openal:al,alut
 USE_SDL=	sdl mixer ttf
 USE_LDCONFIG=	yes
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index 1d894d9623db..33d6e7f28c0c 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--disable-warn
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	SDL_NET
+OPTIONS_DEFINE=	SDL_NET DOCS
 SDL_NET_DESC=	Network Support
 SDL_NET_USE=	SDL=net
 SLD_NET_CONFIGURE_ENABLE=	network
diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile
index 95c34b7773d7..83fc62145209 100644
--- a/games/gnubg/Makefile
+++ b/games/gnubg/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libgtkextra-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtkextra2 \
 		libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
-OPTIONS_DEFINE=	ESOUND NLS
+OPTIONS_DEFINE=	ESOUND NLS DOCS
 OPTIONS_DEFAULT=ESOUND NLS
 
 CONFIGURE_ARGS=	--with-board3d --with-sqlite --with-python
diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index c5b8de76b839..6077638967bd 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -15,6 +15,8 @@ MAKE_JOBS_UNSAFE=	yes
 
 INFO=		gnushogi
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	-@${RM} ${WRKSRC}/doc/gnushogi.info*
 
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index c3fba2eef336..cee9791b76d9 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -22,7 +22,7 @@ USE_LINUX_APPS=	xorglibs
 ONLY_FOR_ARCHS=	i386 amd64
 SHORTPORTVERSION=${PORTVERSION:C/([0-9]*)\.([0-9]*)/\1\2/}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-build:
 	${BRANDELF} -t Linux ${WRKSRC}/data/HoH
diff --git a/games/hoichess/Makefile b/games/hoichess/Makefile
index ae14147faabc..ac6431c58a5f 100644
--- a/games/hoichess/Makefile
+++ b/games/hoichess/Makefile
@@ -15,6 +15,8 @@ USE_PERL5=	build
 MAKE_JOBS_UNSAFE=yes
 MAKE_ENV=	HAVE_GETOPT=1
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${RM} ${WRKSRC}/src/lib/getopt.h
 	@${REINPLACE_CMD} -e '1,/^LDFLAG/d' ${WRKSRC}/src/Makefile.config
diff --git a/games/inform/Makefile b/games/inform/Makefile
index c5f4a9195ccd..2bda60ae0865 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -22,6 +22,8 @@ NO_WRKSUBDIR=	yes
 USES=		zip:infozip
 MAKEFILE=	${FILESDIR}/Makefile.inform
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${STAGEDIR}${DATADIR} && \
diff --git a/games/linux-defcon/Makefile b/games/linux-defcon/Makefile
index ad1ea52d7701..a85242541ee1 100644
--- a/games/linux-defcon/Makefile
+++ b/games/linux-defcon/Makefile
@@ -20,7 +20,7 @@ NO_BUILD=	yes
 DATADIR=	${PREFIX}/lib/${PKGNAMEPREFIX}${PORTNAME}
 SUB_FILES=	defcon
 
-OPTIONS_DEFINE=	NVIDIA
+OPTIONS_DEFINE=	NVIDIA DOCS
 NVIDIA_DESC=	support for nvidia
 
 .include <bsd.port.options.mk>
diff --git a/games/linux-enemyterritory-omni-bot-0660/Makefile b/games/linux-enemyterritory-omni-bot-0660/Makefile
index dec8f420081d..9544c6cede1b 100644
--- a/games/linux-enemyterritory-omni-bot-0660/Makefile
+++ b/games/linux-enemyterritory-omni-bot-0660/Makefile
@@ -25,7 +25,7 @@ NO_WRKSUBDIR=	yes
 DATADIR=	${PREFIX}/lib/enemyterritory/${PORTNAME}-${VERSTR}
 DOCSDIR=	${PREFIX}/share/doc/enemyterritory-${PORTNAME}-${VERSTR}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-build:
 .for f in et etded
diff --git a/games/linux-etqw-demo-server/Makefile b/games/linux-etqw-demo-server/Makefile
index 3f29b89baed9..a11ba6fdfdb2 100644
--- a/games/linux-etqw-demo-server/Makefile
+++ b/games/linux-etqw-demo-server/Makefile
@@ -23,6 +23,8 @@ USES=		zip:infozip
 
 ETQWDIR=	${PREFIX}/lib/${PORTNAME}${PKGNAMESUFFIX}
 
+OPTIONS_DEFINE=	DOCS
+
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@cd ${WRKSRC} && \
diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile
index b6b16ccf1171..52be54e53f69 100644
--- a/games/linux-uplink-demo/Makefile
+++ b/games/linux-uplink-demo/Makefile
@@ -25,7 +25,7 @@ SUB_FILES=	uplink
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 DOCFILES=	license.txt mods.txt Readme-UplinkSupport.txt readme.txt
 
-OPTIONS_DEFINE=	NVIDIA
+OPTIONS_DEFINE=	NVIDIA DOCS
 NVIDIA_DESC=	support for nvidia
 
 .include <bsd.port.options.mk>
diff --git a/games/mkgichessclub/Makefile b/games/mkgichessclub/Makefile
index b6099bf8d657..9e49b37fb18e 100644
--- a/games/mkgichessclub/Makefile
+++ b/games/mkgichessclub/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	MKGIChessClub-${PORTVERSION}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Chess playing server with a pure web interface
 
-OPTIONS_DEFINE=	GNUCHESS PHALANX
+OPTIONS_DEFINE=	GNUCHESS PHALANX DOCS
 GNUCHESS_DESC=	Install gnuchess robot
 PHALANX_DESC=	Install phalanx robot
 
diff --git a/games/odamex/Makefile b/games/odamex/Makefile
index cdfbc660e8a5..492c94484938 100644
--- a/games/odamex/Makefile
+++ b/games/odamex/Makefile
@@ -15,7 +15,7 @@ USE_SDL=	sdl mixer
 USES=		cmake dos2unix
 DOS2UNIX_FILES=	CMakeLists.txt odalaunch/CMakeLists.txt common/d_main.cpp
 
-OPTIONS_DEFINE=	LAUNCHER
+OPTIONS_DEFINE=	LAUNCHER DOCS
 
 LAUNCHER_DESC=	Enable GUI launcher program
 
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index e8971c126eb1..476e594c80a4 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -23,6 +23,8 @@ DESKTOP_ENTRIES="OpenGlad" "" "" "${PORTNAME}" "" ""
 
 NOT_FOR_ARCHS=	sparc64
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|COPYING INSTALL|INSTALL|' ${WRKSRC}/Makefile.in
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index aed8b695eb11..bd38aa0d8481 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -18,6 +18,8 @@ USE_PERL5=	build
 DATAFILES=	24P_Copperplate_Blue.png ball.tga logo.jpg \
 		paddle.tga red.png
 
+OPTIONS_DEFINE=	DOCS
+
 pre-patch:
 	@${REINPLACE_CMD} -i '' -e 's|/usr/local/share/games/pengpong|${DATADIR}|' \
 		${WRKSRC}/files.h
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index 4ef7f7a5c5aa..f586ae5fae77 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -18,6 +18,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte
 NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@cd ${WRKSRC}; ${SED} 's|/usr/share/|${PYTHON_SITELIBDIR}/|g' \
 		< ${PORTNAME}.sh > ${PORTNAME}
diff --git a/games/quake2-lights/Makefile b/games/quake2-lights/Makefile
index 5f12bada4af5..de8f6db6a4f0 100644
--- a/games/quake2-lights/Makefile
+++ b/games/quake2-lights/Makefile
@@ -21,6 +21,8 @@ ALL_TARGET=	release
 
 DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/__linux__/__unix__/' ${BUILD_WRKSRC}/q_shared.c
 	@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' \
diff --git a/games/quit/Makefile b/games/quit/Makefile
index 06bf86544fa8..2feded3cc3e5 100644
--- a/games/quit/Makefile
+++ b/games/quit/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Bicycle with trailers like "sl"
 
 MANLANG=	ja
 
+OPTIONS_DEFINE=	DOCS
+
 do-build:
 	${CC} ${CFLAGS} ${CPPFLAGS} -o ${WRKSRC}/quit \
 		${WRKSRC}/quit.c -lncurses
diff --git a/games/residualvm/Makefile b/games/residualvm/Makefile
index 69a1423b0b15..6f17691fe284 100644
--- a/games/residualvm/Makefile
+++ b/games/residualvm/Makefile
@@ -20,6 +20,8 @@ USE_SDL=	sdl
 HAS_CONFIGURE=	yes
 USES=		gmake
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|{datarootdir}/man|{prefix}/man|' ${WRKSRC}/configure
 
diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index b55830336c91..c1026f999e44 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -30,10 +30,9 @@ STRIP_FILES=	construct_mohawk create_sjisfnt decine degob dekyra \
 		deriven descumm desword2 extract_mohawk gob_loadcalc \
 		scummvm-tools-cli
 
-OPTIONS_DEFINE=	WXGTK
+OPTIONS_DEFINE=	WXGTK DOCS
 OPTIONS_DEFAULT=	WXGTK
 
-.include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MWXGTK}
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index 1f1e249779f8..226b19cabd07 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--with-sdl-prefix=${LOCALBASE} \
 		--disable-tremor
 LDFLAGS+=	${PTHREAD_LIBS}
 
-OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU
+OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS
 FLUIDSYNTH_DESC=	FluidSynth MIDI synthesizer
 MT32EMU_DESC=	MT-32 emulator
 OPTIONS_DEFAULT=	VORBIS MP3 PNG MT32EMU
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index e8f78cebd4d1..303fe6033bb5 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -21,6 +21,8 @@ USES=		imake
 USE_XORG=	xpm
 INSTALL_TARGET=	install install.dir
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sxsame ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/sxsame
diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile
index 3a6f0a5a098d..77ab86f76e0b 100644
--- a/games/thudboard/Makefile
+++ b/games/thudboard/Makefile
@@ -17,6 +17,8 @@ USE_PYTHON=	yes
 
 SUB_FILES=	thudboard
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e 's|file:.*/docs|file://${DOCSDIR}|' \
 		${WRKDIR}/thud.py
diff --git a/games/worldofpadman/Makefile b/games/worldofpadman/Makefile
index 67cd80a81959..dec3fb517f89 100644
--- a/games/worldofpadman/Makefile
+++ b/games/worldofpadman/Makefile
@@ -26,7 +26,7 @@ SRC_FILE=	${PORTNAME}-${PORTVERSION}
 VM_ARCHS=	amd64 i386 powerpc
 
 OPTIONS_DEFINE=		CURL CURL_DLOPEN GAMELIBS MP3 OPENAL OPENAL_DLOPEN \
-			OPTIMIZED_CFLAGS VORBIS
+			OPTIMIZED_CFLAGS VORBIS DOCS
 OPTIONS_MULTI=		FLAVOR
 OPTIONS_MULTI_FLAVOR=	CLIENT SERVER SMP_CLIENT
 OPTIONS_DEFAULT=	CLIENT CURL CURL_DLOPEN SERVER OPTIMIZED_CFLAGS \
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 96111fde29bd..6bd4f5f1c083 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -16,6 +16,8 @@ USE_XORG=	x11 xext
 
 DESKTOP_ENTRIES="XDigger" "" "" "${PORTNAME}" "" ""
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
 
diff --git a/german/mediathek/Makefile b/german/mediathek/Makefile
index 4ba27103e22b..0a6dfa87afbd 100644
--- a/german/mediathek/Makefile
+++ b/german/mediathek/Makefile
@@ -21,6 +21,7 @@ SUB_FILES=	mediathek
 INSTALLFILES=	MediathekView.jar MediathekView.ico
 INSTALLDOCS=	Kurzanleitung.pdf Instructions.pdf
 
+OPTIONS_DEFINE=		DOCS
 OPTIONS_MULTI=		BACKEND
 OPTIONS_MULTI_BACKEND=	MPLAYER VLC
 
diff --git a/german/pecl-konto_check/Makefile b/german/pecl-konto_check/Makefile
index f16b850747bb..bef349a788e5 100644
--- a/german/pecl-konto_check/Makefile
+++ b/german/pecl-konto_check/Makefile
@@ -19,6 +19,8 @@ DEFAULT_PHP_VER=53
 
 WRKSRC=	${WRKDIR}/php
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${UNZIP_CMD} -q -d ${WRKDIR} ${WRKDIR}/php.zip
 
diff --git a/graphics/exiftags/Makefile b/graphics/exiftags/Makefile
index 33d794c7b4f5..0fd8215c8c30 100644
--- a/graphics/exiftags/Makefile
+++ b/graphics/exiftags/Makefile
@@ -13,6 +13,8 @@ MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
 
 DOCS=	CHANGES README
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 .for i in exifcom exiftags exiftime
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 71759761eff2..23e41c7c1a38 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -24,7 +24,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -std=c99
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}"
 
-OPTIONS_DEFINE=	CAM
+OPTIONS_DEFINE=	CAM DOCS
 CAM_DESC=	Install feh-cam and related tools
 OPTIONS_DEFAULT=CAM
 
diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 4f7587b0e46e..9bc46f665a60 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -26,6 +26,8 @@ INSTALL_TARGET=	install MANDIR=${PREFIX}/man/man1/
 
 LDFLAGS+=	-O3 -g -Wall -rdynamic -lexecinfo
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@# drop xdg-desktop-menu calls, they fail
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
diff --git a/graphics/gracula/Makefile b/graphics/gracula/Makefile
index de5f75276c7e..7c7e6ba8223d 100644
--- a/graphics/gracula/Makefile
+++ b/graphics/gracula/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Graphic Counter Language compiler/interpreter
 
 SUB_FILES=	pkg-message
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gracula ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/sec2000 ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/luminance-qt5/Makefile b/graphics/luminance-qt5/Makefile
index 14dfb225738e..cc21ac2feba5 100644
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@@ -28,6 +28,8 @@ INSTALLS_ICONS=	yes
 
 MAKE_JOBS_UNSAFE=yes
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000024
diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile
index b044186986b4..92ccd9b6dc59 100644
--- a/graphics/luminance/Makefile
+++ b/graphics/luminance/Makefile
@@ -26,6 +26,8 @@ USE_QT4=	gui sql webkit xml linguist_build moc_build qmake_build \
 		rcc_build uic_build imageformats_run
 INSTALLS_ICONS=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 # Do not install yet another copy of GPL (we use license framework instead)
 # and fix installation path for docs (but not for internal help files)
diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile
index 1200dd41eec8..ca87f05d70a5 100644
--- a/graphics/ogre3d/Makefile
+++ b/graphics/ogre3d/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libzzip.so:${PORTSDIR}/devel/zziplib \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfreeimage.so:${PORTSDIR}/graphics/freeimage
 
-OPTIONS_DEFINE=	BOOST
+OPTIONS_DEFINE=	BOOST DOCS
 
 USE_LDCONFIG=	yes
 USES=		tar:bzip2 cmake pkgconfig compiler:c++11-lib
diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile
index 2ad409e5f23f..c280ef2cdf23 100644
--- a/graphics/py-exif/Makefile
+++ b/graphics/py-exif/Makefile
@@ -17,6 +17,8 @@ WRKSRC=		${WRKDIR}/pyexif
 DATADIR=	${PREFIX}/share/py-exif
 DOCSDIR=	${PREFIX}/share/doc/py-exif
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 .for pyfile in exiftool exifinfo.py
 	@ cd ${WRKSRC}/bin && ${MV} ${pyfile} ${pyfile}.orig && \
diff --git a/graphics/py-stltools/Makefile b/graphics/py-stltools/Makefile
index 8da6f9fc9082..07a62961d704 100644
--- a/graphics/py-stltools/Makefile
+++ b/graphics/py-stltools/Makefile
@@ -22,7 +22,7 @@ USE_PYDISTUTILS=	YES
 DOCS=			README.txt
 EXAMPLES=		test/cube.stl test/cube_bin.stl
 
-OPTIONS_DEFINE=		PYCAIRO
+OPTIONS_DEFINE=		PYCAIRO DOCS
 PYCAIRO_DESC=		Use (py)Cairo to enable stl2pdf to function.
 
 .include <bsd.port.options.mk>
diff --git a/graphics/ruby-image_size/Makefile b/graphics/ruby-image_size/Makefile
index bbe965ac07b6..52a60c5a281a 100644
--- a/graphics/ruby-image_size/Makefile
+++ b/graphics/ruby-image_size/Makefile
@@ -26,6 +26,8 @@ DOCS_EN=	${RUBY_RD_FILES:N*.ja.rd} \
 DOCS_JA=	${RUBY_RD_FILES:M*.ja.rd} \
 		${RUBY_RD_HTML_FILES:M*.ja.html}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
 	${INSTALL_DATA} ${WRKSRC}/lib/image_size.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile
index 7ee986cb987d..d10fc6cddc0b 100644
--- a/graphics/ruby-ming/Makefile
+++ b/graphics/ruby-ming/Makefile
@@ -26,6 +26,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-ruby
 
 DOCS=	ChangeLog INSTALL LGPL NEWS README TODO
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_MODEXAMPLESDIR})
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index e207de7460aa..b4bd6670cfc5 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -25,7 +25,7 @@ CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY
+OPTIONS_DEFINE=		HDF5 OPENEXR NUMPY DOCS
 OPTIONS_DEFAULT=	HDF5 OPENEXR
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 
diff --git a/graphics/xournal/Makefile b/graphics/xournal/Makefile
index ba47340df5bd..f217400801e0 100644
--- a/graphics/xournal/Makefile
+++ b/graphics/xournal/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install desktop-install
 
-OPTIONS_DEFINE=		GHOSTSCRIPT
+OPTIONS_DEFINE=		GHOSTSCRIPT DOCS
 GHOSTSCRIPT_DESC=	Install ghostscript (PS/PDF as bitmap bg)
 OPTIONS_DEFAULT=	GHOSTSCRIPT
 
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index 151875aa4121..778f68969ab9 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -14,10 +14,12 @@ COMMENT=	Image pick up utility for X Window System
 USES=		imake
 USE_XORG=	x11 xext
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xwpick
-	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${PREFIX}/share/doc/xwpick
-	${INSTALL_DATA} ${WRKSRC}/CNL_ARTICLE.PS ${STAGEDIR}${PREFIX}/share/doc/xwpick
-	${INSTALL_DATA} ${WRKSRC}/0README ${STAGEDIR}${PREFIX}/share/doc/xwpick/README
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CNL_ARTICLE.PS ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/0README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index 63cf1be7d5fc..0eacde643515 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-OPTIONS_DEFINE=	SDL
+OPTIONS_DEFINE=	SDL DOCS
 
 USES=		gmake makeinfo
 ALL_TARGET=	zgv info