*: Move SUBST_STAGE from post-patch to pre-configure

Performing substitutions during post-patch breaks tools such as mkpatches,
making it very difficult to regenerate correct patches after making changes,
and often leading to substituted string replacements being committed.

28 files changed, 62 insertions, 62 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index 5ef16e39c5c..2ede450af12 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/26 09:54:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	accountsservice-0.6.42
 CATEGORIES=	sysutils
@@ -35,7 +35,7 @@ CONF_FILES+=	${EGDIR}/dbus-1/system.d/org.freedesktop.Accounts.conf \
 
 SUBST_CLASSES+=		gdm
 SUBST_FILES.gdm=	src/daemon.c
-SUBST_STAGE.gdm=	post-patch
+SUBST_STAGE.gdm=	pre-configure
 SUBST_SED.gdm=		-e 's,/etc/gdm/custom.conf,${PKG_SYSCONFDIR}/gdm/custom.conf,g'
 
 BUILD_DEPENDS+=	gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 4b256c51271..c245f0d4086 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2016/02/29 05:50:40 mlelstv Exp $
+# $NetBSD: Makefile.common,v 1.43 2018/07/04 13:40:36 jperkin Exp $
 
 # used by sysutils/amanda-common/Makefile
 # used by sysutils/amanda-client/Makefile
@@ -54,7 +54,7 @@ AUTO_MKDIRS=		yes
 
 SUBST_CLASSES+=		bool
 SUBST_MESSAGE.bool=	Fix SWIG messing with stdbool.h.
-SUBST_STAGE.bool=	post-patch
+SUBST_STAGE.bool=	pre-configure
 SUBST_FILES.bool=	perl/Amanda/*.c perl/Amanda/*/*.c
 SUBST_SED.bool=	-e '/undef bool/d'
 
diff --git a/sysutils/bcmfw/Makefile b/sysutils/bcmfw/Makefile
index b6b373a4d79..f9a49c14f30 100644
--- a/sysutils/bcmfw/Makefile
+++ b/sysutils/bcmfw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/12/21 10:36:44 plunky Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=		bcmfw-2.2
 CATEGORIES=		sysutils
@@ -33,7 +33,7 @@ PLIST_SUBST+=		FIRMWARE_DIR=${FIRMWARE_DIR}
 SUBST_CLASSES+=		dir
 SUBST_FILES.dir=	bcmfw.8
 SUBST_SED.dir=		-e 's,/libdata/bcmfw,${PREFIX}/${FIRMWARE_DIR}&,'
-SUBST_STAGE.dir=	post-patch
+SUBST_STAGE.dir=	pre-configure
 SUBST_MESSAGE.dir=	Fixing path to firmware directory.
 
 USE_BSD_MAKEFILE=	yes
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 3fbde56950e..1d1582ce80b 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2018/04/22 17:57:47 tron Exp $
+# $NetBSD: Makefile,v 1.117 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	cdrtools-3.01
 PKGNAME=	${DISTNAME:S/a/alpha/:S/-pre/pre/}
@@ -79,7 +79,7 @@ INSTALLATION_DIRS=	bin lib/siconv ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 \
 			share/examples/cdrtools
 
 SUBST_CLASSES+=		fix
-SUBST_STAGE.fix=	post-patch
+SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix=	btcflash/btcflash.1
 SUBST_FILES.fix+=	cdrecord/cdrecord.1
 SUBST_FILES.fix+=	libcdrdeflt/cdrdeflt.c
@@ -89,7 +89,7 @@ SUBST_SED.fix=		-e "s,/etc/default/cdrecord,${CDRECORD_CONF},g"
 SUBST_MESSAGE.fix=	Fixing paths.
 
 SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	post-patch
+SUBST_STAGE.oss=	pre-configure
 SUBST_FILES.oss=	cdda2wav/local.cnf.in
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSSOUND},g"
 SUBST_MESSAGE.oss=	Fixing OSS sound device path.
