Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -4513,9 +4513,8 @@
 .endif
 
 _SUB_LIST_TEMP=	${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
-.if !target(apply-slist)
+.if !target(apply-slist) && defined(SUB_FILES)
 apply-slist:
-.if defined(SUB_FILES)
 .for file in ${SUB_FILES}
 .if !exists(${FILESDIR}/${file}.in)
 	@${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
@@ -4529,7 +4528,6 @@
 .endif
 .endfor
 .endif
-.endif
 
 # Generate packing list.  Also tests to make sure all required package
 # files exist.
@@ -5303,7 +5301,7 @@
 _CONFIGURE_DEP=	patch
 _CONFIGURE_SEQ=	150:build-depends 151:lib-depends 160:create-binary-alias \
 				161:create-binary-wrappers \
-				200:configure-message \
+				200:configure-message 210:apply-slist \
 				300:pre-configure 450:pre-configure-script \
 				490:run-autotools-fixup 500:do-configure 700:post-configure \
 				850:post-configure-script \
@@ -5316,7 +5314,7 @@
 # STAGE is special in its numbering as it has install and stage, so install is
 # the main, and stage goes after.
 _STAGE_SEQ=		050:stage-message 100:stage-dir 150:run-depends \
-				200:apply-slist 300:pre-install \
+				300:pre-install \
 				400:generate-plist 450:pre-su-install 475:create-users-groups \
 				500:do-install 550:kmod-post-install 600:fixup-lib-pkgconfig 700:post-install \
 				750:post-install-script 800:post-stage 850:compress-man \
Index: japanese/font-ayu18/Makefile
===================================================================
--- japanese/font-ayu18/Makefile
+++ japanese/font-ayu18/Makefile
@@ -25,8 +25,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Index: japanese/font-ayu20/Makefile
===================================================================
--- japanese/font-ayu20/Makefile
+++ japanese/font-ayu20/Makefile
@@ -24,8 +24,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
 	    ${STAGEDIR}${FONTSDIR}
Index: japanese/font-elisa10/Makefile
===================================================================
--- japanese/font-elisa10/Makefile
+++ japanese/font-elisa10/Makefile
@@ -31,8 +31,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
Index: japanese/font-elisa8/Makefile
===================================================================
--- japanese/font-elisa8/Makefile
+++ japanese/font-elisa8/Makefile
@@ -31,8 +31,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
Index: japanese/font-kaname12/Makefile
===================================================================
--- japanese/font-kaname12/Makefile
+++ japanese/font-kaname12/Makefile
@@ -28,8 +28,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
Index: japanese/font-kanji18/Makefile
===================================================================
--- japanese/font-kanji18/Makefile
+++ japanese/font-kanji18/Makefile
@@ -50,8 +50,6 @@
 	    ${SED} -f ${RESIZESED_FILE} < ${PORTNAME}${PKGNAMESUFFIX}.bdf \
 	    > ${PORTNAME}${RESIZESED_FILE:R:C/^[0-9][0-9]to//}.bdf
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias.${PKGNAMESUFFIX} \
 	    ${STAGEDIR}${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX}
Index: japanese/font-kappa20/Makefile
===================================================================
--- japanese/font-kappa20/Makefile
+++ japanese/font-kappa20/Makefile
@@ -26,7 +26,7 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
+pre-build:
 	cd ${WRKSRC} && ${SH} makebdf.sh
 
 post-install-DOCS-on:
Index: japanese/font-marumoji/Makefile
===================================================================
--- japanese/font-marumoji/Makefile
+++ japanese/font-marumoji/Makefile
@@ -27,7 +27,7 @@
 ${WRKSRC}/maru16.bdf:
 	cd ${WRKSRC} && ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf
 
-pre-build: ${WRKSRC}/maru16.bdf apply-slist
+pre-build: ${WRKSRC}/maru16.bdf
 	${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}
 
 .include <bsd.port.mk>
Index: japanese/font-naga10/Makefile
===================================================================
--- japanese/font-naga10/Makefile
+++ japanese/font-naga10/Makefile
@@ -28,8 +28,6 @@
 
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR}
 
Index: japanese/font-shinonome/Makefile
===================================================================
--- japanese/font-shinonome/Makefile
+++ japanese/font-shinonome/Makefile
@@ -33,8 +33,6 @@
 		DESIGN.16 DESIGN.18 INSTALL README THANKS TODO
 OPTIONS_DEFINE=	DOCS
 
-pre-build: apply-slist
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
Index: japanese/kinput2/Makefile
===================================================================
--- japanese/kinput2/Makefile
+++ japanese/kinput2/Makefile
@@ -87,7 +87,7 @@
 CONF+=	TRANSPORTDEFS="-DNO_TCP_TRANSPORT"
 .endif
 
-pre-configure: apply-slist
+pre-configure:
 	${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf
 	${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf
 
Index: japanese/onew/Makefile
===================================================================
--- japanese/onew/Makefile
+++ japanese/onew/Makefile
@@ -51,8 +51,6 @@
 .endif
 .endfor
 
-pre-build: apply-slist
-
 do-build:
 .for I in ${INPUT_METHOD}
 	${INSTALL_DATA} ${WRKDIR}/ONEW_CONF-for-${I} ${WRKSRC}/ONEW_CONF
Index: japanese/sj3-lib/Makefile
===================================================================
--- japanese/sj3-lib/Makefile
+++ japanese/sj3-lib/Makefile
@@ -33,7 +33,7 @@
 post-patch:
 	cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH}
 
-pre-configure: apply-slist
+pre-configure:
 	${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl
 
 .include <bsd.port.mk>
Index: japanese/sj3-server/Makefile
===================================================================
--- japanese/sj3-server/Makefile
+++ japanese/sj3-server/Makefile
@@ -54,7 +54,7 @@
 	cd ${WRKSRC} && ${CAT} ${POSTPATCHES.nodocports} | ${PATCH}
 .endif
 
-pre-configure: apply-slist
+pre-configure:
 	${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl
 
 post-install:
Index: lang/ghc/Makefile
===================================================================
--- lang/ghc/Makefile
+++ lang/ghc/Makefile
@@ -205,7 +205,7 @@
 		${WRKSRC}/configure ${WRKSRC}/aclocal.m4
 .endif
 
-pre-configure: apply-slist
+pre-configure:
 	# Copy the subbed build.mk to the proper position
 	${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk
 
Index: lang/tcl-wrapper/Makefile
===================================================================
--- lang/tcl-wrapper/Makefile
+++ lang/tcl-wrapper/Makefile
@@ -55,7 +55,7 @@
 		TX_CAT="${TX_CAT}" TX_VER="${TX_VER}" TX_CONF="${TX_CONF}" \
 		TX_CONF_FULL="${TX_CONF_FULL:S/${STAGEDIR}//}"
 
-do-build: apply-slist
+do-build:
 	${MAKE_ENV} ${LOCALBASE}/bin/shc -r -f ${WRKDIR}/wrapper
 
 do-install:
Index: misc/amanda-perl-wrapper/Makefile
===================================================================
--- misc/amanda-perl-wrapper/Makefile
+++ misc/amanda-perl-wrapper/Makefile
@@ -18,8 +18,6 @@
 do-fetch:
 	@${DO_NADA}
 
-pre-build: apply-slist
-
 do-build:
 	cd ${WRKSRC} && ${CC} -o perl-amanda ${WRKDIR}/perl-amanda.c
 
Index: net/pxe-pdhcp/Makefile
===================================================================
--- net/pxe-pdhcp/Makefile
+++ net/pxe-pdhcp/Makefile
@@ -19,7 +19,7 @@
 
 OPTIONS_DEFINE=	DOCS
 
-post-extract: apply-slist
+pre-build:
 	@${INSTALL_DATA} ${WRKDIR}/Makefile ${FILESDIR}/${PORTNAME}.8 ${WRKSRC}
 
 .include <bsd.port.mk>
Index: print/ghostscript7-commfont/Makefile
===================================================================
--- print/ghostscript7-commfont/Makefile
+++ print/ghostscript7-commfont/Makefile
@@ -31,7 +31,7 @@
 CMAPDIR?=	${LOCALBASE}/share/fonts/adobe-cmaps
 GS_RESDIR?=	share/ghostscript/Resource
 
-post-extract:	apply-slist
+pre-build:
 	@cd ${WRKDIR} && ${MV} Makefile template.* ${WRKSRC}
 
 .include <bsd.port.mk>
Index: security/ca_root_nss/Makefile
===================================================================
--- security/ca_root_nss/Makefile
+++ security/ca_root_nss/Makefile
@@ -34,7 +34,7 @@
 SUB_FILES=	MAca-bundle.pl pkg-message
 SUB_LIST=	VERSION_NSS=${VERSION_NSS}
 
-do-build:	apply-slist
+do-build:
 	@${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \
 		${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \
 	    < ${WRKSRC}/${CERTDATA_TXT_PATH} > \
Index: security/ipv6toolkit/Makefile
===================================================================
--- security/ipv6toolkit/Makefile
+++ security/ipv6toolkit/Makefile
@@ -26,7 +26,7 @@
 post-extract:
 	@cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS}
 
-post-patch: apply-slist
+pre-build:
 	${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC}
 	for D in ${PROGDIRS}; do \
 		${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \
Index: x11/waybar/Makefile
===================================================================
--- x11/waybar/Makefile
+++ x11/waybar/Makefile
@@ -29,7 +29,6 @@
 .if exists(${.CURDIR}/files/date.pc.in)
 CONFIGURE_ENV+=	PKG_CONFIG_PATH="${WRKDIR}"
 SUB_FILES+=	date.pc
-post-patch:	apply-slist
 .endif
 
 OPTIONS_DEFINE=	DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV