Index: Mk/Uses/cran.mk
===================================================================
--- Mk/Uses/cran.mk
+++ Mk/Uses/cran.mk
@@ -47,7 +47,7 @@
 R_POSTCMD_INSTALL_OPTIONS+=	-l ${STAGEDIR}${PREFIX}/${R_LIB_DIR}
 R_POSTCMD_INSTALL_OPTIONS+=	--install-tests
 
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 R_POSTCMD_INSTALL_OPTIONS+=	--no-docs --no-html
 .endif
 
Index: Mk/Uses/gem.mk
===================================================================
--- Mk/Uses/gem.mk
+++ Mk/Uses/gem.mk
@@ -111,7 +111,7 @@
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/ext \
 		${STAGEDIR}${PREFIX}/${CACHE_DIR} 2> /dev/null || ${TRUE}
 	${RMDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} 2> /dev/null || ${TRUE}
-.if defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	-@${RMDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
 .endif
 .endif
@@ -120,7 +120,7 @@
 _USES_install+=	820:gem-autoplist
 gem-autoplist:
 	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
-.if !defined(NOPORTDOCS)
+.if empty(PORT_OPTIONS:MDOCS)
 	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
 		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 .endif
Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk
+++ Mk/bsd.options.mk
@@ -196,30 +196,7 @@
 			package:300:pre package:500:do package:700:post \
 			stage:800:post
 
-# Set the default values for the global options, as defined by portmgr
-.if !defined(NOPORTDOCS)
-PORT_OPTIONS+=	DOCS
-.else
-OPTIONS_WARNINGS+=		"NOPORTDOCS"
-WITHOUT+=			DOCS
-OPTIONS_WARNINGS_UNSET+=	DOCS
-.endif
-
-.if !defined(WITHOUT_NLS)
-PORT_OPTIONS+=	NLS
-.else
-WITHOUT+=		NLS
-.endif
-
-.if !defined(NOPORTEXAMPLES)
-PORT_OPTIONS+=	EXAMPLES
-.else
-OPTIONS_WARNINGS+=		"NOPORTEXAMPLES"
-WITHOUT+=			EXAMPLES
-OPTIONS_WARNINGS_UNSET+=	EXAMPLES
-.endif
-
-PORT_OPTIONS+=	IPV6
+PORT_OPTIONS+=	DOCS NLS EXAMPLES IPV6
 
 # Add per arch options
 .for opt in ${OPTIONS_DEFINE_${ARCH}}
@@ -325,21 +302,6 @@
 .  endif
 .  sinclude "${OPTIONS_FILE}.local"
 
-### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
-# XXX once WITH_DEBUG is not magic any more, do remove the :NDEBUG from here.
-.for opt in ${ALL_OPTIONS:NDEBUG}
-.if defined(WITH_${opt})
-OPTIONS_WARNINGS+=	"WITH_${opt}"
-OPTIONS_WARNINGS_SET+=	${opt}
-PORT_OPTIONS+=	${opt}
-.endif
-.if defined(WITHOUT_${opt})
-OPTIONS_WARNINGS+=	"WITHOUT_${opt}"
-OPTIONS_WARNINGS_UNSET+=	${opt}
-PORT_OPTIONS:=	${PORT_OPTIONS:N${opt}}
-.endif
-.endfor
-
 _OPTIONS_UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}
 .for _k in SET UNSET SET_FORCE UNSET_FORCE
 .if defined(${_OPTIONS_UNIQUENAME}_${_k})
@@ -348,28 +310,6 @@
 .endif
 .endfor
 
