Index: /usr/ports/Mk/bsd.options.mk
===================================================================
--- /usr/ports/Mk/bsd.options.mk	(revision 303967)
+++ /usr/ports/Mk/bsd.options.mk	(working copy)
@@ -224,6 +224,7 @@
 .undef _SORTED_OPTIONS
 .endif
 
+.if !defined(OPTNGONLY)
 ### to be removed once old OPTIONS disappear
 .for opt in ${ALL_OPTIONS}
 .if empty(PORT_OPTIONS:M${opt})
@@ -238,3 +239,4 @@
 .      undef opt
 .endfor
 ###
+.endif