diff --git a/sysutils/dbus-sharp-glib/Makefile b/sysutils/dbus-sharp-glib/Makefile
index 8eff9c4d538..b980e13d600 100644
--- a/sysutils/dbus-sharp-glib/Makefile
+++ b/sysutils/dbus-sharp-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/04/14 07:34:02 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:36 jperkin Exp $
 #
 
 DISTNAME=	dbus-sharp-glib-0.5.0
@@ -18,7 +18,7 @@ USE_TOOLS+=	gmake pkg-config
 PKGCONFIG_OVERRIDE+=	dbus-sharp-glib-1.0.pc.in
 
 SUBST_CLASSES+=         fix-mcs
-SUBST_STAGE.fix-mcs=    post-patch
+SUBST_STAGE.fix-mcs=    pre-configure
 SUBST_MESSAGE.fix-mcs=  Fix compiler name
 SUBST_FILES.fix-mcs=    configure
 SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
diff --git a/sysutils/dbus-sharp/Makefile b/sysutils/dbus-sharp/Makefile
index a6a3f1b72f6..0c26a94c63e 100644
--- a/sysutils/dbus-sharp/Makefile
+++ b/sysutils/dbus-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/04/14 07:34:02 adam Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:37 jperkin Exp $
 #
 
 DISTNAME=	dbus-sharp-0.7.0
@@ -18,7 +18,7 @@ USE_LANGUAGES=	# none
 PKGCONFIG_OVERRIDE+=	dbus-sharp-1.0.pc.in
 
 SUBST_CLASSES+=         fix-mcs
-SUBST_STAGE.fix-mcs=    post-patch
+SUBST_STAGE.fix-mcs=    pre-configure
 SUBST_MESSAGE.fix-mcs=  Fix compiler name
 SUBST_FILES.fix-mcs=    configure
 SUBST_SED.fix-mcs=      -e 's,gmcs,mcs,'
diff --git a/sysutils/dc-tools/Makefile b/sysutils/dc-tools/Makefile
index ad1fbb3350e..20287a0a370 100644
--- a/sysutils/dc-tools/Makefile
+++ b/sysutils/dc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:25 agc Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=	dc-tools-1.6
 CATEGORIES=	sysutils
@@ -28,7 +28,7 @@ EXTRACT_CMD=	${CP} ${DISTDIR}/${DIST_SUBDIR}/scramble.c ${WRKSRC} && \
 	${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/serial_slave.tar.gz -C serial
 
 SUBST_CLASSES+=		IP_TMPL
-SUBST_STAGE.IP_TMPL=	post-patch
+SUBST_STAGE.IP_TMPL=	pre-configure
 SUBST_FILES.IP_TMPL=	makeip.c
 SUBST_SED.IP_TMPL=	-e "s|"IP.TMPL"|"${PREFIX}/share/dc-tools/IP.TMPL"|"
 SUBST_MESSAGE.IP_TMPL=	Update path to IP.TMPL
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 28816875ed0..990cbd83aed 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/12/08 08:12:58 adam Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=	e2fsprogs-1.43.7
 CATEGORIES=	sysutils
@@ -40,7 +40,7 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} root_sysconfdir=${EGDIR}
 
 SUBST_CLASSES+=		man
 SUBST_MESSAGE.man=	Give correct path for man page
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man+=	misc/mke2fs.8.in
 SUBST_FILES.man+=	misc/mke2fs.conf.5.in
 SUBST_FILES.man+=	e2fsck/e2fsck.conf.5.in
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index ad6746bd63f..f00e9aba50f 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/02/16 00:45:28 wiedi Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:37 jperkin Exp $
 
 .include "../../sysutils/gkrellm/Makefile.common"
 
@@ -32,7 +32,7 @@ PKG_SUPPORTED_OPTIONS=	glib1
 .include "../../mk/bsd.options.mk"
 
 SUBST_CLASSES+=		gkprefix