-.if defined(OPTIONS_WARNINGS)
-WARNING+=	"You are using the following deprecated options: ${OPTIONS_WARNINGS}"
-WARNING+=	"If you added them on the command line, you should replace them by"
-WARNING+=	"WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\""
-WARNING+=	""
-WARNING+=	"If they are global options set in your make.conf, you should replace them with:"
-.if defined(OPTIONS_WARNINGS_SET)
-WARNING+=	"OPTIONS_SET=${OPTIONS_WARNINGS_SET}"
-.endif
-.if defined(OPTIONS_WARNINGS_UNSET)
-WARNING+=	"OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}"
-.endif
-WARNING+=	""
-WARNING+=	"If they are local to this port, you should use:"
-.if defined(OPTIONS_WARNINGS_SET)
-WARNING+=	"${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}"
-.endif
-.if defined(OPTIONS_WARNINGS_UNSET)
-WARNING+=	"${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}"
-.endif
-.endif
-
 ## Finish by using the options set by the port config dialog, if any
 .  for opt in ${OPTIONS_FILE_SET}
 .    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
@@ -471,11 +411,15 @@
 
 ## Now some compatibility
 .if empty(PORT_OPTIONS:MDOCS)
-NOPORTDOCS=	yes
+PLIST_SUB+=		PORTDOCS="@comment "
+.else
+PLIST_SUB+=		PORTDOCS=""
 .endif
 
 .if empty(PORT_OPTIONS:MEXAMPLES)
-NOPORTEXAMPLES=	yes
+PLIST_SUB+=	        PORTEXAMPLES="@comment "
+.else
+PLIST_SUB+=	        PORTEXAMPLES=""
 .endif
 
 .if ${PORT_OPTIONS:MDEBUG}
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1767,18 +1767,6 @@
 MAKE_ENV+=	WITHOUT_KERNEL_SYMBOLS=yes
 .endif
 
-.if defined(NOPORTDOCS)
-PLIST_SUB+=		PORTDOCS="@comment "
-.else
-PLIST_SUB+=		PORTDOCS=""
-.endif
-
-.if defined(NOPORTEXAMPLES)
-PLIST_SUB+=	        PORTEXAMPLES="@comment "
-.else
-PLIST_SUB+=	        PORTEXAMPLES=""
-.endif
-
 CONFIGURE_SHELL?=	${SH}
 MAKE_SHELL?=	${SH}
 
Index: Mk/bsd.sanity.mk
===================================================================
--- Mk/bsd.sanity.mk
+++ Mk/bsd.sanity.mk
@@ -4,9 +4,26 @@
 #
 
 .if defined(WITHOUT_NLS)
-WARNING+=	"WITHOUT_NLS is deprecated use OPTIONS_UNSET=NLS instead"
+WARNING+=	"WITHOUT_NLS is unsupported use OPTIONS_UNSET=NLS instead"
 .endif
 
+.if defined(NOPORTDOCS)
+WARNING+=	"NOPORTDOCS is unsupported use OPTIONS_UNSET=DOCS instead"
+.endif
+
+.if defined(NOPORTEXAMPLES)
+WARNING+=	"NOPORTEXAMPLES is unsupported use OPTIONS_UNSET=EXAMPLES instead"
+.endif
+
+.for opt in ${ALL_OPTIONS:NDEBUG}
+.if defined(WITH_${opt})
+WARNING+=     "WITH_${opt} is unsupported, use WITH=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_SET+=${opt} to set it globally, or ${OPTIONS_NAME}_SET+=${opt} for only this port."
+.endif
+.if defined(WITHOUT_${opt})
+WARNING+=     "WITHOUT_${opt} is unsupported, use WITHOUT=${opt} on the command line, or one of these in /etc/make.conf, OPTIONS_UNSET+=${opt} to set it globally, or ${OPTIONS_NAME}_UNSET+=${opt} for only this port."
+.endif
+.endfor
+
 .if defined(WITH_NEW_XORG) || defined(WITHOUT_NEW_XORG)
 WARNING+=	"WITH_NEW_XORG and WITHOUT_NEW_XORG knobs were removed and have no effect"
 .endif
Index: www/rubygem-passenger/Makefile
===================================================================
--- www/rubygem-passenger/Makefile
+++ www/rubygem-passenger/Makefile
@@ -43,8 +43,6 @@
 	dev/ci/run-tests-natively \
 	dev/ci/setup-host
 
-NOPORTDOCS=	yes
-
 APACHE22_USE=	APACHE=22+
 
 LIB_DEPENDS+=	libuv.so:devel/libuv \