Index: head/Mk/bsd.apache.mk
===================================================================
--- head/Mk/bsd.apache.mk
+++ head/Mk/bsd.apache.mk
@@ -143,7 +143,7 @@
 
 # Setting "@comment " as default.
 .for module in ${AVAILABLE_MODULES:O}
-${module}_PLIST_SUB=	"@comment "
+${module}PLIST_SUB=	"@comment "
 _DISABLE_MODULES+=	--disable-${module:tl}
 .endfor
 
@@ -244,11 +244,11 @@
 .endif
 
 .for module in ${SHARED_MODULES}
-${module}_PLIST_SUB=	""
+${module}PLIST_SUB=	""
 .endfor
 
 .for module in ${AVAILABLE_MODULES:O:u}
-PLIST_SUB+=	MOD_${module}=${${module}_PLIST_SUB}
+PLIST_SUB+=	MOD_${module}=${${module}PLIST_SUB}
 .endfor
 
 # pkg-plist workaround STATIC support
Index: head/Mk/bsd.options.mk
===================================================================
--- head/Mk/bsd.options.mk
+++ head/Mk/bsd.options.mk
@@ -104,7 +104,7 @@
 # ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD
 # CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES
 # INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES
-# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES INFO USES, defining ${opt}_${variable} will
+# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES PLIST_SUB INFO USES, defining ${opt}_${variable} will
 # add its content to the actual variable when the option is enabled.  Defining
 # ${opt}_${variable}_OFF will add its content to the actual variable when the
 # option is disabled.
@@ -130,7 +130,7 @@
 		CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \
 		EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \
 		PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \
-		USES INFO
+		PLIST_SUB USES INFO
 _OPTIONS_DEPENDS=	PKG FETCH EXTRACT PATCH BUILD LIB RUN
 
 # Set the default values for the global options, as defined by portmgr
Index: head/x11-themes/slim-themes/Makefile
===================================================================
--- head/x11-themes/slim-themes/Makefile
+++ head/x11-themes/slim-themes/Makefile
@@ -84,11 +84,11 @@
 NEWDISTFILES:=	${DISTFILES}	${${n}_DIST}
 DISTFILES:=	${NEWDISTFILES}
 SEEN_THEMES=	yes
-NEW_PLIST_SUB:=	${PLIST_SUB}	${n}=""
-PLIST_SUB:=	${NEW_PLIST_SUB}
+NEWPLIST_SUB:=	${PLIST_SUB}	${n}=""
+PLIST_SUB:=	${NEWPLIST_SUB}
 .else
-NEW_PLIST_SUB:=	${PLIST_SUB}	${n}="@comment "
-PLIST_SUB:=	${NEW_PLIST_SUB}
+NEWPLIST_SUB:=	${PLIST_SUB}	${n}="@comment "
+PLIST_SUB:=	${NEWPLIST_SUB}
 .endif # ${PORT_OPTIONS:MALL_THEMES} || ${PORT_OPTIONS:M${n}}
 .endfor # n in ${THEMELIST}