-SUBST_STAGE.gkprefix=	post-patch
+SUBST_STAGE.gkprefix=	pre-configure
 SUBST_FILES.gkprefix=	server/gkrellmd.h
 SUBST_SED.gkprefix=	-e '/GKRELLMD_SYS_ETC/{s!/etc!${PKG_SYSCONFDIR}!;}'
 
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 670a7389fda..1bb75759f41 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2018/04/17 22:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2018/07/04 13:40:37 jperkin Exp $
 .include "Makefile.common"
 
 PKGREVISION=		33
@@ -34,7 +34,7 @@ MAKE_FLAGS+=		BINOWNER=${BINOWN} BINGROUP=${BINGRP}
 INSTALL_MAKE_FLAGS+=	MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 INSTALL_MAKE_FLAGS+=	SMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
-SUBST_STAGE.gkprefix=	post-patch
+SUBST_STAGE.gkprefix=	pre-configure
 SUBST_FILES.gkprefix=	src/gkrellm.h
 SUBST_SED.gkprefix=	-e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
 SUBST_CLASSES+=		gkprefix
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 4c306893de2..141bf8b9ecc 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/08/16 20:45:45 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:37 jperkin Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
@@ -24,7 +24,7 @@ LDFLAGS.DragonFly=	-lintl
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	audio_oss.c
 SUBST_SED.paths+=	-e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index a1ad64fdf3f..6f05a0bdd9a 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=	grub-0.97
 PKGREVISION=	10
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	${GRUB_SCAN_ARGS}
 .endif
 
 SUBST_CLASSES+=		grubterm
-SUBST_STAGE.grubterm=	post-patch
+SUBST_STAGE.grubterm=	pre-configure
 SUBST_MESSAGE.grubterm=	Changing references to <term.h> to <grubterm.h>
 SUBST_FILES.grubterm=	grub/*.c stage2/Makefile.in stage2/*.c
 SUBST_SED.grubterm=	-e "s,<term.h>,<grubterm.h>,g"
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
index 75aca3a76c2..b4bf2f6c433 100644
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/05/23 10:45:54 maya Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=		grub-2.02
 PKGNAME=		${DISTNAME:S/grub/grub2/}
@@ -102,7 +102,7 @@ do-install-custom-config:
 # Force installation of all OS configuration scripts in ${EGDIR}.
 #
 SUBST_CLASSES+=			fix-os-conf
-SUBST_STAGE.fix-os-conf=	post-patch
+SUBST_STAGE.fix-os-conf=	pre-configure
 SUBST_MESSAGE.fix-os-conf=	Fixing installation of OS configuration scripts.
 SUBST_FILES.fix-os-conf=	Makefile.in
 SUBST_SED.fix-os-conf=		-e 's,^@COND_HOST_[A-Z]*_TRUE@,,g'
@@ -111,7 +111,7 @@ SUBST_SED.fix-os-conf=		-e 's,^@COND_HOST_[A-Z]*_TRUE@,,g'
 # Adjust the configuration paths in scripts.
 #
 SUBST_CLASSES+=			fix-paths-1
-SUBST_STAGE.fix-paths-1=	post-patch
+SUBST_STAGE.fix-paths-1=	pre-configure
 SUBST_MESSAGE.fix-paths-1=	Fixing configuration paths in scripts.
 SUBST_FILES.fix-paths-1=	util/grub-install.in util/grub-mkconfig.in
 SUBST_SED.fix-paths-1=		-e 's,\(\$${sysconfdir}"\{0\,1\}\)/grub.d,\1,g'
@@ -130,7 +130,7 @@ SUBST_SED.fix-dejavu=		-e 's, \(/usr/share/fonts/dejavu\), \1 ${PREFIX}/share/fo
 # Do not use `\t' with sed, as it's not portable.
 #
 SUBST_CLASSES+=			fix-sed-tabs
-SUBST_STAGE.fix-sed-tabs=	post-patch
+SUBST_STAGE.fix-sed-tabs=	pre-configure
 SUBST_MESSAGE.fix-sed-tabs=	Fixing tabulations for sed in scripts.
 SUBST_FILES.fix-sed-tabs=	util/grub.d/*.in
 SUBST_SED.fix-sed-tabs=		-e 's,\\t,	,g'
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index ae380ee03e4..02327e18a68 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2018/04/29 21:32:03 adam Exp $
+# $NetBSD: Makefile,v 1.95 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=		k3b-2.0.3a
 PKGREVISION=		18
@@ -25,7 +25,7 @@ CONF_FILES=		${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \
 ONLY_FOR_PLATFORM=	FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
 
 SUBST_CLASSES+=		pathfix
-SUBST_STAGE.pathfix=	post-patch
+SUBST_STAGE.pathfix=	pre-configure
 SUBST_MESSAGE.pathfix=	Add cdrtools path.
 SUBST_FILES.pathfix=	libk3b/core/k3bexternalbinmanager.cpp
 SUBST_SED.pathfix=	-e 's:"/usr/bin/":"${LOCALBASE}/bin", "/usr/bin/":g'
diff --git a/sysutils/mc46/Makefile b/sysutils/mc46/Makefile
index 91a54a24192..30300695db6 100644
--- a/sysutils/mc46/Makefile
+++ b/sysutils/mc46/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/03/22 08:14:52 adam Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:37 jperkin Exp $
 
 DISTNAME=	mc-4.6.1
 PKGREVISION=	21
@@ -30,7 +30,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 
 PKG_SYSCONFSUBDIR=	mc
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	vfs/extfs.c vfs/sfs.c
 SUBST_VARS.conf=	PKG_SYSCONFDIR
 
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 61c70e6975e..e35129dc776 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/07 09:42:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:37 jperkin Exp $
 #
 
 DISTNAME=	mcollective-2.1.1
@@ -45,13 +45,13 @@ SUBST_FILES.confpath=	${WRKSRC}/bin/mcollectived		\
 			${WRKSRC}/lib/mcollective/util.rb	\
 			${WRKSRC}/lib/mcollective/rpc.rb
 SUBST_SED.confpath=	-e "s,/etc/mcollective,${PKG_SYSCONFDIR},"
-SUBST_STAGE.confpath=	post-patch
+SUBST_STAGE.confpath=	pre-configure
 
 SUBST_CLASSES+=		sharepath
 SUBST_FILES.sharepath=	${WRKSRC}/etc/server.cfg.dist		\
 			${WRKSRC}/etc/client.cfg.dist
 SUBST_SED.sharepath=	-e "s,/usr/libexec/mcollective,${PREFIX}/share,"
-SUBST_STAGE.sharepath=	post-patch
+SUBST_STAGE.sharepath=	pre-configure
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mcollectived ${DESTDIR}${PREFIX}/sbin
diff --git a/sysutils/memtestplus/options.mk b/sysutils/memtestplus/options.mk
index 1ca0e599f7c..aca549b2f0a 100644
--- a/sysutils/memtestplus/options.mk
+++ b/sysutils/memtestplus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/04 16:07:34 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2018/07/04 13:40:38 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.memtestplus
 PKG_SUPPORTED_OPTIONS=	iso serialconsole
@@ -15,7 +15,7 @@ PLIST.iso=		yes
 
 .if !empty(PKG_OPTIONS:Mserialconsole)
 SUBST_CLASSES+=		serialopt
-SUBST_STAGE.serialopt=	post-patch
+SUBST_STAGE.serialopt=	pre-configure
 SUBST_MESSAGE.serialopt=	Setting serial console option
 SUBST_FILES.serialopt=	config.h
 SUBST_SED.serialopt=	-e '/define.*SERIAL_CONSOLE_DEFAULT/s/0/1/'
diff --git a/sysutils/ndesk-dbus-glib/Makefile b/sysutils/ndesk-dbus-glib/Makefile
index 3020dc96104..0038f970452 100644
--- a/sysutils/ndesk-dbus-glib/Makefile
+++ b/sysutils/ndesk-dbus-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/14 07:34:02 adam Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	ndesk-dbus-glib-0.4.1
 PKGREVISION=	23
@@ -15,7 +15,7 @@ USE_TOOLS+=	pkg-config gmake
 PKGCONFIG_OVERRIDE+=	ndesk-dbus-glib-1.0.pc.in
 
 SUBST_CLASSES+=		fix-mcs
-SUBST_STAGE.fix-mcs=	post-patch
+SUBST_STAGE.fix-mcs=	pre-configure
 SUBST_MESSAGE.fix-mcs=	Fix compiler name
 SUBST_FILES.fix-mcs=	configure
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/sysutils/ndesk-dbus/Makefile b/sysutils/ndesk-dbus/Makefile
index d9461724fe8..5586efb8971 100644
--- a/sysutils/ndesk-dbus/Makefile
+++ b/sysutils/ndesk-dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/14 07:34:41 adam Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	ndesk-dbus-0.6.1a
 PKGREVISION=	22
@@ -17,7 +17,7 @@ DEPENDS+=	dbus>=1.0:../../sysutils/dbus
 PKGCONFIG_OVERRIDE+=	ndesk-dbus-1.0.pc.in
 
 SUBST_CLASSES+=		fix-mcs
-SUBST_STAGE.fix-mcs=	post-patch
+SUBST_STAGE.fix-mcs=	pre-configure
 SUBST_MESSAGE.fix-mcs=	Fix compiler name
 SUBST_FILES.fix-mcs=	configure
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 7805d2ea3e9..b6402a2ce72 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/03/12 11:17:37 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	pfstat-2.5
 PKGREVISION=	11
@@ -18,7 +18,7 @@ MAKE_ENV+=	PF_VERSION=${PF_VERSION:S/.//} NOGCCERROR=yes
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8 share/examples/pfstat
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	pfstat.8 pfstat.c pfstat.conf.example
 SUBST_SED.conf=		-e "s|/etc/pfstat.conf|${PKG_SYSCONFDIR}/pfstat.conf|g"
 SUBST_MESSAGE.conf=	Fixing configuration file paths.
diff --git a/sysutils/polysh/Makefile b/sysutils/polysh/Makefile
index ea099923474..913e7bd8e9d 100644
--- a/sysutils/polysh/Makefile
+++ b/sysutils/polysh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/07/03 05:03:34 adam Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	polysh-0.4
 PKGREVISION=	1
@@ -17,7 +17,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.4
 REPLACE_PYTHON=	polysh/rb_tree.py
 
 SUBST_CLASSES+=		setup
-SUBST_STAGE.setup=	post-patch
+SUBST_STAGE.setup=	pre-configure
 SUBST_FILES.setup=	setup.py
 SUBST_SED.setup+=	-e 's,share/man,${PKGMANDIR},'
 
diff --git a/sysutils/puppet/Makefile b/sysutils/puppet/Makefile
index 04cc5e753a7..a827a952556 100644
--- a/sysutils/puppet/Makefile
+++ b/sysutils/puppet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/03/23 14:31:46 taca Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=		puppet-5.5.0
 CATEGORIES=		sysutils
@@ -20,7 +20,7 @@ PKG_SYSCONFSUBDIR=	puppet
 RCD_SCRIPTS=		puppetd puppetmasterd
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	install.rb
 SUBST_FILES.prefix+=	lib/puppet/face/module/changes.rb
 SUBST_FILES.prefix+=	lib/puppet/face/module/install.rb
diff --git a/sysutils/py-euca2ools/Makefile b/sysutils/py-euca2ools/Makefile
index f7075a57c0a..55f6d264f9e 100644
--- a/sysutils/py-euca2ools/Makefile
+++ b/sysutils/py-euca2ools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/14 13:57:30 adam Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	euca2ools-3.4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -25,7 +25,7 @@ PYTHON_VERSIONS_ACCEPTED=	27
 EGG_NAME=	${DISTNAME:C/-([^0-9])/_\1/g:S/.1$/_devel/}
 
 SUBST_CLASSES+=		setup
-SUBST_STAGE.setup=	post-patch
+SUBST_STAGE.setup=	pre-configure
 SUBST_MESSAGE.setup=	Fixing setup.
 SUBST_FILES.setup=	setup.py
 SUBST_SED.setup=	-e 's,share/man,${PKGMANDIR},g'
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 5f0d990725a..c9fe2f5aab1 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/07/03 05:03:34 adam Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:38 jperkin Exp $
 
 DISTNAME=	rdiff-backup-1.2.8
 PKGREVISION=	8
@@ -12,7 +12,7 @@ COMMENT=	Remote incremental backup utility
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 1.2.8
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	setup.py
 SUBST_SED.path=		-e "s|share/man|${PKGMANDIR}|"
 SUBST_MESSAGE.path=	Fixing path to manpages.
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index 3bcdc2c4c8b..f088a998c25 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2018/04/16 14:35:13 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2018/07/04 13:40:38 jperkin Exp $
 #
 
 DISTNAME=	rox-filer-2.10
@@ -26,7 +26,7 @@ INSTALLATION_DIRS=	bin libexec/rox ${PKGMANDIR}/man1 \
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	ROX-Filer/AppRun
 SUBST_FILES.path+=	ROX-Filer/src/choices.c
 SUBST_FILES.path+=	ROX-Filer/src/type.c
@@ -35,7 +35,7 @@ SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=		bin
 SUBST_MESSAGE.bin=	Fixing binary path.
-SUBST_STAGE.bin=	post-patch
+SUBST_STAGE.bin=	pre-configure
 SUBST_FILES.bin=	ROX-Filer/AppRun
 SUBST_SED.bin=		-e 's,BIN="$$APP_DIR,BIN="${PREFIX}/libexec/rox,g'
 
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index abda7259380..d357fde267d 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/02/26 10:24:13 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:38 jperkin Exp $
 #
 
 DISTNAME=		su2-1.3
@@ -20,7 +20,7 @@ NO_CONFIGURE=		yes
 
 SUBST_CLASSES+=		preproc
 SUBST_MESSAGE.preproc=	Correcting C preprocessor directives.
-SUBST_STAGE.preproc=	post-patch
+SUBST_STAGE.preproc=	pre-configure
 SUBST_FILES.preproc=	su2.c
 SUBST_SED.preproc=	-e 's,^\(\# *else\).*,\1,'
 SUBST_SED.preproc=	-e 's,^\(\# *endif\).*,\1,'
diff --git a/sysutils/xe-guest-utilities/Makefile b/sysutils/xe-guest-utilities/Makefile
index 2b8e155cccf..68990a09da1 100644
--- a/sysutils/xe-guest-utilities/Makefile
+++ b/sysutils/xe-guest-utilities/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/04/20 08:05:30 sborrill Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:38 jperkin Exp $
 #
 
 # Values from XenServer 6.5.0 = 6, 5, 0, 90977
@@ -34,13 +34,13 @@ NO_BUILD=	yes
 
 RCD_SCRIPTS=		xenguest
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	${SRCFILES}
 SUBST_SED.paths=	-e "s,@VARBASE@,${VARBASE},g"
 SUBST_SED.paths+=	-e "s,@PREFIX@,${PREFIX},g"
 
 SUBST_CLASSES+=		version
-SUBST_STAGE.version=	post-patch
+SUBST_STAGE.version=	pre-configure
 SUBST_FILES.version=	xe-update-guest-attrs
 SUBST_SED.version=	-e "s,@XENMAJOR@,${XENMAJOR},g"
 SUBST_SED.version+=	-e "s,@XENMINOR@,${XENMINOR},g"
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index eb369838300..d725c0eb9ac 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2018/03/12 11:17:39 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2018/07/04 13:40:39 jperkin Exp $
 
 DISTNAME=	xfe-1.40
 PKGREVISION=	3
@@ -19,7 +19,7 @@ LDFLAGS.DragonFly=	-lXft -lX11
 PTHREAD_AUTO_VARS=	yes
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	src/XFileExplorer.cpp
 SUBST_SED.conf=		-e "s|/usr/local|${PREFIX}|"
 SUBST_MESSAGE.conf=	Fixing hardcoded path.