*: 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.
author: jperkin <jperkin@pkgsrc.org> 2018-07-04 13:40:07 +0000
committer: jperkin <jperkin@pkgsrc.org> 2018-07-04 13:40:07 +0000
commit: 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch)
tree: 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6
parent: 063580a062ba10ffba035c8d96b541b5ce7a426d (diff)
download: pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz
424 files changed, 941 insertions, 941 deletions
diff --git a/archivers/dar/Makefile b/archivers/dar/Makefile
index 02049adeb9a..d0e2960d320 100644
--- a/archivers/dar/Makefile
+++ b/archivers/dar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/01/26 13:38:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:07 jperkin Exp $
 
 DISTNAME=	dar-2.4.13
 PKGREVISION=	1
@@ -96,7 +96,7 @@ CPPFLAGS.SunOS+=	-D__EXTENSIONS__
 ## Build a static binary with threads is currently broken with glibc.
 .if ${OPSYS} == "Linux" && !empty(PKG_OPTIONS:Mthreads)
 SUBST_CLASSES+=		static
-SUBST_STAGE.static=	post-patch
+SUBST_STAGE.static=	pre-configure
 SUBST_MESSAGE.static=	Changing -all-static to -static
 SUBST_FILES.static=	src/testing/Makefile.in
 SUBST_SED.static=	-e 's,-all-static,-static,g'
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 98bb850716a..758976d368e 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2014/10/09 14:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:07 jperkin Exp $
 
 DISTNAME=	freeze-2.5
 PKGREVISION=	3
@@ -19,7 +19,7 @@ CFLAGS+=	-DCOMPAT=1
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		freeze
-SUBST_STAGE.freeze=	post-patch
+SUBST_STAGE.freeze=	pre-configure
 SUBST_FILES.freeze=	*.1
 SUBST_SED.freeze=	-e 's|@PREFIX@|${PREFIX}|g'
 
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 250ea96ca47..569755b5836 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2018/03/21 18:47:02 kamil Exp $
+# $NetBSD: Makefile,v 1.66 2018/07/04 13:40:08 jperkin Exp $
 
 DISTNAME=	p7zip_16.02_src_all
 PKGNAME=	${DISTNAME:S/_src_all//S/_/-/}
@@ -33,7 +33,7 @@ INSTALLATION_DIRS+=	share/doc/p7zip/switches
 SUBST_CLASSES+=		lib
 SUBST_FILES.lib+=	CPP/7zip/UI/Common/LoadCodecs.cpp
 SUBST_SED.lib+=		-e "s,getenv(.P7ZIP_HOME_DIR.),\"${PREFIX}/lib/\","
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile
index 1b7fec6c39d..678c05081a9 100644
--- a/archivers/rox-archive/Makefile
+++ b/archivers/rox-archive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/05/17 16:10:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	archive-2.0
@@ -28,7 +28,7 @@ INSTALLATION_DIRS=	share/rox/Archive
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/archivers/sarab/Makefile b/archivers/sarab/Makefile
index b466894b565..4eb51b4e278 100644
--- a/archivers/sarab/Makefile
+++ b/archivers/sarab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/05/14 21:06:11 mef Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:08 jperkin Exp $
 
 DISTNAME=	sarab-1.0.0
 CATEGORIES=	archivers
@@ -25,20 +25,20 @@ CONF_FILES+= ${EGDIR}/sarab.conf	${PKG_SYSCONFDIR}/sarab.conf
 CONF_FILES+= ${EGDIR}/sarab.dcf	${PKG_SYSCONFDIR}/sarab.dcf
 
 SUBST_CLASSES+=		dar
-SUBST_STAGE.dar=	post-patch
+SUBST_STAGE.dar=	pre-configure
 SUBST_MESSAGE.dar=	Fix path to DAR utilities
 SUBST_FILES.dar=	etc/sarab.conf
 SUBST_SED.dar=		-e "s|/usr/local/bin/dar|${PREFIX}/bin/dar|"
 
 # archivers/dar disables building "dar_static"
 SUBST_CLASSES+=		nocopy
-SUBST_STAGE.nocopy=	post-patch
+SUBST_STAGE.nocopy=	pre-configure
 SUBST_MESSAGE.nocopy=	Do not copy dar_static
 SUBST_FILES.nocopy=	etc/sarab.conf
 SUBST_SED.nocopy=	-e "s|COPY_DAR=\"yes\"|COPY_DAR=\"no\"|"
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_MESSAGE.conf=	Fix path to SaraB configuration files
 SUBST_FILES.conf=	sarab.sh etc/sarab.conf
 SUBST_SED.conf=		-e "s|/etc/sarab|${PKG_SYSCONFDIR}|"
@@ -46,7 +46,7 @@ SUBST_SED.conf=		-e "s|/etc/sarab|${PKG_SYSCONFDIR}|"
 # NetBSD has /kern, and does not have /sys.  Other platforms might
 # differ.
 SUBST_CLASSES+=		prune
-SUBST_STAGE.prune=	post-patch
+SUBST_STAGE.prune=	pre-configure
 SUBST_MESSAGE.prune=	Prune /kern instead of /sys
 SUBST_FILES.prune=	etc/sarab.dcf
 SUBST_SED.prune=	-e "s|--prune sys|--prune kern|"
diff --git a/archivers/zutils/Makefile b/archivers/zutils/Makefile
index 34d7e928977..9a0167cc721 100644
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/04/09 11:39:19 mef Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	zutils-1.6
@@ -26,7 +26,7 @@ EGDIR=			${PREFIX}/share/examples/zutils
 CONF_FILES=		${EGDIR}/zutilsrc ${PREFIX}/etc/zutilsrc
 
 SUBST_CLASSES+=		sysconfdir
-SUBST_STAGE.sysconfdir=	post-patch
+SUBST_STAGE.sysconfdir=	pre-configure
 SUBST_FILES.sysconfdir= zutilsrc
 SUBST_MESSAGE.sysconfdir= path of sysconfdir in example (zutilsrc)
 SUBST_SED.sysconfdir=	-e '/sysconfdir/s,$${sysconfdir},${PREFIX}/etc,'
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index d8f2dce752a..e77e2b02f33 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.179 2018/04/29 21:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.180 2018/07/04 13:40:08 jperkin Exp $
 
 DISTNAME=	amarok-${VERS}
 VERS=		2.8.0
@@ -30,7 +30,7 @@ CMAKE_ARGS+=	-DKDE4_BUILD_TESTS:BOOL=OFF
 REPLACE_PERL+=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
 
 SUBST_CLASSES+=		mysql
-SUBST_STAGE.mysql=	post-patch
+SUBST_STAGE.mysql=	pre-configure
 SUBST_MESSAGE.mysql=	Fixup paths for MySQL embedded
 SUBST_FILES.mysql=	cmake/modules/FindMySQLAmarok.cmake
 SUBST_FILES.mysql+=	src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 292208fd208..35f04f51dcf 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/04/20 12:10:25 nros Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:08 jperkin Exp $
 
 DISTNAME=		daapd-0.2.4b
 PKGREVISION=		1
@@ -30,7 +30,7 @@ FILES_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	daapd.8 daapd.cc
 SUBST_SED.paths=	-e 's,/etc/,${PKG_SYSCONFDIR}/,g'
 
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index c3d4801e615..a99209146b9 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2017/09/03 08:36:49 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:08 jperkin Exp $
 
 DISTNAME=		esound-0.2.41
 PKGREVISION=		3
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	--disable-local-sound
 .include "../../mk/oss.buildlink3.mk"
 MAKE_ENV+=		AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
 SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	post-patch
+SUBST_STAGE.oss=	pre-configure
 SUBST_FILES.oss=	configure
 SUBST_SED.oss=		-e 's,-lossaudio,${LIBOSSAUDIO},g'
 SUBST_MESSAGE.oss=	Fixing oss.
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 81875c88586..7c0a21bb0f0 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/04/20 12:10:26 nros Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	gramofile-1.6
@@ -25,7 +25,7 @@ do-install:
 	cd ${DESTDIR}${PREFIX}/bin && ${LN} -s bplay_gramo brec_gramo
 
 SUBST_CLASSES+=		snd
-SUBST_STAGE.snd=	post-patch
+SUBST_STAGE.snd=	pre-configure
 SUBST_FILES.snd=	bplaysrc/sndfunc.c
 SUBST_SED.snd=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.snd=	Fixing harcoded audio device.
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 765ea29cc74..523474257ea 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/01/04 16:50:31 roy Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	juke-0.7
@@ -20,7 +20,7 @@ CONF_FILES=	${EGDIR}/juke.conf.default ${PKG_SYSCONFDIR}/juke.conf
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	doc/juke.1 MANUAL src/conf.c
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},'
 
 INSTALLATION_DIRS=	${EGDIR} share/doc/juke
diff --git a/audio/liblo/Makefile b/audio/liblo/Makefile
index 21e20804ef0..a9a3883ae4e 100644
--- a/audio/liblo/Makefile
+++ b/audio/liblo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/09/15 13:56:58 wiedi Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	liblo-0.28
@@ -24,7 +24,7 @@ SUBST_CLASSES+=		conf
 SUBST_FILES.conf=	configure Makefile.in src/Makefile.in liblo.pc.in
 SUBST_MESSAGE.conf=	Performing build-time configuration substitutions.
 SUBST_SED.conf=		-e 's,-lpthread,$${PTHREAD_LDFLAGS} $${PTHREAD_LIBS},'
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_VARS.conf=	PTHREAD_CFLAGS PTHREAD_LDFLAGS PTHREAD_LIBS
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index bcfdf3b809a..8e9a38aad06 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/04/20 12:10:28 nros Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:08 jperkin Exp $
 #
 
 DISTNAME=	libvisual-0.4.0
@@ -26,7 +26,7 @@ RT_LIB_SCHED=		# empty
 .endif
 MAKE_ENV+=		RT_LIB_SCHED=${RT_LIB_SCHED}
 SUBST_CLASSES+=	rtlib
-SUBST_STAGE.rtlib=	post-patch
+SUBST_STAGE.rtlib=	pre-configure
 SUBST_FILES.rtlib=	libvisual.pc.in
 SUBST_VARS.rtlib=	RT_LIB_SCHED
 
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index 405880063fe..a73fb006c05 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/07/03 05:03:02 adam Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	moss-0.1.13
 PKGREVISION=	6
@@ -23,7 +23,7 @@ CONF_FILES=	${PREFIX}/share/moss/moss.conf.sample	\
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	moss.conf.sample
 SUBST_SED.path=		-e 's,$${PREFIX}/var,${VARBASE},g'
 SUBST_SED.path+=	-e 's,$${PREFIX}/share,${PREFIX}/share,g'
diff --git a/audio/mt-daapd/Makefile b/audio/mt-daapd/Makefile
index dc64005036d..f008bcee04e 100644
--- a/audio/mt-daapd/Makefile
+++ b/audio/mt-daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/01/28 20:10:42 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	mt-daapd-0.2.4.2
 PKGREVISION=	5
@@ -39,7 +39,7 @@ OWN_DIRS_PERMS=		${VARBASE}/cache/mt-daapd \
 .include "options.mk"
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	contrib/mt-daapd.conf
 SUBST_SED.conf=		-e "s,@PREFIX@,${PREFIX},"
 SUBST_SED.conf+=	-e "s,@VARBASE@,${VARBASE},g"
@@ -48,7 +48,7 @@ SUBST_SED.conf+=	-e "s,@MTDAAPD_USER@,${MTDAAPD_USER},"
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	src/main.c
 SUBST_SED.paths=	-e "s,/etc,${PKG_SYSCONFDIR},"
 SUBST_SED.paths+=	-e "s,/var,${VARBASE},"
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index e3c334a5a27..dd1fac26aee 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2018/04/16 14:34:07 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:09 jperkin Exp $
 #
 
 DISTNAME=	MuSE-0.9
@@ -28,7 +28,7 @@ MAKE_FLAGS+=		docsdir=${PREFIX:Q}/share/doc/MuSE
 LIBS.SunOS+=		-lsocket -lnsl
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_FILES.dsp=	src/jmixer.cpp src/libmpeg/fileplayer.cc
 SUBST_SED.dsp=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.dsp=	Fixing hardcoded audio device.
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index dde085d129a..b982e9ef7cf 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.167 2018/05/27 09:56:11 wiz Exp $
+# $NetBSD: Makefile,v 1.168 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=		mpd-0.20.20
 PKGNAME=		${DISTNAME:S/mpd/musicpd/}
@@ -36,7 +36,7 @@ RCD_SCRIPTS=		mpd
 FILES_SUBST+=		DEVOSSAUDIO=${DEVOSSAUDIO:Q}
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mpd.conf
 SUBST_SED.paths=	-e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},'
 
diff --git a/audio/tap-plugins/Makefile b/audio/tap-plugins/Makefile
index 3eb68af6586..3fb41bc25f7 100644
--- a/audio/tap-plugins/Makefile
+++ b/audio/tap-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:26:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:09 jperkin Exp $
 #
 
 DISTNAME=	tap-plugins-0.7.2
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 USE_GCC_RUNTIME=	yes
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing PREFIX.
 SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=	-e 's|/usr/local|${DESTDIR}${PREFIX}|'
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index aa2735f25a9..3a00541c69c 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2018/04/16 14:34:10 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	terminatorX-3.82
 PKGNAME=	${DISTNAME:S/X/x/}
@@ -25,7 +25,7 @@ LIBS+=			${LIBOSSAUDIO}
 CONFIGURE_ARGS+=	--disable-alsa
 
 SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	post-patch
+SUBST_STAGE.oss=	pre-configure
 SUBST_FILES.oss=	src/tX_global.c
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index b85a4f0d534..1919d78c300 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2018/04/16 14:34:10 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	TiMidity++-2.14.0
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
@@ -33,7 +33,7 @@ CONFIGURE_ARGS.Linux+=	--enable-alsaseq
 
 SUBST_CLASSES+=		confdir
 SUBST_MESSAGE.confdir=	Configuring to use PKG_SYSCONFDIR.
-SUBST_STAGE.confdir=	post-patch
+SUBST_STAGE.confdir=	pre-configure
 SUBST_FILES.confdir=	doc/C/timidity.cfg.5 doc/ja_JP.eucJP/timidity.cfg.5
 SUBST_SED.confdir=	-e 's,/usr/local/share/timidity,${PKG_SYSCONFDIR},g'
 
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index 7488ca4840a..c65704f24e6 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/09/06 09:03:00 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	toolame-02l
 PKGREVISION=	4
@@ -25,7 +25,7 @@ INSTALLATION_DIRS=	bin share/doc/toolame
 .if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=		inline
 SUBST_MESSAGE.inline=	Disable inline on Sun Studio
-SUBST_STAGE.inline=	post-patch
+SUBST_STAGE.inline=	pre-configure
 SUBST_FILES.inline=	Makefile
 SUBST_SED.inline=	-e 's,INLINE=inline,INLINE=,'
 .endif
diff --git a/audio/wavesurfer/Makefile b/audio/wavesurfer/Makefile
index a5c423c8f10..6b49758c3b3 100644
--- a/audio/wavesurfer/Makefile
+++ b/audio/wavesurfer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/04/20 12:10:33 nros Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	wavesurfer-1.8.5
 CATEGORIES=	audio
@@ -20,7 +20,7 @@ USE_LANGUAGES=	# empty
 
 SUBST_CLASSES+=		wish
 SUBST_MESSAGE.wish=	Fixing hardcoded command names.
-SUBST_STAGE.wish=	post-patch
+SUBST_STAGE.wish=	pre-configure
 SUBST_FILES.wish=	wavesurfer.tcl
 SUBST_SED.wish=		-e 's,wish8.4,wish,g'
 
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index f1f4c0f18dd..cdf1e8e81ed 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2018/03/12 11:15:25 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2018/07/04 13:40:09 jperkin Exp $
 #
 
 DISTNAME=	WSoundServer-0.4.0
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/wsoundserver
 CONF_FILES=		${EGDIR:Q}/WMSound ${PKG_SYSCONFDIR:Q}/WMSound
 
 SUBST_CLASSES+=		1x
-SUBST_STAGE.1x=		post-patch
+SUBST_STAGE.1x=		pre-configure
 SUBST_MESSAGE.1x=	Changing the man page category from 1x to 1.
 SUBST_FILES.1x=		doc/*
 SUBST_SED.1x=		-e s,1x,1,g
diff --git a/biology/cdhit/Makefile b/biology/cdhit/Makefile
index 28a0f599daf..a851d1f2d04 100644
--- a/biology/cdhit/Makefile
+++ b/biology/cdhit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/07/09 06:37:51 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:09 jperkin Exp $
 #
 ###########################################################
 #               Generated by fbsd2pkg                     #
@@ -23,13 +23,13 @@ REPLACE_PERL=	*.pl
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SUBST_CLASSES+=		compiler
-SUBST_STAGE.compiler=	post-patch
+SUBST_STAGE.compiler=	pre-configure
 SUBST_MESSAGE.compiler=	Fixing hardcoded compiler name
 SUBST_FILES.compiler=	${MAKE_FILE}
 SUBST_SED.compiler=	-e 's|g++|${CXX:Q}|g'
 
 SUBST_CLASSES+=		bash
-SUBST_STAGE.bash=	post-patch
+SUBST_STAGE.bash=	pre-configure
 SUBST_MESSAGE.bash=	Fixing bash path
 SUBST_FILES.bash=	cd-hit-2d-para.pl cd-hit-para.pl
 SUBST_SED.bash=		-e 's|/bin/bash|${PREFIX}/bin/bash|g'
diff --git a/biology/htslib/Makefile b/biology/htslib/Makefile
index 19525f4b265..2c20fc95652 100644
--- a/biology/htslib/Makefile
+++ b/biology/htslib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/30 16:51:54 bacon Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:09 jperkin Exp $
 
 DISTNAME=	htslib-1.8
 CATEGORIES=	biology
@@ -16,7 +16,7 @@ GNU_CONFIGURE=	yes
 REPLACE_PERL=	test/compare_sam.pl test/test.pl
 
 SUBST_CLASSES+=		version
-SUBST_STAGE.version=	post-patch
+SUBST_STAGE.version=	pre-configure
 SUBST_SED.version=	-e "s|m4_esyscmd_s(\[make print-version\])|[${PKGVERSION_NOREV}]|"
 SUBST_FILES.version=	${WRKSRC}/configure.ac
 
diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 84edbc1649a..9407aa6417c 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/05/22 21:37:29 bacon Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	ncbi-blast-${PV}+-src
 PKGNAME=	ncbi-blast+-${PV}
@@ -15,7 +15,7 @@ LICENSE=	public-domain
 # Fix "undefined _ThreadRuneLocale" error on FreeBSD 10.0
 # Fix "unknown options" in configure
 SUBST_CLASSES+=		configure
-SUBST_STAGE.configure=	post-patch
+SUBST_STAGE.configure=	pre-configure
 SUBST_SED.configure+=	-e 's|-D_THREAD_SAFE|-D_THREAD_SAFE -D__RUNETYPE_INTERNAL|'
 SUBST_SED.configure+=	-e '/--infodir=DIR/d'
 SUBST_SED.configure+=	-e '/--mandir=DIR/d'
diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile
index bae2c2c3c46..537c65877ba 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/03/12 11:16:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	klayout-0.24.10
 PKGREVISION=	1
@@ -19,7 +19,7 @@ NO_CONFIGURE=	yes
 SUBST_CLASSES+= 	rpath
 SUBST_MESSAGE.rpath=	Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file
 SUBST_FILES.rpath+=	config/Makefile.conf.netbsd-32-gcc-release
-SUBST_STAGE.rpath=	post-patch
+SUBST_STAGE.rpath=	pre-configure
 SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
 SUBST_SED.rpath=	-e 's|@@LDFLAGS@@|${LDFLAGS}|'
 
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index f7847430208..66af154ed83 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 13:25:14 asau Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $
 #
 
 .include "../../cad/wcalc/Makefile.common"
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--without-octave
 CONFIGURE_ARGS+=	--without-scilab
 
 SUBST_CLASSES+=		mwc
-SUBST_STAGE.mwc=	post-patch
+SUBST_STAGE.mwc=	pre-configure
 SUBST_FILES.mwc=	mex-wcalc/mexopts.sh.in
 SUBST_SED.mwc=		-e 's;\.\./libwcalc;${BUILDLINK_DIR}/lib;g'
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 578c45d4ba6..1a2c4e6a634 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/03/24 17:11:57 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/04 13:40:10 jperkin Exp $
 #
 
 DISTNAME=		qcad-3.19.1.0
@@ -23,7 +23,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Attending to hard-coded paths.
 SUBST_FILES.paths+=	shared.pri src/core/RS.cpp src/core/RSettings.cpp
 SUBST_FILES.paths+=	scripts/Help/ShowReadme/ShowReadme.js
diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile
index 9c2d8be255d..fc6e41a0fd0 100644
--- a/cad/solvespace/Makefile
+++ b/cad/solvespace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/04/16 14:34:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:10 jperkin Exp $
 #
 #
 # Both of these hashes need to be updated when the solvespace version
@@ -38,13 +38,13 @@ USE_CMAKE=		yes
 CMAKE_ARGS+=		-DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
 
 SUBST_CLASSES+=		desktop
-SUBST_STAGE.desktop=	post-patch
+SUBST_STAGE.desktop=	pre-configure
 SUBST_MESSAGE.desktop=	Fixing absolute path in desktop file
 SUBST_FILES.desktop=	src/unix/solvespace.desktop
 SUBST_SED.desktop=	-e "s,/usr/bin,${PREFIX}/bin,"
 
 SUBST_CLASSES+=		libdxfrw
-SUBST_STAGE.libdxfrw=	post-patch
+SUBST_STAGE.libdxfrw=	pre-configure
 SUBST_MESSAGE.libdxfrw=	Set libdxfrw directory
 SUBST_FILES.libdxfrw=	CMakeLists.txt
 SUBST_SED.libdxfrw=	-e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH},"
diff --git a/chat/anope/Makefile b/chat/anope/Makefile
index 5e5448bc972..427da213f39 100644
--- a/chat/anope/Makefile
+++ b/chat/anope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/01/13 23:18:25 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	anope-1.7.21
 PKGREVISION=	8
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=	--with-rungroup=${ANOPE_GROUP}
 .include "options.mk"
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	data/example.chk data/example.conf
 SUBST_SED.paths=	-e "s|/home/ircd/services|${PREFIX}/lib/anope|g"
 SUBST_SED.paths+=	-e "s|/usr/local/lib/services|${PREFIX}/lib/anope|g"
@@ -55,7 +55,7 @@ SUBST_SED.paths+=	-e "s|/home/username/services|${PREFIX}/lib/anope|g"
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 
 SUBST_CLASSES+=		utils
-SUBST_STAGE.utils=	post-patch
+SUBST_STAGE.utils=	pre-configure
 SUBST_FILES.utils=	src/Makefile
 SUBST_SED.utils=	-e "s|find|${FIND}|g"
 SUBST_SED.utils+=	-e "s|chgrp|${CHGRP}|g"
diff --git a/chat/bitchx/Makefile b/chat/bitchx/Makefile
index 13864c61b91..b725410f8c6 100644
--- a/chat/bitchx/Makefile
+++ b/chat/bitchx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2016/03/05 11:28:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	bitchx-1.2.1
 PKGREVISION=	1
@@ -20,7 +20,7 @@ CONFIG_SHELL=		${TOOLS_PATH.bash}
 CFLAGS.Darwin+=	-DBIND_8_COMPAT
 
 SUBST_CLASSES+=		manpage
-SUBST_STAGE.manpage=	post-patch
+SUBST_STAGE.manpage=	pre-configure
 SUBST_FILES.manpage+=	doc/BitchX.1
 SUBST_SED.manpage+=	-e 's,@PREFIX@,${PREFIX},g'
 
diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile
index a98e7249b4f..dfdf71675ca 100644
--- a/chat/ircd-hybrid/Makefile
+++ b/chat/ircd-hybrid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/01/13 23:18:26 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	ircd-hybrid-7.2.3
 PKGREVISION=	11
@@ -54,7 +54,7 @@ PKG_GROUPS_VARS+=	IRCD_HYBRID_IRC_GROUP
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	etc/example.conf etc/example.efnet.conf \
 			etc/example.conf.quick doc/ircd.8
 SUBST_SED.paths=	-e "s|/usr/local/ircd/etc|${PKG_SYSCONFDIR}|g"
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 4303a50484b..2c8c6224348 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/01/13 23:18:26 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:10 jperkin Exp $
 #
 
 DISTNAME=	ircservices-5.0.64
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	${empty(LDFLAGS):?:-lflags ${LDFLAGS:Q}}
 CONFIGURE_ARGS+=	${empty(LIBS):?:-libs ${LIBS:Q}}
 
 SUBST_CLASSES+=		install
-SUBST_STAGE.install=	post-patch
+SUBST_STAGE.install=	pre-configure
 SUBST_FILES.install=	install-script tools/ircservices-chk.in
 SUBST_SED.install=	-e "s|/bin/cp|${CP}|g"
 SUBST_SED.install+=	-e "s|/bin/chown|${CHOWN}|g"
@@ -42,7 +42,7 @@ SUBST_SED.install+=	-e "s|@DATDEST@|${VARBASE}/run|g"
 SUBST_MESSAGE.install=	Fixing scripts.
 
 SUBST_CLASSES+=		utils
-SUBST_STAGE.utils=	post-patch
+SUBST_STAGE.utils=	pre-configure
 SUBST_FILES.utils=	data/Makefile tools/Makefile
 SUBST_SED.utils=	-e "s|chgrp|${CHGRP}|g"
 SUBST_SED.utils+=	-e "s|chmod|${CHMOD}|g"
@@ -50,7 +50,7 @@ SUBST_SED.utils+=	-e "s|find|${FIND}|g"
 SUBST_MESSAGE.utils=	Fixing paths of hard-coded utilities.
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	data/example-ircservices.conf data/example-modules.conf
 SUBST_SED.conf=		-e "s|/usr/local|${PREFIX}|g"
 SUBST_SED.conf+=	-e "s|ircservices.log|${VARBASE}/log/ircservices.log|g"
diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 0e6bf4cced3..eebb1b9f298 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2018/04/14 07:34:11 adam Exp $
+# $NetBSD: Makefile,v 1.122 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	jabberd-2.6.1
 PKGREVISION=	3
@@ -30,7 +30,7 @@ LIBS+=		${PTHREAD_LIBS}
 CFLAGS.SunOS+=		-D__EXTENSIONS__	# sockaddr_storage
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	configure
 SUBST_MESSAGE.path=	Fixing configure script.
 SUBST_SED.path=		-e "s,/usr/local,${PREFIX},g"
diff --git a/chat/psybnc/Makefile b/chat/psybnc/Makefile
index 7a832c92ec7..e521dab2932 100644
--- a/chat/psybnc/Makefile
+++ b/chat/psybnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/08/26 20:55:08 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:10 jperkin Exp $
 #
 
 DISTNAME=	psyBNC-2.4BETA2
@@ -28,7 +28,7 @@ CONF_FILES=	share/examples/psybnc/psybnc.conf \
 SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	tools/autoconf.c
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 
 SUBST_CLASSES+=         openssl
 SUBST_FILES.openssl=	makefile.out
diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index 4c6e9fcb194..f0bce238503 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/03/12 11:16:11 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:11 jperkin Exp $
 #
 
 DISTNAME=	quirc-0.9.84
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-wish=${TOOLS_PATH.wish}
 MAKE_FLAGS+=	docdir=${PREFIX}/share/doc/quirc
 
 SUBST_CLASSES+=		T86
-SUBST_STAGE.T86=	post-patch
+SUBST_STAGE.T86=	pre-configure
 SUBST_FILES.T86=	configure configure.in
 SUBST_MESSAGE.T86=	Changing tcl/tk 8.3 search into tcl/tk 8.6 search
 SUBST_SED.T86=		-e 's,8_3,8_6,g'
diff --git a/chat/roxirc/Makefile b/chat/roxirc/Makefile
index 9a24d0a9276..3484fe501cc 100644
--- a/chat/roxirc/Makefile
+++ b/chat/roxirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/09/04 18:00:50 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:11 jperkin Exp $
 #
 
 DISTNAME=	roxirc-1.8
@@ -19,7 +19,7 @@ EXAMPLESDIR=	${PREFIX}/share/examples/roxirc
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded command names.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	roxirc
 SUBST_SED.paths=	-e 's,wish8.3,wish,g'
 
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 5ac2775ccfa..b2526b2c69b 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2017/01/19 18:52:04 agc Exp $
+# $NetBSD: Makefile,v 1.69 2018/07/04 13:40:11 jperkin Exp $
 
 DISTNAME=	silc-server-1.1.18
 PKGREVISION=	2
@@ -64,7 +64,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
 .include "options.mk"
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	motd.txt
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},'
 
diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile
index 7365a8c5ec0..48e544d550f 100644
--- a/chat/spectrum/Makefile
+++ b/chat/spectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2018/07/03 05:03:04 adam Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:11 jperkin Exp $
 
 DISTNAME=		spectrum-1.4.8
 PKGREVISION=		45
@@ -55,7 +55,7 @@ CONF_FILES+=		${EGDIR}/spectrum.cfg ${PKG_SYSCONFDIR}/spectrum.cfg
 .include "options.mk"
 
 SUBST_CLASSES+=		cfgpath
-SUBST_STAGE.cfgpath=	post-patch
+SUBST_STAGE.cfgpath=	pre-configure
 SUBST_FILES.cfgpath+=	src/configfile.cpp
 SUBST_FILES.cfgpath+=	tools/migrate-db/main.cpp
 SUBST_FILES.cfgpath+=	spectrumctl/spectrumctl.py
@@ -65,13 +65,13 @@ SUBST_SED.cfgpath=	-e 's,/etc/spectrum,${PKG_SYSCONFDIR},g'
 SUBST_SED.cfgpath+=	-e 's,@ETC_SPECTRUM@,${PKG_SYSCONFDIR},g'
 
 SUBST_CLASSES+=		manpath
-SUBST_STAGE.manpath=	post-patch
+SUBST_STAGE.manpath=	pre-configure
 SUBST_FILES.manpath=	CMakeLists.txt
 SUBST_MESSAGE.manpath=	Correcting man page directory
 SUBST_SED.manpath+=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
 
 SUBST_CLASSES+=		users
-SUBST_STAGE.users=	post-patch
+SUBST_STAGE.users=	pre-configure
 SUBST_FILES.users=	spectrumctl/spectrumctl.py
 SUBST_FILES.users+=	spectrumctl/spectrum/env.py
 SUBST_FILES.users+=	man/spectrumctl.8
@@ -79,7 +79,7 @@ SUBST_MESSAGE.users=	Correcting spectrum user
 SUBST_SED.users=	-e 's/@SPECTRUM_USER@/${JABBER_USER}/g'
 
 SUBST_CLASSES+=		cfg
-SUBST_STAGE.cfg=	post-patch
+SUBST_STAGE.cfg=	pre-configure
 SUBST_FILES.cfg=	spectrum.cfg
 SUBST_MESSAGE.cfg=	Fixing paths in default config file
 SUBST_SED.cfg=		-e 's,/var/run/spectrum,${SPECTRUM_RUN},g'
diff --git a/chat/telegram-purple/Makefile b/chat/telegram-purple/Makefile
index 2e137d47595..c3c93ba89ed 100644
--- a/chat/telegram-purple/Makefile
+++ b/chat/telegram-purple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/05/12 22:35:52 khorben Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:11 jperkin Exp $
 
 DISTNAME=	telegram-purple_1.3.0.orig
 PKGNAME=	telegram-purple-1.3.0
@@ -25,7 +25,7 @@ INSTALLATION_DIRS+=	${EGDIR}
 OWN_DIRS+=		${PKG_SYSCONFDIR}/${PKGBASE}
 
 SUBST_CLASSES+=		tglpub
-SUBST_STAGE.tglpub=	post-patch
+SUBST_STAGE.tglpub=	pre-configure
 SUBST_MESSAGE.tglpub=	Adjust path to server.tglpub
 SUBST_FILES.tglpub=	telegram-purple.c
 SUBST_SED.tglpub=	-e "s|/etc/|${PKG_SYSCONFDIR}/|g"
diff --git a/chat/tkirc2/Makefile b/chat/tkirc2/Makefile
index 3fba36a5486..b7919a13c42 100644
--- a/chat/tkirc2/Makefile
+++ b/chat/tkirc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2014/10/09 14:06:03 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:11 jperkin Exp $
 
 DISTNAME=	tkirc2.46
 PKGNAME=	tkirc2-2.46
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded command names.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	tkirc2
 SUBST_SED.paths=	-e 's,wish8.3,wish,g'
 
diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile
index a9c57fa4da2..4b4a98043c3 100644
--- a/chat/unrealircd/Makefile
+++ b/chat/unrealircd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/04/29 21:31:29 adam Exp $
+# $NetBSD: Makefile,v 1.53 2018/07/04 13:40:11 jperkin Exp $
 
 DISTNAME=	Unreal3.2.10.5
 PKGNAME=	${DISTNAME:tl:S/l/lircd-/1}
@@ -79,7 +79,7 @@ FILES_SUBST+=	UIRCD_USER=${UIRCD_USER}
 FILES_SUBST+=	UIRCD_GROUP=${UIRCD_GROUP}
 
 SUBST_CLASSES+=		homedir
-SUBST_STAGE.homedir=	post-patch
+SUBST_STAGE.homedir=	pre-configure
 SUBST_FILES.homedir=	doc/example.conf
 SUBST_SED.homedir=	-e "s|src/modules|${IRCD_SHARE}/modules|g"
 SUBST_SED.homedir+=	-e "s|include \"|include \"${IRCD_SHARE}/|g"
diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk
index d8c2620ed34..7b9bd65c349 100644
--- a/comms/asterisk/options.mk
+++ b/comms/asterisk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/10/27 08:49:01 jnemeth Exp $
+# $NetBSD: options.mk,v 1.9 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk13/options.mk b/comms/asterisk13/options.mk
index f72d51ad596..fcd716bb551 100644
--- a/comms/asterisk13/options.mk
+++ b/comms/asterisk13/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk14/options.mk b/comms/asterisk14/options.mk
index 13e1fcc82a5..8a15366a48e 100644
--- a/comms/asterisk14/options.mk
+++ b/comms/asterisk14/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2016/10/25 08:17:03 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index 7e30bf111f7..81ba0a86a52 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2015/01/29 21:48:07 jnemeth Exp $
+# $NetBSD: options.mk,v 1.13 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 16a70427f6f..8afa6e7c5e9 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/09/11 15:21:27 hauke Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:11 jperkin Exp $
 #
 
 DISTNAME=	conserver-7.2.7
@@ -39,7 +39,7 @@ CONF_FILES+=	${EGDIR}/conserver.passwd.example ${PKG_SYSCONFDIR}/conserver.passw
 OWN_DIRS=	${VARBASE}/consoles
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	conserver.cf/conserver.cf
 SUBST_SED.conf=		-e s,/var/consoles,${VARBASE}/consoles,
 
diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile
index 13404d92105..5bd82f5db51 100644
--- a/comms/conserver8/Makefile
+++ b/comms/conserver8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/02/10 10:38:42 he Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:12 jperkin Exp $
 #
 
 PKGVER=		8.2.1
@@ -41,7 +41,7 @@ CONF_FILES+=	${EGDIR}/conserver.passwd ${PKG_SYSCONFDIR}/conserver.passwd
 OWN_DIRS=	${VARBASE}/consoles
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	conserver.cf/conserver.cf
 SUBST_SED.conf=		-e "s,/var/consoles,${VARBASE}/consoles,"
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 8ef1127f791..fa15a42075c 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2017/04/18 13:30:57 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:12 jperkin Exp $
 
 DISTNAME=	minicom-2.7.1
 CATEGORIES=	comms
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/minicom
 
 SUBST_CLASSES+=		minicom
 SUBST_MESSAGE.minicom=	Fixing hardcoded paths.
-SUBST_STAGE.minicom=	post-patch
+SUBST_STAGE.minicom=	pre-configure
 SUBST_FILES.minicom=	src/rwconf.c
 SUBST_VARS.minicom=	PREFIX
 
diff --git a/comms/op_panel/Makefile b/comms/op_panel/Makefile
index 88d584152df..9c258879116 100644
--- a/comms/op_panel/Makefile
+++ b/comms/op_panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:12 jperkin Exp $
 #
 
 DISTNAME=	op_panel-0.29
@@ -54,7 +54,7 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	share/examples/${FOP}
 INSTALLATION_DIRS+=	share/${FOP}
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index e7c80fface0..d46d3194abf 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/06/05 14:22:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:12 jperkin Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -40,7 +40,7 @@ BUILD_DIRS+=		src
 BUILD_DIRS+=		${INSTALL_DIRS}
 
 SUBST_CLASSES+=		progs
-SUBST_STAGE.progs=	post-patch
+SUBST_STAGE.progs=	pre-configure
 SUBST_MESSAGE.progs=	Trim programs to build
 SUBST_FILES.progs=	src/Makefile.in
 SUBST_SED.progs=	-e s:@ENABLE_CONDUITS_TRUE@bin_PROGRAMS:@ENABLE_CONDUITS_TRUE@bin_PROGRAMSX:
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 81b37e11e24..066a67f7527 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/01/28 16:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:12 jperkin Exp $
 
 DISTNAME=		gcc-4.8.3
 PKGNAME=		${DISTNAME:C/^/avr-/}
@@ -39,7 +39,7 @@ MAKE_ENV+=		CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD:Q}
 SUBST_CLASSES+=		sed
 SUBST_FILES.sed=	fixincludes/fixincl.x
 SUBST_SED.sed=		-e 's|@SED@|${TOOLS_PATH.sed}|g'
-SUBST_STAGE.sed=	post-patch
+SUBST_STAGE.sed=	pre-configure
 
 pre-configure:
 	${MKDIR} ${WRKDIR}/obj
diff --git a/cross/cc65/Makefile b/cross/cc65/Makefile
index 527521b271e..50d4089e98d 100644
--- a/cross/cc65/Makefile
+++ b/cross/cc65/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:37:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:12 jperkin Exp $
 #
 
 DISTNAME=	cc65-sources-2.13.3
@@ -23,7 +23,7 @@ INSTALL_MAKE_FLAGS+=	PREFIX=${DESTDIR}${PREFIX}
 
 SUBST_CLASSES+=		perl
 SUBST_MESSAGE.perl=	Fixing the path of perl.
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	src/ca65/macpack/cvt-mac.pl src/ld65/cfg/cvt-cfg.pl
 SUBST_SED.perl=		-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
 
diff --git a/cross/nios2-gcc/Makefile b/cross/nios2-gcc/Makefile
index ffbdba6c1cc..52f5e79dda0 100644
--- a/cross/nios2-gcc/Makefile
+++ b/cross/nios2-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/01/28 16:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:12 jperkin Exp $
 .include		"../../cross/nios2/Makefile.common"
 PKGNAME=		nios2-gcc-${PKG_VERSION}
 PKG_VERSION=		4.7.3
@@ -38,7 +38,7 @@ SUBST_CLASSES+=			host-subdir
 # Work around for the problem
 # gmake[2]: *** No rule to make target `../.././gcc/libgcc.mvars'.  Stop.
 SUBST_MESSAGE.host-subdir= 	Purely work-around, replacing @host-subdir@ in advance
-SUBST_STAGE.host-subdir=	post-patch
+SUBST_STAGE.host-subdir=	pre-configure
 SUBST_FILES.host-subdir=	libgcc/Makefile.in
 SUBST_SED.host-subdir=		'-e /host_subdir = @host_subdir@/s,@host_subdir@,host-${MACHINE_ARCH}--${OPSYS:tl},'
 
diff --git a/cross/nios2-gcc41/options.mk b/cross/nios2-gcc41/options.mk
index 3a75a28eca0..432278740d5 100644
--- a/cross/nios2-gcc41/options.mk
+++ b/cross/nios2-gcc41/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/07/07 13:26:16 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2018/07/04 13:40:12 jperkin Exp $
 
 ### Set options
 PKG_OPTIONS_VAR=	PKG_OPTIONS.nios2-gcc
@@ -15,7 +15,7 @@ CFLAGS+=		-DTARGET_SYSTEM_ROOT=0 -DTARGET_SYSTEM_ROOT_RELOCATABLE
 # conditional SUBST_CLASSES
 .if empty(PKG_OPTIONS:Mdoc)
 SUBST_CLASSES+=		nios
-SUBST_STAGE.nios=	post-patch
+SUBST_STAGE.nios=	pre-configure
 SUBST_FILES.nios=	gcc/Makefile.in
 SUBST_SED.nios=		-e s/@@DOC@@//
 SUBST_SED.nios+=	-e s/@@INSTALL_HTML@@//
@@ -32,7 +32,7 @@ BUILD_DEPENDS+=		gtexinfo-[0-9]*:../../devel/gtexinfo
 PLIST.doc=		yes
 
 SUBST_CLASSES+=		nios
-SUBST_STAGE.nios=	post-patch
+SUBST_STAGE.nios=	pre-configure
 SUBST_FILES.nios=	gcc/Makefile.in
 SUBST_SED.nios=		-e s/@@DOC@@/doc/
 SUBST_SED.nios+=	-e s/@@INSTALL_HTML@@/install-html/
diff --git a/databases/cstore/Makefile b/databases/cstore/Makefile
index 8413c1ec02c..1fa055aac1a 100644
--- a/databases/cstore/Makefile
+++ b/databases/cstore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/19 18:52:04 agc Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:12 jperkin Exp $
 
 DISTNAME=	cstore0.2
 PKGNAME=	cstore-0.2
@@ -20,7 +20,7 @@ WRKSRC=			${WRKDIR}/cstore
 REPLACE_PERL=		Build/BSsrcs
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	Build/makefile.init
 SUBST_SED.prefix=	-e 's|@PREFIX@|'${PREFIX}'|g'
 
diff --git a/databases/mysqltuner/Makefile b/databases/mysqltuner/Makefile
index d12bb9faaa0..4c3ce89bfeb 100644
--- a/databases/mysqltuner/Makefile
+++ b/databases/mysqltuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/01/16 12:43:17 mef Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:12 jperkin Exp $
 
 GITHUB_PROJECT=	MySQLTuner-perl
 DISTNAME=	1.7.2
@@ -25,7 +25,7 @@ SUBST_CLASSES+=		docdir
 SUBST_FILES.docdir=	mysqltuner.pl
 SUBST_MESSAGE.docdir=	Fixing DOCDIR.
 SUBST_SED.docdir=	-e "s|/usr/share/mysqltuner|${PREFIX}/${PKGDOCDIR}|1"
-SUBST_STAGE.docdir=	post-patch
+SUBST_STAGE.docdir=	pre-configure
 
 INSTALLATION_DIRS+=	bin ${PKGDOCDIR}
 
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index beddd3964f6..8d5f61ae67c 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2018/04/21 13:38:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.41 2018/07/04 13:40:12 jperkin Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -50,7 +50,7 @@ PKG_USERS_VARS+=	SLAPD_USER
 # the internal avl_* prototypes conflict with those in <sys/avl.h> which
 # is included by another system header file on Solaris, so subst them.
 SUBST_CLASSES.SunOS+=	conflict
-SUBST_STAGE.conflict=	post-patch
+SUBST_STAGE.conflict=	pre-configure
 SUBST_FILES.conflict=	${WRKSRC}/*/*.h
 SUBST_FILES.conflict+=	${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
 SUBST_SED.conflict+=	-e 's,avl_free,openldap_avl_free,g'
diff --git a/databases/pgbuildfarm/Makefile b/databases/pgbuildfarm/Makefile
index 4779b6f3f0a..99cc235707e 100644
--- a/databases/pgbuildfarm/Makefile
+++ b/databases/pgbuildfarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/07/09 06:38:01 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:13 jperkin Exp $
 
 DISTNAME=		build-farm-4_15_1
 PKGNAME=		${DISTNAME:S/build-farm/pgbuildfarm/:S/_/./g}
@@ -29,7 +29,7 @@ CONF_FILES=		${EGDIR}/build-farm.conf \
 PKG_SYSCONFSUBDIR=	pgbuildfarm
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	setnotes.pl update_personality.pl PGBuild/Options.pm
 SUBST_SED.conf=		-e 's,build-farm.conf,${PKG_SYSCONFDIR}/build-farm.conf,'
 SUBST_MESSAGE.conf=	Fixing default value for build-farm.conf
diff --git a/databases/poco-data-mysql/Makefile b/databases/poco-data-mysql/Makefile
index 202e889178c..c13722d3bba 100644
--- a/databases/poco-data-mysql/Makefile
+++ b/databases/poco-data-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/03/05 11:27:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:13 jperkin Exp $
 #
 
 PKGNAME=	poco-data-mysql-${POCO_VERSION}
@@ -31,7 +31,7 @@ do-install:
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	pkgsrc-izing paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	Data/MySQL/Makefile
 SUBST_SED.paths=    -e 's,@MYSQLLIBDIR@,${BUILDLINK_DIR}/${BUILDLINK_LIBDIRS.mysql-client},g'
 SUBST_SED.paths+=    -e 's,@MYSQLINCDIR@,${BUILDLINK_DIR}/${BUILDLINK_INCDIRS.mysql-client},g'
diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index 94e3183f9fc..c2071ca0bd9 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/03 05:03:07 adam Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:13 jperkin Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	7
@@ -21,20 +21,20 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-wxWidgets
 
 SUBST_CLASSES+=		mod
 SUBST_MESSAGE.mod=	Fixing deprecated module names.
-SUBST_STAGE.mod=	post-patch
+SUBST_STAGE.mod=	pre-configure
 SUBST_FILES.mod=	Profile.py SourceEditor.py StcStyle.py
 SUBST_SED.mod=		-e 's,wxPython\.lib\.PyCrust,wxPython.py,g'
 SUBST_SED.mod+=		-e 's,wxPython\.py,wx.py,g'
 
 SUBST_CLASSES+=		py
 SUBST_MESSAGE.py=	Fixing paths in a wrapper script.
-SUBST_STAGE.py=		post-patch
+SUBST_STAGE.py=		pre-configure
 SUBST_FILES.py=		ExmanIDE
 SUBST_SED.py=		-e 's,python \$$0\.pyw,${PYTHONBIN} ${PREFIX}/share/${PKGBASE}/ExmanIDE.pyw,g'
 
 SUBST_CLASSES+=		py2
 SUBST_MESSAGE.py2=	Fixing path in Python module.
-SUBST_STAGE.py2=	post-patch
+SUBST_STAGE.py2=	pre-configure
 SUBST_FILES.py2=	ExmanIDE.pyw
 SUBST_SED.py2=		-e 's,/usr/bin/env python.*$$,${PYTHONBIN},'
 
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index 9861b444a67..9b598d3620e 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/04/14 07:34:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:13 jperkin Exp $
 
 DISTNAME=	ProjectCenter-0.6.2
 PKGREVISION=	8
@@ -18,7 +18,7 @@ NO_CONFIGURE=	yes
 MAKE_FILE=	GNUmakefile
 
 SUBST_CLASSES+=		gmake
-SUBST_STAGE.gmake=	post-patch
+SUBST_STAGE.gmake=	pre-configure
 SUBST_FILES.gmake+=	Framework/GNUmakefile.preamble
 SUBST_FILES.gmake+=	Modules/Preferences/Build/PCBuildPrefs.h
 SUBST_SED.gmake+=	-e 's|.(GMAKE)|${GMAKE:Q}|g'
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index 2ceb5eaa509..d4faf1b4a22 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/04/02 09:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:13 jperkin Exp $
 
 PKGNAME=	adacurses-${ACVERSION}
 CATEGORIES=	devel
@@ -28,17 +28,17 @@ PLIST_SUBST=	atic=adacurses/terminal_interface-curses
 USE_BUILTIN.ncurses=	no
 SUBST_CLASSES=		adagen pragma sample
 
-SUBST_STAGE.adagen=	post-patch
+SUBST_STAGE.adagen=	pre-configure
 SUBST_FILES.adagen=	gen/Makefile.in
 SUBST_SED.adagen=	-e '/(INSTALL_PROG)/d' -e 's|@ADAGEN_LDFLAGS@||'
 SUBST_MESSAGE.adagen=	Adjust gen Makefile
 
-SUBST_STAGE.sample=	post-patch
+SUBST_STAGE.sample=	pre-configure
 SUBST_FILES.sample=	samples/Makefile.in
 SUBST_SED.sample=	-e 's|@LIBS@|@LIBS@ -lmenu -lform -lpanel|'
 SUBST_MESSAGE.sample=	Adjust samples Makefile
 
-SUBST_STAGE.pragma=	post-patch
+SUBST_STAGE.pragma=	pre-configure
 SUBST_FILES.pragma=	gen/terminal_interface-curses.ads.m4 \
 			gen/terminal_interface-curses-menus.ads.m4 \
 			gen/terminal_interface-curses-forms.ads.m4 \
diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile
index b56ea57ea71..8a16dac36b2 100644
--- a/devel/bullet/Makefile
+++ b/devel/bullet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/09/11 07:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:13 jperkin Exp $
 
 PKGNAME=	${DISTNAME:S/-r2704//}
 DISTNAME=	bullet-2.82-r2704
@@ -22,7 +22,7 @@ CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=on
 CMAKE_ARGS+=	-DINSTALL_LIBS:BOOL=on
 
 SUBST_CLASSES+=	lcompat
-SUBST_STAGE.lcompat=	post-patch
+SUBST_STAGE.lcompat=	pre-configure
 SUBST_FILES.lcompat=	Demos/AllBulletDemos/CMakeLists.txt
 SUBST_SED.lcompat=	-e "s|{OPENGL_glu_LIBRARY}|{OPENGL_glu_LIBRARY} -lcompat|g"
 SUBST_MESSAGE.lcompat=	Adding -lcompat for demos
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index 059094fed12..9fadf9eaa9c 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2016/01/28 19:11:30 abs Exp $
+# $NetBSD: Makefile,v 1.154 2018/07/04 13:40:13 jperkin Exp $
 
 DISTNAME=	cpuflags-1.43
 CATEGORIES=	devel sysutils
@@ -24,7 +24,7 @@ MAKE_FLAGS+=	INSTALL_DATA_DIR=${INSTALL_DATA_DIR:Q}
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}/man1
 
 SUBST_CLASSES+=		cpuflags
-SUBST_STAGE.cpuflags=	post-patch
+SUBST_STAGE.cpuflags=	pre-configure
 SUBST_FILES.cpuflags=	cpuflags.sh
 SUBST_SED.cpuflags=	-e s,@@SH@@,${SH:Q},
 
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index bcc8baca420..b57cc1d702a 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:04 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:13 jperkin Exp $
 
 DISTNAME=	cscope-15.8a
 PKGREVISION=	2
@@ -20,7 +20,7 @@ SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,PATH=\"\\(.*\\),PATH=\"${PREFIX}/bin:\\1,"
 SUBST_FILES.path=	contrib/xcscope/cscope-indexer
 SUBST_MESSAGE.path=	Fixing path in cscope-indexer.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/xcscope/cscope-indexer \
diff --git a/devel/distcc/Makefile.common b/devel/distcc/Makefile.common
index eeda2c52b73..997d41897c3 100644
--- a/devel/distcc/Makefile.common
+++ b/devel/distcc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2014/04/25 16:13:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2018/07/04 13:40:13 jperkin Exp $
 # used by devel/distcc-pump/Makefile
 # used by devel/distccmon-gnome/Makefile
 # used by devel/distccmon-gtk/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CHECK_PORTABILITY_SKIP+=	contrib/redhat/*
 
 SUBST_CLASSES+=		doc
-SUBST_STAGE.doc=	post-patch
+SUBST_STAGE.doc=	pre-configure
 SUBST_FILES.doc=	src/distcc.c src/hosts.c
 SUBST_SED.doc=		-e "s|%s/distcc/hosts|%s/hosts|g"
 SUBST_MESSAGE.doc=	Fixing paths.
diff --git a/devel/distccmon-gtk/Makefile b/devel/distccmon-gtk/Makefile
index 84d88ef622c..72fc56d2d97 100644
--- a/devel/distccmon-gtk/Makefile
+++ b/devel/distccmon-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/04/16 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:13 jperkin Exp $
 
 PKGNAME=	${DISTNAME:S/-/-gtk-/:S/rc1//}
 PKGREVISION=	7
@@ -10,7 +10,7 @@ USE_TOOLS+=		pkg-config
 CONFIGURE_ARGS+=	--with-gtk
 
 SUBST_CLASSES+=		gtk
-SUBST_STAGE.gtk=	post-patch
+SUBST_STAGE.gtk=	pre-configure
 SUBST_FILES.gtk=	gnome/distccmon-gnome.desktop src/mon-gnome.c
 SUBST_SED.gtk=		-e "s/distccmon-gnome/distccmon-gtk/g"
 SUBST_MESSAGE.gtk=	Renaming -gnome to -gtk.
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index 69f98ac4e47..3bcf2c63859 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/01 16:47:37 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:13 jperkin Exp $
 #
 
 VERS=		0.51b3
@@ -19,7 +19,7 @@ LDFLAGS+=	${BUILDLINK_LDADD.dl:Q}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 SUBST_CLASSES+=		elfsh
-SUBST_STAGE.elfsh=	post-patch
+SUBST_STAGE.elfsh=	pre-configure
 SUBST_MESSAGE.elfsh=	Fixing hardcoded paths.
 SUBST_FILES.elfsh=	vm/include/elfsh.h
 SUBST_SED.elfsh=	-e '/ELFSH_SHELL/s,/bin/bash,${SH},'
diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
index c2c545f9c27..4f89d958f5b 100644
--- a/devel/emacs-ilisp/Makefile
+++ b/devel/emacs-ilisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/01 14:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:13 jperkin Exp $
 #
 
 DISTNAME=	ilisp-20021222
@@ -18,7 +18,7 @@ BUILD_TARGET=	compile
 SITELISP=	${EMACS_LISPPREFIX}/ilisp
 
 SUBST_CLASSES+=			string-to-int
-SUBST_STAGE.string-to-int=	post-patch
+SUBST_STAGE.string-to-int=	pre-configure
 SUBST_MESSAGE.string-to-int=	obsolete function (as of 22.1); use `string-to-number' instead
 SUBST_FILES.string-to-int+=	ilisp-acl.el
 SUBST_SED.string-to-int=	-e 's/string-to-int/string-to-number/'
diff --git a/devel/exctags/Makefile b/devel/exctags/Makefile
index 620b1563ae6..a8eb1ff06e2 100644
--- a/devel/exctags/Makefile
+++ b/devel/exctags/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2015/11/14 06:01:02 richard Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:14 jperkin Exp $
 #
 
 DISTNAME=	ctags-5.8
@@ -24,7 +24,7 @@ CPPFLAGS+=		-DETAGS="\"exetags\""
 CFLAGS+=		${CPPFLAGS}
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	ctags.1
 SUBST_SED.man=		-e 's|^ctags \\-|exctags \\-|'
 SUBST_SED.man+=		-e 's|fBctags|fBexctags|g'
@@ -34,7 +34,7 @@ SUBST_SED.man+=		-e 's|"etags|"exetags|g'
 SUBST_SED.man+=		-e 's|/usr/local|${PREFIX}|g'
 
 SUBST_CLASSES+=		rename
-SUBST_STAGE.rename=	post-patch
+SUBST_STAGE.rename=	pre-configure
 SUBST_FILES.rename=	c.c eiffel.c general.h lregex.c lua.c main.c \
 			options.c parse.c routines.c
 SUBST_SED.rename=	-e 's|__unused__|__unused_|g'
diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common
index 505109fccb6..7695a1142d1 100644
--- a/devel/glib2/Makefile.common
+++ b/devel/glib2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2018/04/23 08:26:50 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2018/07/04 13:40:14 jperkin Exp $
 #
 # used by devel/glib2/Makefile
 # used by devel/gdbus-codegen/Makefile
@@ -55,7 +55,7 @@ CPPFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
 .if ${OPSYS} == "FreeBSD"
 SUBST_CLASSES+=		thr
-SUBST_STAGE.thr=	post-patch
+SUBST_STAGE.thr=	pre-configure
 SUBST_FILES.thr=	gthread/Makefile.in
 .  if ${OS_VERSION:R} >= 5
 SUBST_SED.thr+=		-e "s|@G_THREAD_LIBS_FOR_GTHREAD@|-lpthread|g"
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+=	--disable-threads
 BUILD_DEFS+=		VARBASE
 SUBST_CLASSES+=		dbusdb
 SUBST_MESSAGE.dbusdb=	Adjust dbus machine uuid path to dbus package
-SUBST_STAGE.dbusdb=	post-patch
+SUBST_STAGE.dbusdb=	pre-configure
 SUBST_FILES.dbusdb=	gio/gdbusconnection.c
 SUBST_FILES.dbusdb+=	gio/gdbusprivate.c
 SUBST_FILES.dbusdb+=	po/glib20.pot
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index f4dd70c1972..b8b36ec44bc 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2015/04/19 04:13:26 manu Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:14 jperkin Exp $
 
 DISTNAME=	gnustep-make-2.6.2
 PKGREVISION=	2
@@ -44,7 +44,7 @@ GNUSTEP_ARCH=	${MACHINE_ARCH}
 PLIST_SUBST+=	GNUSTEP_ARCH=${GNUSTEP_ARCH}
 
 SUBST_CLASSES+=		target
-SUBST_STAGE.target=	post-patch
+SUBST_STAGE.target=	pre-configure
 SUBST_FILES.target=	target.make
 SUBST_SED.target+=	-e 's|/usr/pkg|${PREFIX}|g'
 
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 0868e6193e3..3bd9a2005a9 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: gnustep.mk,v 1.26 2017/12/31 16:39:41 gdt Exp $
+#	$NetBSD: gnustep.mk,v 1.27 2018/07/04 13:40:14 jperkin Exp $
 
 .if !defined(GNUSTEP_MK)
 GNUSTEP_MK=		#defined
@@ -64,7 +64,7 @@ GNUSTEP_LDFLAGS=	${GNUSTEP_LFLAGS} ${GNUSTEP_RFLAGS}
 
 .if defined(FIX_GNUSTEP_INSTALLATION_DIR)
 SUBST_CLASSES+=				gnustep_installation_dir
-SUBST_STAGE.gnustep_installation_dir=	post-patch
+SUBST_STAGE.gnustep_installation_dir=	pre-configure
 SUBST_FILES.gnustep_installation_dir?=	GNUmakefile
 SUBST_SED.gnustep_installation_dir+=	-e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|'
 SUBST_SED.gnustep_installation_dir+=	-e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME_NOREV}|g'
diff --git a/devel/gprbuild-aux/Makefile b/devel/gprbuild-aux/Makefile
index 6d25cc0af2e..452a69a967a 100644
--- a/devel/gprbuild-aux/Makefile
+++ b/devel/gprbuild-aux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/02 09:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:14 jperkin Exp $
 
 DISTNAME=	gprbuild-aux-${SNAPSHOT}
 CATEGORIES=	devel
@@ -21,7 +21,7 @@ BUILD_DIRS=		${WRKSRC}/construction
 
 SUBST_CLASSES=		lbase
 
-SUBST_STAGE.lbase=	post-patch
+SUBST_STAGE.lbase=	pre-configure
 SUBST_FILES.lbase=	share/gprconfig/compilers.xml
 SUBST_SED.lbase=	-e "s|/usr/local|${LOCALBASE}|"
 SUBST_MESSAGE.lbase=	Ensure pkgsrc localbase is used
diff --git a/devel/gps/Makefile b/devel/gps/Makefile
index 3965faac108..d4d3ada284b 100644
--- a/devel/gps/Makefile
+++ b/devel/gps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/04/16 14:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:14 jperkin Exp $
 
 DISTNAME=	gps-${GPS_VERSION}
 PKGREVISION=	17
@@ -33,11 +33,11 @@ WRKSRC=			${WRKDIR}/gps-release-ide-${GPS_VERSION}-src
 CONFIGURE_ARGS+=	--disable-shared --with-gmp=${PREFIX}
 
 SUBST_CLASSES+= 	coll python
-SUBST_STAGE.coll=	post-patch
+SUBST_STAGE.coll=	pre-configure
 SUBST_FILES.coll=	gnatlib/src/gnatcoll_readline.gpr.in
 SUBST_SED.coll=		-e "s|@PREFIX@|${PREFIX}|g"
 SUBST_SED.coll+=	-e "s|-rpath|${LINKER_RPATH_FLAG}|g"
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	share/plug-ins/gps_utils/console_process.py
 SUBST_SED.python=	-e "s|/usr/bin/python|${PYTHONBIN}|"
 
diff --git a/devel/grantlee/Makefile b/devel/grantlee/Makefile
index 237eab1335f..bdd68a4bd2d 100644
--- a/devel/grantlee/Makefile
+++ b/devel/grantlee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/03/12 11:15:27 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:14 jperkin Exp $
 #
 
 DISTNAME=	grantlee-0.5.1
@@ -15,7 +15,7 @@ USE_LANGUAGES=  c c++
 USE_CMAKE=      yes
 
 SUBST_CLASSES+=		fix-inc
-SUBST_STAGE.fix-inc=	post-patch
+SUBST_STAGE.fix-inc=	pre-configure
 SUBST_MESSAGE.fix-inc=	Fixing install dir for includes
 SUBST_FILES.fix-inc+=	CMakeLists.txt
 SUBST_SED.fix-inc+=	-e 's,INCLUDE_INSTALL_DIR include,INCLUDE_INSTALL_DIR include/grantlee-qt4,'
diff --git a/devel/lcov/Makefile b/devel/lcov/Makefile
index d1c608478d4..5e77b6fb969 100644
--- a/devel/lcov/Makefile
+++ b/devel/lcov/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/04/10 01:26:26 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:14 jperkin Exp $
 #
 
 DISTNAME=	lcov-1.13
@@ -16,7 +16,7 @@ USE_TOOLS+=		perl
 REPLACE_PERL=		bin/gendesc bin/genhtml bin/geninfo bin/genpng bin/lcov
 
 SUBST_CLASSES+=		egdir
-SUBST_STAGE.egdir=      post-patch
+SUBST_STAGE.egdir=      pre-configure
 SUBST_FILES.egdir=	bin/genhtml
 SUBST_FILES.egdir+=	bin/geninfo
 SUBST_FILES.egdir+=	bin/lcov
diff --git a/devel/lemon/Makefile b/devel/lemon/Makefile
index 10dea9ab4eb..87fb1a9a6f4 100644
--- a/devel/lemon/Makefile
+++ b/devel/lemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/04/03 19:58:19 adam Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:14 jperkin Exp $
 
 .include "../../databases/sqlite3/Makefile.common"
 
@@ -25,7 +25,7 @@ INSTALLATION_DIRS=	bin share/lemon share/doc/lemon
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	lemon.c
 SUBST_SED.paths+=	-e 's,"lempar.c","${PREFIX}/share/lemon/lempar.c",g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 do-build:
 	cd ${WRKSRC}/tool && ${CC} ${CFLAGS} ${LDFLAGS} lemon.c -o lemon
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index d9e927b58f4..b0b2bdac936 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2018/03/31 22:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:14 jperkin Exp $
 
 DISTNAME=	libgphoto2-2.5.8
 PKGREVISION=	3
@@ -30,7 +30,7 @@ PLIST_VARS+=	libusb
 BUILDLINK_TRANSFORM.SunOS+=	opt:-Wl,--version-script=./libgphoto2_port.ver:-Wl,-M./libgphoto2_port.ver
 
 SUBST_CLASSES.SunOS+=	mapfile
-SUBST_STAGE.mapfile=	post-patch
+SUBST_STAGE.mapfile=	pre-configure
 SUBST_FILES.mapfile=	libgphoto2_port/libgphoto2_port/libgphoto2_port.ver
 SUBST_SED.mapfile=	-e '/gpi_gphoto_port_type_map/d'
 
diff --git a/devel/libmemmgr/Makefile b/devel/libmemmgr/Makefile
index fa7f97ce159..26c6b614477 100644
--- a/devel/libmemmgr/Makefile
+++ b/devel/libmemmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/12/08 16:18:35 bsiegert Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:14 jperkin Exp $
 #
 
 DISTNAME=		MemMgr-1.04
@@ -15,7 +15,7 @@ INSTALLATION_DIRS=	include lib
 USE_TOOLS+=		groff
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fixing absolute paths.
 SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=	-e 's|/usr/local|${PREFIX}|'
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 94811a3ae6e..202f4c4d499 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/04/19 11:24:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:14 jperkin Exp $
 #
 
 #
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 
 SUBST_CLASSES+=		exampledir
-SUBST_STAGE.exampledir=	post-patch
+SUBST_STAGE.exampledir=	pre-configure
 SUBST_MESSAGE.exampledir=	Fixing up examples directory path
 SUBST_FILES.exampledir=		demo/ccm/Makefile demo/Makefile demo/MakeVars
 SUBST_FILES.exampledir+=	demo/csiv2/Makefile demo/csiv2/interop/Makefile
diff --git a/devel/mono-tools/Makefile b/devel/mono-tools/Makefile
index 88a865d4c2d..9088a13b6fd 100644
--- a/devel/mono-tools/Makefile
+++ b/devel/mono-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2018/04/17 22:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=	mono-tools-3.10
 PKGREVISION=	17
@@ -20,7 +20,7 @@ MAKE_JOBS_SAFE=		no
 CONFIGURE_ARGS+=	--mandir=${PKGMANDIR}
 
 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/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index c846f50e837..683ece821c1 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2018/04/16 14:33:48 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2018/07/04 13:40:15 jperkin Exp $
 
 MD_VERSION=	5.0.1
 DISTNAME=	monodevelop-${MD_VERSION}-0
@@ -35,13 +35,13 @@ MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/templates/rules.make
 MAKE_OVERRIDE+=	src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
 
 SUBST_CLASSES+=			fix-gmake
-SUBST_STAGE.fix-gmake=		post-patch
+SUBST_STAGE.fix-gmake=		pre-configure
 SUBST_MESSAGE.fix-gmake=	Fixing GNU make references
 SUBST_FILES.fix-gmake=		${MAKE_OVERRIDE}
 SUBST_SED.fix-gmake=		-e 's,MAKEPROGRAM,${MAKE_PROGRAM},'
 
 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/devel/noweb/Makefile b/devel/noweb/Makefile
index 34ea3ee652a..6e6f741954e 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/10/30 02:58:19 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=		noweb-2.11b
 PKGREVISION=		1
@@ -25,7 +25,7 @@ SUBST_FILES.mktemp+=	src/shell/roff.mm contrib/conrado/d2tex
 SUBST_FILES.mktemp+=	contrib/jobling/correct-refs.nw
 SUBST_FILES.mktemp+=	contrib/norman/htmlgif/pstopbm
 SUBST_SED.mktemp+=	-e 's,@MKTEMP@,${TOOLS_PATH.mktemp},g'
-SUBST_STAGE.mktemp=	post-patch
+SUBST_STAGE.mktemp=	pre-configure
 
 .if ${OPSYS} != "SunOS"
 do-configure:
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index 65daadf3c8a..88504184d1e 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2015/11/25 12:49:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:15 jperkin Exp $
 #
 
 DISTNAME=	nsis-${NSIS_VER}
@@ -30,7 +30,7 @@ MAKENSIS_BIN=	${PREFIX}/share/nsis/makensis
 INSTALLATION_DIRS=	bin share/nsis
 
 SUBST_CLASSES+=		makensis
-SUBST_STAGE.makensis=	post-patch
+SUBST_STAGE.makensis=	pre-configure
 SUBST_FILES.makensis=	makensis.sh
 SUBST_SED.makensis=	-e s,@@SH@@,${SH:Q},
 SUBST_SED.makensis+=	-e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 17c2031d98d..4776fd402d8 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2018/06/07 19:04:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.154 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=		nss-${NSS_RELEASE:S/.0$//}
 NSS_RELEASE=		3.37.3
@@ -59,7 +59,7 @@ MAKE_ENV.SunOS+=	CC_IS_CLANG=YES
 .endif
 
 SUBST_CLASSES+=		64bit
-SUBST_STAGE.64bit=	post-patch
+SUBST_STAGE.64bit=	pre-configure
 SUBST_FILES.64bit=	nss/lib/freebl/*
 SUBST_SED.64bit=	-e 's,NSS_USE_64,_LP64,g'
 SUBST_MESSAGE.conf=	Use a generic 64bit check
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 8d9ccb9e7ac..256753743d8 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2017/09/03 08:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=	pwlib-v1_8_3-src
 PKGNAME=	pwlib-1.8.3
@@ -38,7 +38,7 @@ SUBST_SED.paths+=	-e 's,@BSD_INSTALL_LIB@,${INSTALL_LIB},g'
 SUBST_SED.paths+=	-e 's,@BSD_INSTALL_PROGRAM@,${INSTALL_PROGRAM},g'
 SUBST_SED.paths+=	-e 's,@PTHREAD_FLAGS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
 SUBST_SED.paths+=	-e 's,@LIBOSSAUDIO@,${LIBOSSAUDIO},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	mkdir ${WRKSRC}/share
diff --git a/devel/rebar/Makefile b/devel/rebar/Makefile
index 18da5b846f1..0bbe91d7d8c 100644
--- a/devel/rebar/Makefile
+++ b/devel/rebar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/07/30 22:32:17 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=	rebar-2.6.4
 CATEGORIES=	devel
@@ -18,7 +18,7 @@ do-install:
 SUBST_CLASSES+=		shebang
 SUBST_FILES.shebang=	src/rebar_escripter.erl
 SUBST_SED.shebang+=	-e 's,/usr/bin/env escript,${PREFIX}/bin/escript,'
-SUBST_STAGE.shebang=	post-patch
+SUBST_STAGE.shebang=	pre-configure
 
 .include "../../lang/erlang/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index 571faca103f..b5a888f01a6 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/03 05:03:14 adam Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=	rox-lib-2.0.2
 PKGREVISION=	14
@@ -30,7 +30,7 @@ INSTALLATION_DIRS=	share/rox/ROX-Lib2
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	python/rox/basedir.py
 SUBST_FILES.path+=	python/rox/choices.py
 SUBST_FILES.path+=	tests/python/testbasedir.py
@@ -39,7 +39,7 @@ SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	Help/findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install
index 5d7f731d907..53273c5e73d 100644
--- a/devel/rt3/Makefile.install
+++ b/devel/rt3/Makefile.install
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.install,v 1.21 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile.install,v 1.22 2018/07/04 13:40:15 jperkin Exp $
 
 .include "dirs.mk"
 
@@ -31,12 +31,12 @@ SUBST_STAGE.prefix=	pre-configure
 SUBST_CLASSES+=		etcpath
 SUBST_FILES.etcpath=	sbin/rt-setup-database.in
 SUBST_SED.etcpath=	-e 's,\$$RT::EtcPath,"${RT_SHARE_DIR}/etc",'
-SUBST_STAGE.etcpath=	post-patch
+SUBST_STAGE.etcpath=	pre-configure
 
 SUBST_CLASSES+=		path
 SUBST_FILES.path=	bin/webmux.pl.in lib/RT/Interface/CLI.pm
 SUBST_SED.path=		-e 's,/bin:/usr/bin,/bin:/usr/bin:${PREFIX}/bin,'
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 
 SUBST_CLASSES+=		hardwired
 SUBST_FILES.hardwired=	share/html/NoAuth/RichText/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl \
@@ -44,7 +44,7 @@ SUBST_FILES.hardwired=	share/html/NoAuth/RichText/FCKeditor/editor/dialog/fck_sp
 			etc/upgrade/shrink_transactions_table.pl \
 			etc/upgrade/upgrade-mysql-schema.pl
 SUBST_SED.hardwired=	-e 's,/usr/bin/perl,'${PERL5}','
-SUBST_STAGE.hardwired=	post-patch
+SUBST_STAGE.hardwired=	pre-configure
 
 RT_CONFIG_FILES=	RT_Config.pm RT_SiteConfig.pm
 
diff --git a/devel/slib/Makefile b/devel/slib/Makefile
index dd58f6125d0..7856363063f 100644
--- a/devel/slib/Makefile
+++ b/devel/slib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2016/09/15 14:02:08 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=	slib-3b5
 #
@@ -29,7 +29,7 @@ INFO_FILES=	yes
 INSTALLATION_DIRS=	${PKGINFODIR} share/slib share/doc/slib
 
 SUBST_CLASSES+=		scmpath
-SUBST_STAGE.scmpath=	post-patch
+SUBST_STAGE.scmpath=	pre-configure
 SUBST_FILES.scmpath=	guile.init
 SUBST_SED.scmpath=	-e "s|/usr/share/slib|${PREFIX}/share/slib|"
 
diff --git a/devel/sloccount/Makefile b/devel/sloccount/Makefile
index 03ab87725db..2f5a3e14915 100644
--- a/devel/sloccount/Makefile
+++ b/devel/sloccount/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/06 09:03:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:15 jperkin Exp $
 
 
 DISTNAME=	sloccount-2.26
@@ -50,14 +50,14 @@ REPLACE_PERL+=		sql_count
 
 SUBST_CLASSES+=		generic
 SUBST_MESSAGE.generic=	Fixing path to internal generic_count binary.
-SUBST_STAGE.generic=	post-patch
+SUBST_STAGE.generic=	pre-configure
 SUBST_SED.generic=	-e 's,^generic_count,${PREFIX}/libexec/sloccount/&,g'
 SUBST_FILES.generic=	ada_count awk_count csh_count exp_count lisp_count \
 			makefile_count ruby_count sed_count sh_count tcl_count
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing path to internal binaries.
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_SED.prefix=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_FILES.prefix=	compute_all compute_sloc_lang lex_count sloccount
 
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index cb6f0739955..3c10abadd05 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/11/06 19:55:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:15 jperkin Exp $
 
 DISTNAME=		tcllib-1.18
 CATEGORIES=		devel
@@ -16,13 +16,13 @@ NO_BUILD=		yes
 CONFIGURE_ENV+=		ac_cv_path_tclsh=${TCLSH:Q}
 
 SUBST_CLASSES+=		fix
-SUBST_STAGE.fix=	post-patch
+SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix=	modules/doctools/mpformats/_html.tcl
 SUBST_SED.fix=		-e "s,/usr/bin/wget -q -O,${FETCH_CMD:Q} -V -o,g"
 SUBST_MESSAGE.fix=	Fixing hardcoded ftp binary.
 
 SUBST_CLASSES+=		tclsh
-SUBST_STAGE.tclsh=	post-patch
+SUBST_STAGE.tclsh=	pre-configure
 SUBST_FILES.tclsh=	modules/pki/pki.tcl apps/dtplite apps/nns apps/nnsd\
 SUBST_FILES.tclsh+=	apps/nnslog apps/page apps/pt apps/tcldocstrip
 SUBST_SED.tclsh=	-e "s,/usr/bin/env.*tclsh,${TCLSH},g"
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index adf49fcc2a3..afad3f7ac50 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/12/29 04:54:38 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=	tclreadline-2.1.0
@@ -23,7 +23,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/pkgIndex.tcl.in
 SUBST_FILES.paths+=	${WRKSRC}/tclreadlineInit.tcl.in
 SUBST_FILES.paths+=	${WRKSRC}/tclreadlineSetup.tcl.in
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,\/usr\/local,${PREFIX},'
 SUBST_SED.paths+=	-e 's,\/usr\/locanl,${PREFIX},'
 
diff --git a/devel/ucl/Makefile b/devel/ucl/Makefile
index 627fcf8178a..d4752195b56 100644
--- a/devel/ucl/Makefile
+++ b/devel/ucl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2015/10/12 23:19:40 agc Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=	ucl-1.03
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--enable-shared=yes
 
 # Avoid path to build directory in example Makefile
 SUBST_CLASSES+=		example
-SUBST_STAGE.example=	post-patch
+SUBST_STAGE.example=	pre-configure
 SUBST_FILES.example=	examples/Makefile.in
 SUBST_SED.example=	-e "s|@MAKEINFO@||g"
 
diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index dcc684b89ae..bcf6fab5533 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/09/06 10:40:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:16 jperkin Exp $
 
 DISTNAME=	ucpp-1.3.2
 CATEGORIES=	devel
@@ -17,7 +17,7 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 CFLAGS+=	-DSTD_MACROS=0 -DSTD_ASSERT=0 -DNO_UCPP_BUF
 SUBST_CLASSES+=	config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	config.h
 # remove /usr/local/include from default path
 SUBST_SED.config=	-e 's|"/usr/local/include", ||'
diff --git a/devel/uno/Makefile b/devel/uno/Makefile
index faf7de4ecaf..23e9d4229e6 100644
--- a/devel/uno/Makefile
+++ b/devel/uno/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/09/16 21:36:43 wiedi Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=		uno_v213
@@ -35,7 +35,7 @@ BUILDLINK_TRANSFORM+=	rm:-m32
 .endif
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	makefile
 SUBST_SED.prefix=	-e "s,/usr/bin,${PREFIX}/bin,g"
 SUBST_MESSAGE.prefix=	Fixing hardcoded paths.
diff --git a/devel/vanessa_logger/Makefile b/devel/vanessa_logger/Makefile
index 6ec34b1476c..b8bfd103c20 100644
--- a/devel/vanessa_logger/Makefile
+++ b/devel/vanessa_logger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/10/31 11:19:53 asau Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:16 jperkin Exp $
 
 DISTNAME=	vanessa_logger-0.0.8
 CATEGORIES=	devel
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Msunpro)
 SUBST_CLASSES+=			__function__
-SUBST_STAGE.__function__=	post-patch
+SUBST_STAGE.__function__=	pre-configure
 SUBST_FILES.__function__=	libvanessa_logger/vanessa_logger.h
 SUBST_SED.__function__=		-e "s|__FUNCTION__|__FILE__|g"
 .endif
diff --git a/devel/zookeeper/Makefile b/devel/zookeeper/Makefile
index 9e2f1617f03..cd35f8d4a9a 100644
--- a/devel/zookeeper/Makefile
+++ b/devel/zookeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/09/06 11:12:19 fhajny Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:16 jperkin Exp $
 #
 
 .include "Makefile.common"
@@ -43,7 +43,7 @@ BUILDDIR=		${WRKSRC}/build/${DISTNAME}
 EGDIR=			share/examples/zookeeper
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing ZooKeeper default paths
 SUBST_FILES.paths=	conf/zoo_sample.cfg
 SUBST_FILES.paths+=	src/packages/templates/conf/zookeeper-env.sh
diff --git a/devel/zzuf/Makefile b/devel/zzuf/Makefile
index 418f0260612..a7c45b4be70 100644
--- a/devel/zzuf/Makefile
+++ b/devel/zzuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/10/02 13:36:32 wiedi Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=	zzuf-0.15
@@ -22,7 +22,7 @@ SUBST_CLASSES+=		fix-paths
 SUBST_FILES.fix-paths=	doc/libzzuf.3.in
 SUBST_MESSAGE.fix-paths=Fixing hard-coded pathnames
 SUBST_SED.fix-paths=	-e 's,/usr,${PREFIX},g'
-SUBST_STAGE.fix-paths=	post-patch
+SUBST_STAGE.fix-paths=	pre-configure
 
 .include "../../mk/bsd.fast.prefs.mk"
 
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 635a0ca6880..d00bc7ed968 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2018/04/17 22:29:37 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2018/07/04 13:40:16 jperkin Exp $
 #
 # changelog at http://www.texmacs.org/tmweb/about/changes.en.html
 
@@ -35,7 +35,7 @@ REPLACE_PYTHON+=	plugins/sage/bin/tm_sage
 REPLACE_PYTHON+=	plugins/mathematica/bin/realpath.py
 
 SUBST_CLASSES+=		init
-SUBST_STAGE.init=	post-patch
+SUBST_STAGE.init=	pre-configure
 SUBST_FILES.init=	plugins/python/progs/init-python.scm
 SUBST_SED.init=		-e 's,@PYTHONBIN@,${PYTHONBIN},g'
 
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index e6fe03bafbe..ad903a0d0fb 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/16 20:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=	lpe-1.2.6
@@ -26,7 +26,7 @@ MAKE_ENV=		EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}"
 CFLAGS=			-DPREFIX="\"${PREFIX}\""
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	man/lpe.1.cs man/lpe.1.de man/lpe.1.en man/lpe.1.es
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},'
 
diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile
index 158f11f2599..ab587479bf7 100644
--- a/editors/rox-edit/Makefile
+++ b/editors/rox-edit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:44 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:16 jperkin Exp $
 #
 
 DISTNAME=	edit-2.0
@@ -27,7 +27,7 @@ INSTALLATION_DIRS=	share/rox/Edit
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/editors/tomboy/Makefile b/editors/tomboy/Makefile
index ab419d9d18e..b339864b061 100644
--- a/editors/tomboy/Makefile
+++ b/editors/tomboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2018/04/17 22:29:38 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2018/07/04 13:40:16 jperkin Exp $
 
 DISTNAME=		tomboy-1.2.1
 PKGREVISION=		59
@@ -21,7 +21,7 @@ PKGCONFIG_OVERRIDE+=	data/tomboy-addins.pc.in
 REPLACE_BASH+=		Tomboy/tomboy.in Tomboy/tomboy-panel.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/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common
index 99d70ef5830..e6322221055 100644
--- a/editors/vim-share/Makefile.common
+++ b/editors/vim-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.161 2018/03/04 16:26:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.162 2018/07/04 13:40:17 jperkin Exp $
 
 # used by editors/vim/Makefile
 # used by editors/vim-gtk2/Makefile
@@ -60,7 +60,7 @@ ALTERNATIVES_SRC=
 
 SUBST_CLASSES+=		sysconfdir
 SUBST_FILES.sysconfdir=	feature.h
-SUBST_STAGE.sysconfdir=	post-patch
+SUBST_STAGE.sysconfdir=	pre-configure
 SUBST_VARS.sysconfdir=	PKG_SYSCONFDIR
 
 post-patch:
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index f0a8374e44f..e80c4b46c9a 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/09/16 03:27:20 maya Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dosbox-0.74
 PKGREVISION=	10
@@ -22,7 +22,7 @@ LDFLAGS.SunOS+=		-lsocket
 INSTALLATION_DIRS=	share/doc/dosbox
 
 SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
+SUBST_STAGE.fixme=	pre-configure
 SUBST_FILES.fixme=	docs/dosbox.1
 SUBST_SED.fixme=	-e s,/usr/share/,${PREFIX}/share/,g
 
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index e873f170974..9bfb74be272 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/01 16:47:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dynagen-0.11.0
 PKGREVISION=	4
@@ -18,7 +18,7 @@ REPLACE_PYTHON+= dynagen confConsole.py console.py dynamips_lib.py pemu_lib.py \
 		pemubin.py pemuwrapper.py
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	dynagen
 SUBST_SED.paths=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 SUBST_SED.paths+=	-e "s|@PREFIX@|${PREFIX}|"
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 42b4536a24e..54b85c1c2b2 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/01/17 20:22:36 markd Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dynamips-0.2.17
 CATEGORIES=	emulators
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake
 USE_CMAKE=	yes
 
 SUBST_CLASSES+=		libelf
-SUBST_STAGE.libelf=	post-patch
+SUBST_STAGE.libelf=	pre-configure
 SUBST_FILES.libelf=	common/dynamips.h common/rom2c.c
 SUBST_SED.libelf=	-e 's,<libelf.h>,<libelf/libelf.h>,'
 SUBST_MESSAGE.libelf=	Fix libelf header file path
diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index 3f21d9d746f..d364eca7d82 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/04/29 21:31:35 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	abba19584636c28cd98e3810e857f493cb63d06c
 PKGNAME=	emulationstation-2.0.0_rc1_20150210
@@ -22,19 +22,19 @@ WRKSRC=		${WRKDIR}/EmulationStation-${DISTNAME}
 INSTALLATION_DIRS=	bin share/doc/emulationstation
 
 SUBST_CLASSES+=		fceu
-SUBST_STAGE.fceu=	post-patch
+SUBST_STAGE.fceu=	pre-configure
 SUBST_MESSAGE.fceu=	Adjusting config file path to retroarch backend
 SUBST_FILES.fceu=	es-app/src/SystemData.cpp
 SUBST_SED.fceu=		-e "s|~/cores/libretro-fceumm.so|${PREFIX}/lib/libretro/fceumm_libretro.so|"
 
 SUBST_CLASSES+=		ra
-SUBST_STAGE.ra=		post-patch
+SUBST_STAGE.ra=		pre-configure
 SUBST_MESSAGE.ra=	Adjusting path to retroarch backends in documentation
 SUBST_FILES.ra=		SYSTEMS.md
 SUBST_SED.ra=		-e "s|/usr|${PREFIX}|"
 
 SUBST_CLASSES+=		etc
-SUBST_STAGE.etc=	post-patch
+SUBST_STAGE.etc=	pre-configure
 SUBST_MESSAGE.etc=	Adjusting path to global configuration files
 SUBST_FILES.etc=	es-app/src/SystemData.cpp es-core/src/ThemeData.cpp
 SUBST_FILES.etc+=	GAMELISTS.md README.md THEMES.md
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 33f675653c1..5b9c8fa71e8 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/04/25 14:20:44 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:17 jperkin Exp $
 #
 
 DISTNAME=		fceu-0.98.13.src
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	src/drivers/sexyal/drivers/oss.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index f7b3616d51a..f078667fc4e 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/08/24 22:52:55 mrg Exp $
+# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	gxemul-0.6.0.1
 PKGREVISION=	6
@@ -37,7 +37,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 .if !empty(PKG_OPTIONS:Mx11)
 GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SUBST_CLASSES+=		x11
-SUBST_STAGE.x11=	post-patch
+SUBST_STAGE.x11=	pre-configure
 SUBST_FILES.x11=	configure
 SUBST_SED.x11=		-e 's|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS:Q}|g'
 SUBST_SED.x11+=		-e 's|/usr/X11R6|${X11BASE}|g'
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 541e6df4d85..0cb15fcc78d 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/03/17 01:27:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=		pearpc-0.5
 CATEGORIES=		emulators
@@ -40,7 +40,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${DESTDIR}${EGDIR}
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	ppccfg.example
 SUBST_SED.conf=		-e "s|\"nvram\"|\"/tmp/nvram\"|"
 SUBST_MESSAGE.conf=	Fixing configuration file.
diff --git a/emulators/simulavr/Makefile b/emulators/simulavr/Makefile
index 432f62ba9ad..abaa83823c2 100644
--- a/emulators/simulavr/Makefile
+++ b/emulators/simulavr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/18 07:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:17 jperkin Exp $
 #
 DISTNAME=		simulavr-1.0.0
 PKGREVISION=		3
@@ -35,7 +35,7 @@ INFO_FILES=		yes
 
 # Interim fix
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix include path finding Python.h
 SUBST_FILES.prefix=	src/Makefile.in
 SUBST_VARS.prefix=	PREFIX
@@ -44,7 +44,7 @@ SUBST_VARS.prefix=	PREFIX
 # See also
 #  http://savannah.nongnu.org/bugs/?35737
 SUBST_CLASSES+=		compare2
-SUBST_STAGE.compare2=	post-patch
+SUBST_STAGE.compare2=	pre-configure
 SUBST_MESSAGE.compare2=	Convert poisoned SIG_OUTPUT_COMPARE2 to TIMER2_COMP_vect
 SUBST_FILES.compare2=	examples/atmega128_timer/main.c
 SUBST_FILES.compare2+=	examples/python/example.c
@@ -58,14 +58,14 @@ SUBST_SED.compare2=	-e 's/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/g'
 # kb.c:39:8: error: attempt to use poisoned "SIG_INTERRUPT0"
 
 SUBST_CLASSES+=		uart0
-SUBST_STAGE.uart0=	post-patch
+SUBST_STAGE.uart0=	pre-configure
 SUBST_MESSAGE.uart0=	Convert poisoned SIG_UART0_RECV to USART0_RX_vect
 SUBST_FILES.uart0=	examples/atmel_key/StdDefs.h
 SUBST_SED.uart0=	-e 's/SIG_UART0_RECV/USART0_RX_vect/g'
 SUBST_SED.uart0+=	-e 's/SIG_UART0_DATA/USART0_UDRE_vect/g'
 
 SUBST_CLASSES+=		intrpt0
-SUBST_STAGE.intrpt0=	post-patch
+SUBST_STAGE.intrpt0=	pre-configure
 SUBST_MESSAGE.intrpt0=	Convert poisoned SIG_INTERRUPT0 to INT0_vect
 SUBST_FILES.intrpt0=	examples/atmel_key/kb.c
 SUBST_FILES.intrpt0+=	examples/python/multicore.c
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 65d1dd356b8..c746306f453 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/04/16 14:34:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:17 jperkin Exp $
 #
 
 DISTNAME=	ski-1.3.2
@@ -36,7 +36,7 @@ SUBST_FILES.xski-app=	Makefile.am
 SUBST_SED.xski-app=	-e 's,/etc/X11/app-defaults,${PREFIX}/lib/X11/app-defaults,g'
 
 SUBST_CLASSES+=		ssx-app
-SUBST_STAGE.ssx-app=	post-patch
+SUBST_STAGE.ssx-app=	pre-configure
 SUBST_MESSAGE.ssx-app=	Fixing X11 ssX.c app-default paths.
 SUBST_FILES.ssx-app=	src/ssX.c
 SUBST_SED.ssx-app=	-e 's,XSKI_RESOURCE_FILE,${PREFIX}/lib/X11/app-defaults/XSki,g'
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 400b711c1a1..9f77f9058a3 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/10/03 12:55:18 asau Exp $
+# $NetBSD: Makefile,v 1.44 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	spim-8.0
 PKGREVISION=	1
@@ -19,7 +19,7 @@ USE_TOOLS+=		gzip flex yacc
 INSTALL_TARGET=		install
 
 SUBST_CLASSES+=		cpudir
-SUBST_STAGE.cpudir=	post-patch
+SUBST_STAGE.cpudir=	pre-configure
 SUBST_MESSAGE.cpudir=	rename CPU_DIR
 SUBST_FILES.cpudir=	spim/Makefile xspim/Imakefile
 SUBST_SED.cpudir=	-e s:CPU_DIR:CPUDIR:
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 28f25c448f2..2c16bfc324e 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=		tuxnes-0.75
 PKGREVISION=		4
@@ -17,13 +17,13 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	consts.h
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
 SUBST_CLASSES.SunOS+=	gld
-SUBST_STAGE.gld=	post-patch
+SUBST_STAGE.gld=	pre-configure
 SUBST_MESSAGE.gld=	Using GNU ld to create table.o
 SUBST_FILES.gld=	Makefile.in
 SUBST_SED.gld=		-e "/ld -r/s/ld/gld/"
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 9d38188a65f..f9d25b74c13 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/03/06 15:50:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	xbeeb-0.4.1
 PKGREVISION=	3
@@ -31,13 +31,13 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .if ${OSS_TYPE} != "none"
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path
 SUBST_FILES.dsp=	src/SoundOSS.c
 SUBST_SED.dsp=		-e "s|\"/dev/dsp\"|\"${DEVOSSAUDIO}\"|"
 
 SUBST_CLASSES+=		osslib
-SUBST_STAGE.osslib=	post-patch
+SUBST_STAGE.osslib=	pre-configure
 SUBST_MESSAGE.osslib=	Linking OSS library
 SUBST_FILES.osslib=	src/Imakefile
 SUBST_SED.osslib=	-e "s|\\(SYS_LIBRARIES[	 ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
@@ -45,7 +45,7 @@ SUBST_SED.osslib=	-e "s|\\(SYS_LIBRARIES[	 ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
 .else
 
 SUBST_CLASSES+=		nooss
-SUBST_STAGE.nooss=	post-patch
+SUBST_STAGE.nooss=	pre-configure
 SUBST_MESSAGE.nooss=	Disabling sound support: No OSS on this platform
 SUBST_FILES.nooss=	src/Config.h
 SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
@@ -53,7 +53,7 @@ SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
 .endif # OSS_TYPE
 
 SUBST_CLASSES+=		beebroot
-SUBST_STAGE.beebroot=	post-patch
+SUBST_STAGE.beebroot=	pre-configure
 SUBST_MESSAGE.beebroot=	Adjusting XBEEBROOT path
 SUBST_FILES.beebroot=	src/Config.h
 SUBST_SED.beebroot=	-e "s|^\\(\#define[	 ]*XBEEBROOT[	 ]*\\)[^	 ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
diff --git a/emulators/xbeeb/options.mk b/emulators/xbeeb/options.mk
index d621dee2826..45fe8f5b1cc 100644
--- a/emulators/xbeeb/options.mk
+++ b/emulators/xbeeb/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2018/07/04 13:40:18 jperkin Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=
 # Unfortunately it doesn't support both at once.
 .if empty(PKG_OPTIONS:Mmitshm)
 SUBST_CLASSES+=		nomitshm
-SUBST_STAGE.nomitshm=	post-patch
+SUBST_STAGE.nomitshm=	pre-configure
 SUBST_MESSAGE.nomitshm=	Disabling MIT-SHM
 SUBST_FILES.nomitshm=	src/Config.h
 SUBST_SED.nomitshm=	-e "s|\#define	*MITSHM|\#undef MITSHM|"
diff --git a/filesystems/fuse-afpfs-ng/Makefile b/filesystems/fuse-afpfs-ng/Makefile
index 2532ba65b4c..acdac225fb3 100644
--- a/filesystems/fuse-afpfs-ng/Makefile
+++ b/filesystems/fuse-afpfs-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/01/01 11:52:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	afpfs-ng-0.8.1
 PKGNAME=	fuse-${DISTNAME}
@@ -21,7 +21,7 @@ REPLACE_SH+=	fuse/afpfs
 .include "../../mk/readline.buildlink3.mk"
 
 SUBST_CLASSES+=		termcap
-SUBST_STAGE.termcap=	post-patch
+SUBST_STAGE.termcap=	pre-configure
 SUBST_FILES.termcap=	configure.ac configure cmdline/Makefile.*
 .if ${TERMCAP_TYPE} == none
 SUBST_SED.termcap+=	-e 's|ncurses||'
diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile
index 72f83c9c796..ef30e33c42a 100644
--- a/filesystems/fuse-gmailfs/Makefile
+++ b/filesystems/fuse-gmailfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/03 05:03:16 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	gmailfs-0.7.2
 PKGREVISION=	3
@@ -18,7 +18,7 @@ CONF_FILES=		${PREFIX}/share/examples/gmailfs/gmailfs.conf \
 			${PKG_SYSCONFDIR}/gmailfs.conf
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	gmailfs.py mount.gmailfs
 SUBST_SED.config=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_SED.config+=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/filesystems/fuse-svnfs/Makefile b/filesystems/fuse-svnfs/Makefile
index 2ef3850294e..c40b87491f9 100644
--- a/filesystems/fuse-svnfs/Makefile
+++ b/filesystems/fuse-svnfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/04/14 07:34:20 adam Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:18 jperkin Exp $
 #
 
 DISTNAME=	svnfs-0.4
@@ -22,7 +22,7 @@ REPLACE_PERL=	svn-config.pl
 SUBST_CLASSES+=		svn
 SUBST_FILES.svn=	svn-config.pl
 SUBST_MESSAGE.svn=	Fixing subversion pathnames in ${SUBST_FILES.svn}
-SUBST_STAGE.svn=	post-patch
+SUBST_STAGE.svn=	pre-configure
 SUBST_VARS.svn=		LOCALBASE
 
 BUILDLINK_ABI_DEPENDS.subversion-base+=	subversion-base>=1.4.3nb2
diff --git a/filesystems/fuse-wikipediafs/Makefile b/filesystems/fuse-wikipediafs/Makefile
index 6a4072d4236..509dcc4920f 100644
--- a/filesystems/fuse-wikipediafs/Makefile
+++ b/filesystems/fuse-wikipediafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/03 05:03:16 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	wikipediafs-0.4
 PKGNAME=	fuse-${DISTNAME}
@@ -14,7 +14,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-fuse-bindings
 EGG_NAME=	wikipediafs-0.0.0
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	setup.py
 SUBST_SED.config+=	-e "s|/usr/share/man/man1/|${PKGMANDIR}/man1/|g"
 SUBST_MESSAGE.config=   Fixing paths.
diff --git a/finance/tclticker/Makefile b/finance/tclticker/Makefile
index 37369595520..3506a28dc1c 100644
--- a/finance/tclticker/Makefile
+++ b/finance/tclticker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/10/09 14:06:32 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:18 jperkin Exp $
 #
 
 DISTNAME=	tclticker-1.1
@@ -18,7 +18,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths and command names.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	tclticker mailquote
 SUBST_SED.paths=	-e 's|@PREFIX@|${PREFIX}|g'
 
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 098cfe6a7f7..7bf45434996 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2014/10/09 14:06:33 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	t1lib-5.1.2
 PKGREVISION=	6
@@ -38,7 +38,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	t1lib.config.sample
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/t1lib.config.sample ${WRKSRC}
diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index aa7ba435833..d57e3bbe075 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/30 22:37:57 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	0verkill-0.16
 PKGREVISION=	1
@@ -16,13 +16,13 @@ INSTALLATION_DIRS=	bin share/0verkill share/doc/0verkill
 INSTALLATION_DIRS+=	share/0verkill/data share/0verkill/grx
 
 SUBST_CLASSES+=		grx
-SUBST_STAGE.grx=	post-patch
+SUBST_STAGE.grx=	pre-configure
 SUBST_MESSAGE.grx=	Fix game data paths
 SUBST_FILES.grx=	data/sprites.dat data/level1.sp data/level2.sp
 SUBST_SED.grx=		-e "s|grx/|${PREFIX}/share/0verkill/grx/|g"
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix game configuration path prefix
 SUBST_FILES.prefix=	cfg.h
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile
index f100aef29c3..b83c71fe0c6 100644
--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/07/03 05:03:17 adam Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	blindmine-0.3-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	blindmine.py sdl_ui.py
 SUBST_SED.path=		-e 's,/usr/bin/env python,${PYTHONBIN},g'
 
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index abab6fc7ed9..abb65a6bd98 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2018/04/29 21:31:36 adam Exp $
+# $NetBSD: Makefile,v 1.62 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	bzflag-2.4.2
 PKGREVISION=	15
@@ -21,7 +21,7 @@ USE_CURSES=	resizeterm
 
 .if ${OPSYS} !=  "Linux"
 SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
+SUBST_STAGE.fixme=	pre-configure
 SUBST_FILES.fixme=	src/platform/Makefile.in
 SUBST_SED.fixme=	-e "s|@LINUX_TRUE@||g"
 SUBST_SED.fixme+=	-e "s|@LINUX_FALSE@|\#|g"
diff --git a/games/crossfire-client/Makefile.common b/games/crossfire-client/Makefile.common
index ea51250419b..7c9c0107283 100644
--- a/games/crossfire-client/Makefile.common
+++ b/games/crossfire-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/10/06 11:54:34 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2018/07/04 13:40:18 jperkin Exp $
 # used by games/crossfire-client/Makefile
 # used by games/crossfire-client-gtk/Makefile
 # used by games/crossfire-client-gtk2/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 REPLACE_PERL+=		common/items.pl utils/deftoheader.pl
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting path to sound device.
 SUBST_FILES.dsp=	sound-src/cfsndserv.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/et/Makefile b/games/et/Makefile
index 38e9f93db96..f927830c44a 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/08/16 20:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -28,7 +28,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/et ${WRKDIR}/etded
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 pre-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index ca19c9574c6..dc33d165e73 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -33,7 +33,7 @@ LIBS.SunOS+=		-lm
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Configuring program paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	include/config.h src/fe-config.in
 SUBST_FILES.paths+=	sys/unix/nethack.sh
 SUBST_SED.paths=	-e "s,XXXPREFIXXXX,${PREFIX},g"
@@ -41,7 +41,7 @@ SUBST_SED.paths+=	-e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g"
 
 SUBST_CLASSES.NetBSD+=	unixconf
 SUBST_MESSAGE.unixconf=	Configuring to use NetBSD presets.
-SUBST_STAGE.unixconf=	post-patch
+SUBST_STAGE.unixconf=	pre-configure
 SUBST_FILES.unixconf=	include/unixconf.h
 SUBST_SED.unixconf=	-e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,'
 SUBST_SED.unixconf+=	-e 's,^\#define SYSV,\/\* \#define SYSV \*\/,'
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 36c86d6b196..3dfabc0baee 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:22:54 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	fillets-ng-0.7.3
@@ -19,7 +19,7 @@ LDFLAGS.DragonFly=	-lX11
 LDFLAGS.SunOS+=		-lX11
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	fillets.6
 SUBST_MESSAGE.man=	Fixing documentation path in the manual page.
 SUBST_SED.man=		"s,/usr/share/doc/fillets-ng/html/manual.html,${PREFIX}/share/doc/html/fillets-ng/manual.html,"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index f777e292c99..40399b013f9 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.52 2018/07/04 13:40:19 jperkin Exp $
 
 # used by games/freeciv-share/Makefile
 # used by games/freeciv-client/Makefile
@@ -28,7 +28,7 @@ REPLACE_PYTHON=			${WRKSRC}/common/generate_packets.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.3.2
 
 SUBST_CLASSES+=		data
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_FILES.data=	data/Makefile.in
 SUBST_SED.data+=	-e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g"
 SUBST_SED.data+=	-e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 84a681ab2f1..a74421c5df8 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile,v 1.164 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=		gnome-games-2.32.1
 PKGREVISION=		37
@@ -52,7 +52,7 @@ PY_PATCHPLIST=		yes
 
 #!/usr/bin/env sh is pretty dumb and REPLACE_SH doesn't support fixing it
 SUBST_CLASSES+=		swell
-SUBST_STAGE.swell=	post-patch
+SUBST_STAGE.swell=	pre-configure
 SUBST_FILES.swell=	swell-foop/swell-foop.in
 SUBST_SED.swell=	's:/usr/bin/env sh:${SH}:'
 
diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
index 49eea2cd207..12f8c86b483 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/29 21:31:41 adam Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	libkdegames-${_KDE_VERSION}
 PKGREVISION=	11
@@ -6,7 +6,7 @@ CATEGORIES=	games
 COMMENT=	library for the kdegames package
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	KDEGamesConfig.cmake.in
 SUBST_SED.path+=	-e 's;KDEGAMES_INCLUDE_DIR .*;KDEGAMES_INCLUDE_DIR "${PREFIX}/include");'
 
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index a4356b8ecf1..8f69d193452 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2018/04/16 14:34:31 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	pioneers-0.11.3
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	YES
 BUILDLINK_DEPMETHOD.librsvg=	build	# generates icons
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_FILES.paths=	docs/*.6
 SUBST_SED.paths=	-e s,/usr/share/,${PREFIX}/share/,
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index db78943c895..87da8bedb2a 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	powermanga-0.90
 PKGREVISION=	2
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/lib
 .endif
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_SED.path+=	-e "s,/games/powermanga,/powermanga,g"
 SUBST_MESSAGE.path=	Fixing support file installation paths.
 SUBST_FILES.path+=	data/Makefile.in
diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile
index 97b0183c027..3e36ce47ae5 100644
--- a/games/prboom-plus/Makefile
+++ b/games/prboom-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/01/14 17:34:01 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	prboom-plus-2.5.1.3
 PKGREVISION=	1
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-waddir=${PREFIX}/share/doom
 
 SUBST_CLASSES+=		gamesdir
-SUBST_STAGE.gamesdir=	post-patch
+SUBST_STAGE.gamesdir=	pre-configure
 SUBST_MESSAGE.gamesdir=	Fixing hard-coded gamesdir
 SUBST_FILES.gamesdir=	src/Makefile.in
 SUBST_SED.gamesdir+=	-e '/^gamesdir =/ s;/games;/bin;g'
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 2d823645e81..58f2dd51162 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/01/14 17:34:00 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	prboom-2.5.0
 PKGREVISION=	2
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--with-waddir=${PREFIX}/share/doom
 #CONFIGURE_ARGS+=	--enable-gl
 
 SUBST_CLASSES+=		gamesdir
-SUBST_STAGE.gamesdir=	post-patch
+SUBST_STAGE.gamesdir=	pre-configure
 SUBST_MESSAGE.gamesdir=	Fixing hard-coded gamesdir
 SUBST_FILES.gamesdir=	src/Makefile.in
 SUBST_SED.gamesdir+=	-e '/^gamesdir =/ s;/games;/bin;g'
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index d3195bacb9b..54134759df1 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	PySolFC-2.0
 PKGNAME=	${DISTNAME:tl}
@@ -221,7 +221,7 @@ REPLACE_PYTHON+= \
 	pysollib/wizardutil.py
 
 SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		post-patch
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		pysollib/settings.py
 SUBST_SED.fix-paths=		-e s,@DATADIR@,${PREFIX}/share/PySolFC/,
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 0534c8a8eb5..b8bed998cf0 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:03 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	quake2-0.3
@@ -25,11 +25,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/quake2forge
 
 SUBST_CLASSES+=		snd data
-SUBST_STAGE.snd=	post-patch
+SUBST_STAGE.snd=	pre-configure
 SUBST_FILES.snd=	src/snd_dma.c data/baseq2/config.cfg
 SUBST_SED.snd=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.snd=	Fixing hardcoded audio device.
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_FILES.data=	configure
 SUBST_SED.data=		-e s,PACKAGE=\'quake2\',PACKAGE=\'${PKGBASE}\',g
 SUBST_MESSAGE.data=	Fixing installation directories.
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 0b1034e8799..b3439b6702f 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		16
@@ -18,7 +18,7 @@ USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	libs/audio/targets/snd_oss.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index 472aa884ef3..e0a58388ef4 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	tyrquake-0.61_20140630
 PKGREVISION=	2
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/tyrquake
 LDFLAGS+=	${LIBOSSAUDIO}
 
 SUBST_CLASSES+=		audio
-SUBST_STAGE.audio=	post-patch
+SUBST_STAGE.audio=	pre-configure
 SUBST_MESSAGE.audio=	Fixing path to the audio device.
 SUBST_FILES.audio=	common/snd_oss.c
 SUBST_SED.audio=	-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 5fd19b00159..614afb8cda7 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/04/25 14:23:05 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -20,7 +20,7 @@ NO_SRC_ON_FTP=	    ${RESTRICTED}
 USE_TOOLS+=		gmake gunzip
 
 SUBST_CLASSES+=		data
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_MESSAGE.data=	Adjusting path to data.zip
 SUBST_FILES.data=	src/xrick.c
 SUBST_SED.data=		-e "s|data.zip|${PREFIX}/share/xrick/&|"
diff --git a/geography/kplex/Makefile b/geography/kplex/Makefile
index 3ffa82ecbaf..2b374bef142 100644
--- a/geography/kplex/Makefile
+++ b/geography/kplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/04/29 08:49:45 plunky Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	kplex-1.3.2
 CATEGORIES=	geography
@@ -10,7 +10,7 @@ COMMENT=	Multitransport NMEA-0183 software data multiplexer
 LICENSE=	gnu-gpl-v3
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing path to config file
 SUBST_FILES.paths=	README kplex.h kplex.conf.ex
 SUBST_SED.paths=	-e "s|/etc/kplex.conf|${PKG_SYSCONFDIR}/kplex.conf|"
diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile
index de5ba9bb296..8fcf194e503 100644
--- a/graphics/asymptote/Makefile
+++ b/graphics/asymptote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/06/08 08:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	asymptote-2.41
 CATEGORIES=	graphics
@@ -38,7 +38,7 @@ CFLAGS+=		-DGC_NO_THREAD_REDIRECTS
 REPLACE_PYTHON+=	GUI/*.py
 
 SUBST_CLASSES+=		python
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	Makefile.in
 SUBST_MESSAGE.python=	Fixing path to python interpreter.
 SUBST_SED.python+=	-e "s|/usr/bin/env python|${PYTHONBIN:Q}|g"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index fa52bc94a7a..dbe9152c529 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/09/08 21:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	aview-1.3.0rc1
 PKGNAME=	aview-1.3.0.1
@@ -25,7 +25,7 @@ USE_TOOLS+=	mktemp:run
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		programs
-SUBST_STAGE.programs=	post-patch
+SUBST_STAGE.programs=	pre-configure
 SUBST_MESSAGE.programs=	Filling @placeholders@.
 SUBST_FILES.programs=	Makefile.in
 .if (${MACHINE_ARCH} == "i386")
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 179ff103adc..f42545cd161 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/04/17 22:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2018/07/04 13:40:20 jperkin Exp $
 
 VERSION=		4.0.1
 PKGNAME=		camlimages-${VERSION}
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=		no
 WRKSRC=			${WRKDIR}/camlspotter-camlimages-v${VERSION}
 
 SUBST_CLASSES+=		omf
-SUBST_STAGE.omf=	post-patch
+SUBST_STAGE.omf=	pre-configure
 SUBST_FILES.omf=	OMakefile
 SUBST_SED.omf=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.omf+=		-e 's,@X11BASE@,${X11BASE},g'
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 9453a98520d..2a34b0bfc66 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/26 10:10:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	colord-1.3.5
 CATEGORIES=	graphics gnome
@@ -41,7 +41,7 @@ CONF_FILES+=	${CONF_DIR}/org.freedesktop.ColorManager.conf \
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fix prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	lib/colord/cd-icc-store.c
 SUBST_FILES.prefix+=	src/cd-main.c
 SUBST_FILES.prefix+=	client/cd-util.c
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 727674a354c..573690c7a2e 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/03/12 11:16:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	djview-4.10.6
@@ -18,7 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
 SUBST_CLASSES+=		nsdejavu
-SUBST_STAGE.nsdejavu=	post-patch
+SUBST_STAGE.nsdejavu=	pre-configure
 SUBST_MESSAGE.nsdejavu=	Fixing hardcoded paths.
 SUBST_FILES.nsdejavu=	nsdejavu/nsdejavu.c
 SUBST_SED.nsdejavu=	-e 's:/usr/local/lib:${LOCALBASE}/lib:'
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index d0f5f723cbc..2112ef33cd3 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2018/04/17 22:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	f-spot-0.8.2
 PKGREVISION=	49
@@ -30,7 +30,7 @@ REPLACE_BASH+=	src/Clients/MainApp/f-spot.in
 REPLACE_BASH+=	tools/f-spot-import
 
 SUBST_CLASSES+=			fix-x11
-SUBST_STAGE.fix-x11=		post-patch
+SUBST_STAGE.fix-x11=		pre-configure
 SUBST_MESSAGE.fix-x11=		Fixing libX11 references
 SUBST_FILES.fix-x11=		src/Core/FSpot.Utils/FSpot.Utils.dll.config.in
 SUBST_FILES.fix-x11+=		src/Core/FSpot.Utils/FSpot.Utils.dll.config
@@ -39,7 +39,7 @@ SUBST_FILES.fix-x11+=		lib/Hyena/build/DllMapVerifier.cs
 SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 
 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/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 49a2b8d110b..4f6a2fcf3e8 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2018/01/25 20:13:08 leot Exp $
+# $NetBSD: Makefile,v 1.75 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	imlib2-1.4.10
 CATEGORIES=	graphics
@@ -27,7 +27,7 @@ SHLIB_SUFFIX=		so
 .endif
 
 SUBST_CLASSES+=		shlib rpath
-SUBST_STAGE.shlib=	post-patch
+SUBST_STAGE.shlib=	pre-configure
 SUBST_MESSAGE.shlib=	Replacing shared library suffix
 SUBST_FILES.shlib+=	src/lib/image.c
 SUBST_SED.shlib+=	-e 's,"\.so",".${SHLIB_SUFFIX}",'
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4602fd250c0..9e9c4782aa8 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.217 2018/02/20 07:04:54 dholland Exp $
+# $NetBSD: Makefile,v 1.218 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	netpbm-10.79.04
 CATEGORIES=	graphics
@@ -43,7 +43,7 @@ WRKSRC=		${WRKDIR}/netpbm
 WRAPPER_REORDER_CMDS+=	reorder:l:rle:netpbm
 
 SUBST_CLASSES+=		rgb_txt
-SUBST_STAGE.rgb_txt=	post-patch
+SUBST_STAGE.rgb_txt=	pre-configure
 SUBST_MESSAGE.rgb_txt=	Configure RGB_TXT
 SUBST_FILES.rgb_txt=	config.mk
 SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,'
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 6b43d3b75e3..4c76c3733ed 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/09/16 19:26:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	qrcode-5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,7 +23,7 @@ SUBST_CLASSES+=			pkgmandir
 SUBST_FILES.pkgmandir=		setup.py
 SUBST_MESSAGE.pkgmandir=	Fixing PKGMANDIR path.
 SUBST_SED.pkgmandir=		-e "s|share/man|${PKGMANDIR}|1"
-SUBST_STAGE.pkgmandir=		post-patch
+SUBST_STAGE.pkgmandir=		pre-configure
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/qr \
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index 41afcc80cd1..859c53c3b94 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/10/09 14:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	tkpiechart-5.4
 PKGREVISION=	1
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		patch
 SUBST_MESSAGE.patch=	Remove version numbers for required packages.
-SUBST_STAGE.patch=	post-patch
+SUBST_STAGE.patch=	pre-configure
 SUBST_FILES.patch=	demo demo.tcl instapkg.tcl piechart.htm
 SUBST_SED.patch=	-e '/require/s/stooop 3.7/stooop/g'
 SUBST_SED.patch+=	-e '/require/s/switched 1.4/switched/g'
diff --git a/ham/chirp/Makefile b/ham/chirp/Makefile
index 3e41a707765..18e3887ac14 100644
--- a/ham/chirp/Makefile
+++ b/ham/chirp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/16 14:34:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	chirp-0.4.1
 PKGREVISION=	6
@@ -18,13 +18,13 @@ DEPENDS+=       ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=			fix-manpaths
-SUBST_STAGE.fix-manpaths=	post-patch
+SUBST_STAGE.fix-manpaths=	pre-configure
 SUBST_MESSAGE.fix-manpaths=	Fixing man paths
 SUBST_FILES.fix-manpaths=	setup.py
 SUBST_SED.fix-manpaths=		-e 's,share/man/man1,${PKGMANDIR}/man1,g'
 
 SUBST_CLASSES+=			fix-sharepaths
-SUBST_STAGE.fix-sharepaths=	post-patch
+SUBST_STAGE.fix-sharepaths=	pre-configure
 SUBST_MESSAGE.fix-sharepaths=	Fixing /usr/share paths
 SUBST_FILES.fix-sharepaths=	chirpw
 SUBST_FILES.fix-sharepaths+=	chirp/generic_xml.py
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index c8197bf82ff..11e781aa963 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2018/04/29 21:31:46 adam Exp $
+# $NetBSD: Makefile,v 1.103 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	fldigi-4.0.16
 PKGREVISION=	2
@@ -26,7 +26,7 @@ SUBST_MESSAGE.asciidoc=	Replacing asciidoc PATH
 SUBST_SED.asciidoc=	-e s\|/usr/share\|${PREFIX}/share\|g
 
 SUBST_CLASSES+=		brag-os
-SUBST_STAGE.brag-os=	post-patch
+SUBST_STAGE.brag-os=	pre-configure
 SUBST_FILES.brag-os=	src/misc/newinstall.cxx
 SUBST_MESSAGE.brag-os=	Show OS name correctly with Brag button
 SUBST_SED.brag-os=	-e s/@@OS@@/${OPSYS}/
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index 740a83dd534..0525de7ea48 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2018/07/03 05:03:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2018/07/04 13:40:21 jperkin Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -107,7 +107,7 @@ SUBST_MESSAGE.alsa=	Arrange the patched line depepending on alsa is in PKG_OPTIO
 SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 ## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
-SUBST_STAGE.alsa=	post-patch
+SUBST_STAGE.alsa=	pre-configure
 
 SUBST_CLASSES+=		pyvers
 SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index d5f7e6e5a7b..157ab237bc4 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/04/29 21:31:48 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=		tqsl-2.3.1
 PKGREVISION=		1
@@ -27,7 +27,7 @@ USE_CMAKE=		yes
 # remove the string $(LIB_SUFFIX), tested with NetBSD at least
 SUBST_CLASSES+=		lib-suffix
 SUBST_MESSAGE.lib-suffix= Removing $$(LIB_SUFFIX) from src/CMakeLists.txt
-SUBST_STAGE.lib-suffix= post-patch
+SUBST_STAGE.lib-suffix= pre-configure
 SUBST_FILES.lib-suffix= src/CMakeLists.txt
 SUBST_SED.lib-suffix= 	-e s/\$$\(LIB_SUFFIX\)//
 
diff --git a/inputmethod/canna-canuum/Makefile b/inputmethod/canna-canuum/Makefile
index 2006137ab41..465e9bfef6b 100644
--- a/inputmethod/canna-canuum/Makefile
+++ b/inputmethod/canna-canuum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/10/18 03:58:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:21 jperkin Exp $
 
 CANNA_MODULE=	canuum
 
@@ -14,7 +14,7 @@ INSTALL_MAKE_FLAGS+=	INSTUGIDFLAGS=
 
 .include "../../mk/curses.buildlink3.mk"
 SUBST_CLASSES+=		fix_curs
-SUBST_STAGE.fix_curs=	post-patch
+SUBST_STAGE.fix_curs=	pre-configure
 SUBST_MESSAGE.fix_curs=	Fixing curses
 SUBST_FILES.fix_curs+=	canuum/Imakefile
 SUBST_SED.fix_curs+=	-e 's/TERMCAP_LIB = .*/TERMCAP_LIB = -l'${BUILDLINK_LIBNAME.curses}'/g'
diff --git a/lang/ccsh/Makefile b/lang/ccsh/Makefile
index eee6fff9e96..95adc15e2a3 100644
--- a/lang/ccsh/Makefile
+++ b/lang/ccsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/10/09 14:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:21 jperkin Exp $
 #
 
 DISTNAME=		ccsh-0.0.4
@@ -14,7 +14,7 @@ USE_TOOLS+=		gmake
 
 SUBST_CLASSES+=		options
 SUBST_MESSAGE.options=	Preventing CFLAGS from being overridden.
-SUBST_STAGE.options=	post-patch
+SUBST_STAGE.options=	pre-configure
 SUBST_FILES.options=	Makefile
 SUBST_SED.options=	-e 's,^CFLAGS =,\#CFLAGS =,g'
 
diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile
index d9ece773832..fa7fc48c9b5 100644
--- a/lang/ecl/Makefile
+++ b/lang/ecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/01/01 18:16:36 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=		ecl-16.1.2
 CATEGORIES=		lang
@@ -19,7 +19,7 @@ INFO_FILES=		yes
 CONFIGURE_ARGS+=	--enable-boehm=system --with-system-gmp
 
 SUBST_CLASSES+=			fix-libffi-include
-SUBST_STAGE.fix-libdir=		post-patch
+SUBST_STAGE.fix-libdir=		pre-configure
 SUBST_MESSAGE.fix-libdir=	Fixing libffi layout.
 SUBST_FILES.fix-libdir=		src/c/ffi.d
 SUBST_SED.fix-libdir=		-e '/include.*<ffi/ffi.h>/s:ffi/ffi.h:ffi.h:'
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 0255cd3ba56..9c8c837369b 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2018/07/03 11:01:21 fhajny Exp $
+# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=		otp_src_${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=		${DISTNAME:S/otp_src_/erlang-/}
@@ -55,7 +55,7 @@ REPLACE_FILES.escript=	\
 	lib/snmp/src/compile/snmpc.src
 
 SUBST_CLASSES+=		target
-SUBST_STAGE.target=	post-patch
+SUBST_STAGE.target=	pre-configure
 SUBST_FILES.target=	make/target.mk
 SUBST_SED.target=	-e "s|=.*config.guess)|= ${MACHINE_GNU_PLATFORM}|"
 SUBST_MESSAGE.target=	Fixing target name.
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index e862d730e6b..206e3a0848d 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2016/07/09 06:38:25 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=	ghc-6.8.3
 PKGREVISION=	7
@@ -30,7 +30,7 @@ CONFIGURE_ENV+=		PerlCmd=${PERL5:Q}
 USE_TOOLS+=		gmake perl:run
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix+=	../ghc-6.4.2/mk/bootstrap.mk
 SUBST_FILES.prefix+=	../ghc-6.4.2/ghc/rts/package.conf.in
 SUBST_FILES.prefix+=	../ghc-6.4.2/libraries/readline/package.conf.in
diff --git a/lang/mono2/Makefile b/lang/mono2/Makefile
index 375b1780ddc..4f71016eb1d 100644
--- a/lang/mono2/Makefile
+++ b/lang/mono2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/04/14 07:33:57 adam Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=	mono-2.10.9
 PKGREVISION=	23
@@ -122,19 +122,19 @@ MAKE_DIRS+=	${PKG_SYSCONFDIR}/mono/mconfig
 TEST_TARGET=	check
 
 SUBST_CLASSES+=			fix-prefix
-SUBST_STAGE.fix-prefix=		post-patch
+SUBST_STAGE.fix-prefix=		pre-configure
 SUBST_MESSAGE.fix-prefix=	Fixing relative prefix
 SUBST_FILES.fix-prefix=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.fix-prefix=		-e 's,$${pcfiledir}/../..,\@prefix\@,g'
 
 SUBST_CLASSES+=			fix-mcs
-SUBST_STAGE.fix-mcs=		post-patch
+SUBST_STAGE.fix-mcs=		pre-configure
 SUBST_MESSAGE.fix-mcs=		Fixing mcs default prefix
 SUBST_FILES.fix-mcs=		mcs/build/config-default.make
 SUBST_SED.fix-mcs=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=			fix-cfgdir
-SUBST_STAGE.fix-cfgdir=		post-patch
+SUBST_STAGE.fix-cfgdir=		pre-configure
 SUBST_MESSAGE.fix-cfgdir=	Fixing configuration files install dir
 SUBST_FILES.fix-cfgdir=		mcs/tools/mconfig/Makefile
 SUBST_SED.fix-cfgdir=		-e 's,$$(sysconfdir)/mono,${EGDIR},g'
diff --git a/lang/pear/Makefile b/lang/pear/Makefile
index 7ec87ea9ebd..142e4f6049e 100644
--- a/lang/pear/Makefile
+++ b/lang/pear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/07/06 13:34:46 taca Exp $
+# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:22 jperkin Exp $
 #
 
 DISTNAME=	PEAR-1.10.5
@@ -53,7 +53,7 @@ DISTFILES+=		${XMLUTIL_SRCS}
 # end of base components
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	install/go-pear.php
 SUBST_SED.config=	-e "s|@WRKSRC@|${WRKSRC}|g"
 SUBST_SED.config+=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 1bb975024ca..c43281e9c74 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2018/04/27 09:44:27 adam Exp $
+# $NetBSD: Makefile,v 1.246 2018/07/04 13:40:22 jperkin Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -278,7 +278,7 @@ SUBST_SED.cpprun=	-e "s/cpprun=''/cpprun='cc -E'/"
 # let's substitute what pkgsrc says instead.
 #
 SUBST_CLASSES+=		dirmode
-SUBST_STAGE.dirmode=	post-patch
+SUBST_STAGE.dirmode=	pre-configure
 SUBST_FILES.dirmode=	installhtml install_lib.pl
 SUBST_SED.dirmode=	-e "s/755/${PKGDIRMODE}/g;/umask(/d"
 
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 53c2bb62be5..11cf5ffdd30 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/06/24 08:05:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=	rustc-1.27.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@@ -158,7 +158,7 @@ TOOLS_PATH.md5sum=	${PREFIX}/bin/gmd5sum
 .endif
 
 SUBST_CLASSES+=		rpath
-SUBST_STAGE.rpath=	post-patch
+SUBST_STAGE.rpath=	pre-configure
 SUBST_FILES.rpath=	src/bootstrap/bin/rustc.rs
 SUBST_VARS.rpath=	PREFIX
 
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 1a503836c44..7a23ae915c7 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2015/11/14 14:14:46 leot Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=		scheme48-1.9.2
 CATEGORIES=		lang
@@ -31,7 +31,7 @@ REPLACE_FILES.scheme=	build/scheme48-config.in
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 SUBST_CLASSES+=		pthr
-SUBST_STAGE.pthr=	post-patch
+SUBST_STAGE.pthr=	pre-configure
 SUBST_FILES.pthr=	configure
 SUBST_MESSAGE.pthr=	Hardcoding -pthread in CFLAGS and LDFLAGS
 SUBST_SED.pthr=		-e 's,pthreads_done=\"no\",pthreads_done=\"yes\"; CFLAGS=\"$$CFLAGS -pthread\"; LDFLAGS=\"$$LDFLAGS -pthread\",'
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index 198e63e07b8..b963a853f06 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/01/19 18:52:14 agc Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:22 jperkin Exp $
 #
 
 DISTNAME=	snobol4-1.3
@@ -20,7 +20,7 @@ LICENSE=	2-clause-bsd
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 SUBST_CLASSES+=			snobol-config
-SUBST_STAGE.snobol-config=	post-patch
+SUBST_STAGE.snobol-config=	pre-configure
 SUBST_FILES.snobol-config=	Makefile
 SUBST_SED.snobol-config+=	-e s\|M4=m4\|M4=${TOOLS_PATH.m4:Q}\|
 
diff --git a/mail/OSBF-lua/Makefile b/mail/OSBF-lua/Makefile
index 66cefc292e8..0bbc6d79826 100644
--- a/mail/OSBF-lua/Makefile
+++ b/mail/OSBF-lua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/10/19 22:27:46 alnsn Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:22 jperkin Exp $
 #
 
 DISTNAME=	osbf-lua-2.0.4
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake
 INSTALL_TARGET=	install install_spamfilter
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Fixing paths in config
 SUBST_FILES.path=	config
 SUBST_FILES.path+=	spamfilter/getopt.lua
diff --git a/mail/akonadi/options.mk b/mail/akonadi/options.mk
index d2f04cf60e9..20e3eea2d6a 100644
--- a/mail/akonadi/options.mk
+++ b/mail/akonadi/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2013/09/19 05:07:11 obache Exp $
+# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:22 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.akonadi
 
@@ -27,7 +27,7 @@ CMAKE_ARGS+=	-DAKONADI_BUILD_QSQLITE=off
 PKG_FAIL_RESASON+=	"Unknown MySQL version: ${_MYSQL_VERSION}"
 .  endif
 SUBST_CLASSES+=		mysql
-SUBST_STAGE.mysql=	post-patch
+SUBST_STAGE.mysql=	pre-configure
 SUBST_MESSAGE.mysql=	Fix mysqld path.
 SUBST_FILES.mysql=	server/CMakeLists.txt
 SUBST_SED.mysql=	-e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:"
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index ec7dff637a8..2957d4b7561 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/07/09 06:38:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -63,7 +63,7 @@ SUBST_SED.paths+=	-e 's,@MKDIR@,${MKDIR},g'
 SUBST_SED.paths+=	-e 's,@RM@,${RM},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_SED.paths+=	-e 's,@TEST@,${TEST},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/sharedindexupdate.sh ${WRKDIR}/sharedindexupdate.sh
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile
index 615438e7994..e5af817e8c8 100644
--- a/mail/courier-mta/Makefile
+++ b/mail/courier-mta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2017/06/05 14:24:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/-mta-/}
@@ -82,7 +82,7 @@ SUBST_STAGE.perms=	pre-configure
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
 SUBST_SED.paths+=	-e "s,@PREFIX@,${PREFIX},g"
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 REPLACE_PERL+=	courier/webadmin/*.pl courier/webadmin/*.pl.in webadmin/*.pl
 
diff --git a/mail/dcc/Makefile b/mail/dcc/Makefile
index e0c3389d7eb..6e4012e7048 100644
--- a/mail/dcc/Makefile
+++ b/mail/dcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/28 11:50:07 maya Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:22 jperkin Exp $
 
 DISTNAME=		dcc-1.3.159
 #PKGREVISION=		2
@@ -26,7 +26,7 @@ FILES_SUBST+=		DCC_FIXMAP=${PREFIX}/libexec/fix-map
 
 # enabling/disabling daemons is done in rc.conf
 SUBST_CLASSES+=		dae
-SUBST_STAGE.dae=	post-patch
+SUBST_STAGE.dae=	pre-configure
 SUBST_FILES.dae=	homedir/dcc_conf.in
 SUBST_SED.dae=		-e 's/^\(DCCD_ENABLE=\).*$$/\1on/'
 SUBST_SED.dae+=		-e 's/^\(GREY_ENABLE=\).*$$/\1on/'
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index 2905bb1fa6f..75e62289faa 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/01/01 18:16:37 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	deliver-2.1.14
 PKGREVISION=	3
@@ -34,7 +34,7 @@ SPECIAL_PERMS+=		bin/deliver ${SETUID_ROOT_PERMS}
 .endif
 
 SUBST_CLASSES+=			sources
-SUBST_STAGE.sources=		post-patch
+SUBST_STAGE.sources=		pre-configure
 SUBST_MESSAGE.sources=		Fixing source code.
 SUBST_FILES.sources=		config.h deliver.8 conf/os-netbsd.h
 SUBST_SED.sources=		-e 's,@DELIVER_CONF_PREFIX@,${PKG_SYSCONFDIR},g'
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 04f65641d05..5f316d21a90 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/02/02 00:20:45 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	dk-milter-1.0.2
 PKGREVISION=	1
@@ -18,7 +18,7 @@ USE_TOOLS+=		gm4
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		libs
-SUBST_STAGE.libs=	post-patch
+SUBST_STAGE.libs=	pre-configure
 SUBST_FILES.libs=	site.config.m4.dist dk-filter/Makefile.m4 \
 			devtools/M4/header.m4
 SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 6034f4800b8..a057900b94f 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2018/04/14 07:34:30 adam Exp $
+# $NetBSD: Makefile,v 1.93 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	dspam-3.10.2
 PKGREVISION=	21
@@ -26,7 +26,7 @@ REPLACE_PERL+=		webui/cgi-bin/templates/*/strings.pl
 PKGCONFIG_OVERRIDE+=	src/dspam.pc.in
 
 SUBST_CLASSES+=		cgi
-SUBST_STAGE.cgi=	post-patch
+SUBST_STAGE.cgi=	pre-configure
 SUBST_FILES.cgi=	webui/cgi-bin/templates/nav_performance.html
 SUBST_FILES.cgi+=	webui/cgi-bin/configure.pl.in
 SUBST_FILES.cgi+=	webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 7d1fa956bff..a2f7a97816e 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/04/06 15:46:37 rodent Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
@@ -30,7 +30,7 @@ CONF_FILES=		${PREFIX}/lib/elm.mimetypes-dist		\
 USE_TOOLS+=	ksh
 
 SUBST_CLASSES+=		errno
-SUBST_STAGE.errno=	post-patch
+SUBST_STAGE.errno=	pre-configure
 SUBST_MESSAGE.errno=	Fixing declaration of errno.
 SUBST_FILES.errno=	*/*.c
 SUBST_SED.errno=	-e 's,^extern int errno;,\#include <errno.h>,'
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index e06e0b927d0..9289ba02890 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2018/04/23 07:28:18 adam Exp $
+# $NetBSD: Makefile,v 1.161 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	exim-4.91
 CATEGORIES=	mail net
@@ -62,7 +62,7 @@ SUBST_FILES.exim=	scripts/exim_install
 SUBST_VARS.exim=	PKGSRC_EXIM_VERSION
 
 SUBST_CLASSES+=		cflags
-SUBST_STAGE.cflags=	post-patch
+SUBST_STAGE.cflags=	pre-configure
 SUBST_MESSAGE.cflags=	Removing hard-coded CFLAGS
 SUBST_FILES.cflags=	OS/Makefile-*
 SUBST_SED.cflags=	-e 's,^CFLAGS=.*,,'
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 8cbcded2edd..9fbe4fd7606 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2018/03/08 15:14:54 maya Exp $
+# $NetBSD: Makefile,v 1.52 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	18
@@ -79,7 +79,7 @@ SUBST_SED.paths+=	-e 's,@GZIP_CMD@,${GZIP_CMD},g'
 SUBST_SED.paths+=	-e 's,@GZCAT@,${GZCAT},g'
 SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/examples/exim
 
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 1af3e78d61c..1b4a2bc5b7e 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2017/08/01 14:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:23 jperkin Exp $
 #
 
 DISTNAME=		gld-1.7
@@ -29,11 +29,11 @@ PKG_GROUPS_VARS+=	GLD_GROUP
 PKG_USERS_VARS+=	GLD_USER
 
 SUBST_CLASSES+=		gld users
-SUBST_STAGE.gld=	post-patch
+SUBST_STAGE.gld=	pre-configure
 SUBST_FILES.gld=	gld.h
 SUBST_SED.gld=		-e "s,/etc,${PKG_SYSCONFDIR},"
 SUBST_MESSAGE.gld=	Fixing harcoded paths.
-SUBST_STAGE.users=	post-patch
+SUBST_STAGE.users=	pre-configure
 SUBST_FILES.users=	gld.conf
 SUBST_SED.users+=	-e "s|^USER=nobody|USER=${GLD_USER}|"
 SUBST_SED.users+=	-e "s|^GROUP=nobody|GROUP=${GLD_GROUP}|"
diff --git a/mail/gnus/Makefile b/mail/gnus/Makefile
index 95006149422..a3382b34713 100644
--- a/mail/gnus/Makefile
+++ b/mail/gnus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/11/23 05:59:45 mef Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	gnus-5.10.10
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -28,7 +28,7 @@ INFO_FILES=		yes
 
 SUBST_CLASSES+=		destdir
 SUBST_FILES.destdir=	etc/Makefile.in lisp/Makefile.in texi/Makefile.in
-SUBST_STAGE.destdir=	post-patch
+SUBST_STAGE.destdir=	pre-configure
 SUBST_MESSAGE.destdir=	Convert install to ${DESTDIR}
 SUBST_SED.destdir=	-e  '/(etcdir)/s,\$$(etcdir),\$$(DESTDIR)/\$$(etcdir)/,'
 SUBST_SED.destdir+=	-e '/(lispdir)/s,\$$(lispdir),\$$(DESTDIR)/\$$(lispdir)/,'
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index ebcd31a5e96..8c63329be97 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2018/07/03 05:03:23 adam Exp $
+# $NetBSD: Makefile,v 1.82 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	mailman-2.1.25
 PKGNAME=	mailman-2.1.25
@@ -95,7 +95,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailman.conf.dist
 SUBST_SED.paths+=	-e 's,@EXECDIR@,${EXECDIR},g'
 SUBST_SED.paths+=	-e 's,@MAILMAN_DATADIR@,${MAILMAN_DATADIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 DOCFILELIST=	ACKNOWLEDGMENTS BUGS FAQ INSTALL NEWS README \
 		README-I18N.en README.CONTRIB README.NETSCAPE \
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 8be6fb854fb..9855b24b255 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/01/19 18:52:16 agc Exp $
+# $NetBSD: Makefile,v 1.53 2018/07/04 13:40:23 jperkin Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
@@ -34,11 +34,11 @@ REPLACE_CSH+=	fonts/Xmailto-hebrew fonts/Xshownonascii
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man4 ${EGDIR}
 
 SUBST_CLASSES+=		awk sys
-SUBST_STAGE.awk=	post-patch
+SUBST_STAGE.awk=	pre-configure
 SUBST_MESSAGE.awk=	Adjusting the path to awk
 SUBST_FILES.awk=	bin/sun2mime
 SUBST_SED.awk=		-e "s|/bin/nawk|${AWK}|"
-SUBST_STAGE.sys=	post-patch
+SUBST_STAGE.sys=	pre-configure
 SUBST_MESSAGE.sys=	Adjusting the path for PKG_SYSCONFDIR.
 SUBST_FILES.sys=	config.h
 SUBST_SED.sys=		-e "s|PKG_SYSCONFDIR|\"${PKG_SYSCONFDIR}\"|g"
diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
index 30018418657..1c0375ec58e 100644
--- a/mail/minimalist/Makefile
+++ b/mail/minimalist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/03 08:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:23 jperkin Exp $
 #
 
 DISTNAME=	minimalist-2.5.4-1
@@ -23,7 +23,7 @@ CONF_FILES=	${EGDIR}/minimalist.conf ${PKG_SYSCONFDIR}/minimalist.conf
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-1/.1/1}
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	minimalist.conf-sample
 SUBST_FILES.path+=	minimalist.pl
 SUBST_FILES.path+=	contrib/minimalist_request.pl
diff --git a/mail/mush/Makefile b/mail/mush/Makefile
index fd7cab28316..6ccf3825d14 100644
--- a/mail/mush/Makefile
+++ b/mail/mush/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/02/25 15:00:51 jperkin Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:24 jperkin Exp $
 
 DISTNAME=	mush-7.2.5
 PKGNAME=	mush-7.2.6.b4.pl1
@@ -40,7 +40,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	config.h-dist ${PLAT_MAKEFILE}
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@MANDIR@,${PREFIX}/${PKGMANDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 pre-configure:
 	${CP} ${WRKSRC}/config.h-dist ${WRKSRC}/config.h
diff --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk
index 6da185a20dd..d3c7c072138 100644
--- a/mail/neomutt/options.mk
+++ b/mail/neomutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2017/12/21 12:22:13 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2018/07/04 13:40:24 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
@@ -63,7 +63,7 @@ LDFLAGS.SunOS+=			${COMPILER_RPATH_FLAG}/usr/xpg4/lib${LIBABISUFFIX}
 .else
 SUBST_CLASSES+=		curse
 SUBST_MESSAGE.curse=	Fixing mutt to avoid ncursesw
-SUBST_STAGE.curse=	post-patch
+SUBST_STAGE.curse=	pre-configure
 SUBST_FILES.curse=	configure.ac
 SUBST_SED.curse=	-e 's,for lib in ncurses ncursesw,for lib in ncurses,'
 .endif
diff --git a/mail/opensmtpd/Makefile b/mail/opensmtpd/Makefile
index 54b6580f889..ac9f2834d17 100644
--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:24 jperkin Exp $
 
 VERSION=	5.7.3p2
 DISTNAME=	opensmtpd-${VERSION}
@@ -48,7 +48,7 @@ RCD_SCRIPTS=	opensmtpd
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=			exampledir
 SUBST_STAGE.exampledir=		pre-configure
diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile
index e27bab4000b..6bbcd2388e7 100644
--- a/mail/pfqueue/Makefile
+++ b/mail/pfqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/09/08 11:57:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:24 jperkin Exp $
 #
 
 DISTNAME=	pfqueue-0.5.6
@@ -32,7 +32,7 @@ SUBST_SED.make+=	-e 's,-module,,'
 
 SUBST_CLASSES+=		conf
 SUBST_MESSAGE.conf=	Fixing path to config file
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	pfqconfig.c pfqueue.conf.5
 SUBST_SED.conf=		-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
 
diff --git a/mail/pfqueue/options.mk b/mail/pfqueue/options.mk
index 86a069ec7bb..a08a21048a5 100644
--- a/mail/pfqueue/options.mk
+++ b/mail/pfqueue/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/11/20 13:14:13 fhajny Exp $
+# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:24 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pfqueue
 
@@ -34,7 +34,7 @@ PLIST.socket=	yes
 .endif
 
 SUBST_CLASSES+=		backends
-SUBST_STAGE.backends=	post-patch
+SUBST_STAGE.backends=	pre-configure
 SUBST_MESSAGE.backends=	Enabling backends
 SUBST_FILES.backends=	backends/Makefile.in
 SUBST_SED.backends=	-e 's|@PFQ_BACKENDS@|${PFQ_BACKENDS:Q}|'
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 941e138ecf5..87463a5618f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.302 2018/05/21 14:49:47 taca Exp $
+# $NetBSD: Makefile,v 1.303 2018/07/04 13:40:24 jperkin Exp $
 
 .include "../../mail/postfix/Makefile.common"
 
@@ -49,7 +49,7 @@ CONF_FILES_PERMS=	# empty
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
 
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index d01e7376fc3..27eb2066e1e 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/08/05 15:21:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:24 jperkin Exp $
 #
 
 DISTNAME=		qmail-run-20170805
@@ -59,7 +59,7 @@ SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_SED.paths+=	-e 's,@SED@,${SED},g'
 SUBST_SED.paths+=	-e 's,@PKGNAME@,${PKGNAME},g'
 SUBST_SED.paths+=	-e 's,@TRUE@,${TRUE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "options.mk"
 
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index f8a4dccd96b..8aeeab04ca4 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.48 2018/05/28 12:57:36 schmonz Exp $
+# $NetBSD: options.mk,v 1.49 2018/07/04 13:40:24 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=		eai sasl syncdir tls
@@ -88,7 +88,7 @@ PATCH_DIST_STRIP.${SRS_PATCH}=	-l
 PATCH_DIST_CAT.${SRS_PATCH}=	${SED} -e 's|binm3 binm3+df|binm3 binm3+df update_tmprsadh|g' < ${SRS_PATCH}
 SUBST_CLASSES+=			srsnetq1 srsnetq2
 SUBST_STAGE.srsnetq1=		pre-patch
-SUBST_STAGE.srsnetq2=		post-patch
+SUBST_STAGE.srsnetq2=		pre-configure
 SUBST_FILES.srsnetq1=		Makefile
 SUBST_FILES.srsnetq2=		Makefile
 SUBST_SED.srsnetq1=		-e 's|^auto_split.o env.a$$|auto_split.o|'
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index 975b3854d4b..4aa9e67a16a 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/09/04 18:00:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:24 jperkin Exp $
 
 DISTNAME=		spamd-20060330
 PKGREVISION=		2
@@ -30,7 +30,7 @@ SPAMD_CONF=		${PKG_SYSCONFDIR}/spamd.conf
 CONF_FILES=		${PREFIX}/share/examples/spamd/spamd.conf ${SPAMD_CONF}
 
 SUBST_CLASSES+=		fix
-SUBST_STAGE.fix=	post-patch
+SUBST_STAGE.fix=	pre-configure
 SUBST_FILES.fix=	spamd/spamd.8
 SUBST_FILES.fix+=	spamd-setup/spamd-setup.8
 SUBST_SED.fix=		-e 's,/etc/spamd.conf,${SPAMD_CONF},g'
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index fff16e10085..5d72b00417f 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2018/02/02 00:20:45 rillig Exp $
+# $NetBSD: Makefile,v 1.68 2018/07/04 13:40:24 jperkin Exp $
 
 DISTNAME=	sympa-6.2.16
 #PKGREVISION=	3
@@ -173,7 +173,7 @@ INSTALLATION_DIRS+=	share/doc/sympa
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	configure
 SUBST_SED.paths=	-e "s|localstatedir/lib/sympa|localstatedir|g"
 SUBST_SED.paths+=	-e "s|prefix/static_content|prefix/sympa/static_content|g"
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 35a31e4d376..0df3c11c1a6 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/03/05 11:28:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:24 jperkin Exp $
 
 DISTNAME=	up-imapproxy-1.2.5
 PKGREVISION=	7
@@ -13,7 +13,7 @@ GNU_CONFIGURE=	YES
 RCD_SCRIPTS=	upimapproxy
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	include/imapproxy.h
 SUBST_SED.paths=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_MESSAGE.paths=	Fixing hard coded paths.
diff --git a/math/R-CGIwithR/Makefile b/math/R-CGIwithR/Makefile
index 60b010a58bb..13f6d7c69c2 100644
--- a/math/R-CGIwithR/Makefile
+++ b/math/R-CGIwithR/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/04/17 22:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:24 jperkin Exp $
 #
 
 PKGREVISION=		15
@@ -18,7 +18,7 @@ REPLACE.r.new=		${PREFIX}/bin/R
 REPLACE_FILES.r=	inst/examples/dangerous.R inst/examples/trivial.R
 
 SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		post-patch
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		inst/cgi-bin/R.cgi
 SUBST_SED.fix-paths=		-e 's,/usr/local,${PREFIX},g'
diff --git a/math/R-nloptr/Makefile b/math/R-nloptr/Makefile
index 4fe46cba784..ce91a8c2d6e 100644
--- a/math/R-nloptr/Makefile
+++ b/math/R-nloptr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/03/07 19:18:56 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:25 jperkin Exp $
 #
 
 CATEGORIES=	math
@@ -16,7 +16,7 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf+=	configure
 SUBST_MESSAGE.conf=	Fixing redirection of configure.
 SUBST_SED.conf=		-e "s,<<<,<,g"
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 881680fb09e..ca8d0e1d12a 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2016/03/25 21:08:58 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	libqalculate-0.9.7
 PKGNAME=	qalculate-0.9.7
@@ -22,7 +22,7 @@ UNLIMIT_RESOURCES=	datasize
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	libqalculate.pc.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
-SUBST_STAGE.pthread=	post-patch
+SUBST_STAGE.pthread=	pre-configure
 
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/mbone/beacon/Makefile b/mbone/beacon/Makefile
index c9a58e4571e..df2761f26d7 100644
--- a/mbone/beacon/Makefile
+++ b/mbone/beacon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/08/01 16:47:39 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:25 jperkin Exp $
 #
 
 DISTNAME=	beacon-1.3
@@ -21,7 +21,7 @@ PERL5_PACKLIST=		auto/Net/Multicast/Beacon/.packlist
 
 SUBST_CLASSES+=		conf
 SUBST_FILES.conf=	src/beacon.in
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_SED.conf=		-e s,@prefix@/etc,${PKG_SYSCONFDIR},
 
 CONF_FILES+=	${PREFIX}/share/examples/beacon/beacon.conf \
diff --git a/misc/ansiweather/Makefile b/misc/ansiweather/Makefile
index 6c54e4391a9..697330ba4e1 100644
--- a/misc/ansiweather/Makefile
+++ b/misc/ansiweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/02/21 11:36:43 maya Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	ansiweather-1.10
 CATEGORIES=	misc
@@ -29,7 +29,7 @@ CONF_FILES+=	${EGDIR}/ansiweatherrc.example ${PKG_SYSCONFDIR}/ansiweatherrc
 SUBST_CLASSES+=		config
 SUBST_FILES.config=	ansiweather
 SUBST_SED.config=	-e 's,~/.ansiweatherrc,${PKG_SYSCONFDIR}/ansiweatherrc,'
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 
 AUTO_MKDIRS=		yes
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index 26ebda3d59c..1d922e2ab0d 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/03/07 19:59:32 nros Exp $
+# $NetBSD: Makefile,v 1.17 2018/07/04 13:40:25 jperkin Exp $
 #
 
 DISTNAME=	ascii-3.15
@@ -19,7 +19,7 @@ EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Install PATH to ${PREFIX}
 SUBST_FILES.prefix=	Makefile
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_SED.prefix=	-e '/PREFIX/s,/usr,${PREFIX},'
 
 post-install:
diff --git a/misc/brs/Makefile b/misc/brs/Makefile
index 0fb068e65aa..f712fb8bbaf 100644
--- a/misc/brs/Makefile
+++ b/misc/brs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/08/01 17:40:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:25 jperkin Exp $
 #
 
 DISTNAME=	brs.4.00.l1
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}/bible
 BUILD_TARGET=	bible
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	bible.1
 SUBST_SED.man=		-e s,/usr/local/lib,${PREFIX}/libdata/${PKGBASE},
 BUILDLINK_TRANSFORM+=	rm:-fwritable-strings	# gcc4 doesn't know it.
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index f32f9a69e45..61db54e39ea 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.206 2018/06/24 11:16:11 wiz Exp $
+# $NetBSD: Makefile,v 1.207 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	calibre-3.26.1
 PKGREVISION=	2
@@ -55,14 +55,14 @@ FIX_PYTHON_FILES+=	*/*/*/*/*/*/*.py
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt5/bin/qmake',"
 SUBST_MESSAGE.prefix=	Fixing path to QMAKE
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	setup/build_environment.py
 
 # This one is for /usr/bin/env python (or even /usr/bin/env Python or /usr/bin/python2)
 SUBST_CLASSES+=		path
 SUBST_SED.path=		-e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	${FIX_PYTHON_FILES}
 
 REPLACE_BASH+=		resources/calibre-portable.sh
diff --git a/misc/rox-memo/Makefile b/misc/rox-memo/Makefile
index 3c9e73079f9..785076aceb1 100644
--- a/misc/rox-memo/Makefile
+++ b/misc/rox-memo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:25 jperkin Exp $
 #
 
 DISTNAME=	Memo-1.9.5
@@ -27,7 +27,7 @@ INSTALLATION_DIRS=	share/rox/Memo
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 33d849f5ee6..36ef447d767 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2018/02/01 13:34:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.107 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	screen-4.6.2
 PKGREVISION=	1
@@ -39,7 +39,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	etc/etcscreenrc doc/screen.1
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 PLIST_VARS+=		terminfo
 
diff --git a/misc/send-pr/Makefile b/misc/send-pr/Makefile
index bd6caacecac..614e7d32349 100644
--- a/misc/send-pr/Makefile
+++ b/misc/send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/08 09:57:37 asau Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	gnats-3.113.1
 PKGNAME=	send-pr-${GNATS_VERSION}
@@ -49,7 +49,7 @@ MAKE_DIRS+=		${PKG_SYSCONFDIR}/gnats \
 			${PKG_SYSCONFDIR}/gnats/gnats-adm
 
 SUBST_CLASSES+=		fix-paths
-SUBST_STAGE.fix-paths=	post-patch
+SUBST_STAGE.fix-paths=	pre-configure
 SUBST_MESSAGE.fix-paths=Fixing paths
 SUBST_FILES.fix-paths=	send-pr.sh
 SUBST_SED.fix-paths=	-e 's,install-sid,${PREFIX}/bin/install-sid,'
diff --git a/misc/vimpager/Makefile b/misc/vimpager/Makefile
index 234cdd099b9..9bf346ec274 100644
--- a/misc/vimpager/Makefile
+++ b/misc/vimpager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/03/04 16:26:51 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:25 jperkin Exp $
 
 DISTNAME=	vimpager-1.8.9
 CATEGORIES=	misc
@@ -16,7 +16,7 @@ NO_BUILD=	yes
 USE_TOOLS+=	sh:run bash:run
 
 SUBST_CLASSES+=		vimpager
-SUBST_STAGE.vimpager=	post-patch
+SUBST_STAGE.vimpager=	pre-configure
 SUBST_FILES.vimpager=	vimpager
 SUBST_SED.vimpager=	-e 's,/usr/local/etc/,${PKG_SYSCONFDIR}/,g'
 
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index be51dc32090..7050a885112 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2018/03/12 11:17:10 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:25 jperkin Exp $
 #
 
 DISTNAME=	zyGrib-7.0.0
@@ -21,7 +21,7 @@ USE_TOOLS+=	make
 CONFIGURE_ENV+=	QTDIR=${QTDIR}
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing shared data paths.
 SUBST_FILES.paths=	util/Util.h
 SUBST_VARS.paths=	PREFIX
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index d3ba5d59238..8d180087c1d 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2018/04/16 14:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2018/07/04 13:40:26 jperkin Exp $
 #
 
 DISTNAME=	avidemux_2.5.4
@@ -33,7 +33,7 @@ LIBS+=			${LIBOSSAUDIO}
 CFLAGS+=		-D__STDC_CONSTANT_MACROS
 
 SUBST_CLASSES=		audio
-SUBST_STAGE.audio=	post-patch
+SUBST_STAGE.audio=	pre-configure
 SUBST_FILES.audio=	plugins/ADM_audioDevices/Oss/ADM_deviceoss.cpp
 SUBST_SED.audio=	-e "s|\\/dev\\/dsp|${DEVOSSAUDIO}|g"
 SUBST_MESSAGE.audio=	Fixing hardcoded audio device.
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 53a20f6bb04..0f64e6f644a 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2017/08/01 14:59:02 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2018/07/04 13:40:26 jperkin Exp $
 
 DISTNAME=	dvdrip-0.98.11
 PKGREVISION=	7
@@ -38,7 +38,7 @@ MAKE_JOBS_SAFE=		no
 PERL5_PACKLIST= auto/Video/DVDRip/.packlist
 
 SUBST_CLASSES+=		fping
-SUBST_STAGE.fping=	post-patch
+SUBST_STAGE.fping=	pre-configure
 SUBST_FILES.fping+=	lib/Video/DVDRip/Cluster/Master.pm
 SUBST_SED.fping=	-e "s|/usr/sbin|${PREFIX}/sbin|g"
 SUBST_MESSAGE.fping=	Fixing hardcoded path.
diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common
index f7e7b29dc1e..3e3880b9da1 100644
--- a/multimedia/ffmpeg010/Makefile.common
+++ b/multimedia/ffmpeg010/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2018/01/25 14:15:25 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/07/04 13:40:26 jperkin Exp $
 # used by multimedia/ffmpeg010/Makefile
 
 DISTNAME=	ffmpeg-${DISTVERSION:S/-//g}
@@ -33,7 +33,7 @@ REPLACE_PERL+=	doc/texi2pod.pl
 REPLACE_SH+=	configure version.sh
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	ffserver.c
 SUBST_SED.conf=		-e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
 SUBST_MESSAGE.conf=	Fixing configuration path.
diff --git a/multimedia/ffmpeg1/Makefile.common b/multimedia/ffmpeg1/Makefile.common
index 70ec72bcecf..93a798e8041 100644
--- a/multimedia/ffmpeg1/Makefile.common
+++ b/multimedia/ffmpeg1/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2018/01/25 14:15:25 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.8 2018/07/04 13:40:26 jperkin Exp $
 # used by multimedia/ffplay1/Makefile
 # used by multimedia/ffmpeg1/Makefile
 
@@ -66,7 +66,7 @@ REPLACE_PERL+=	doc/texi2pod.pl
 REPLACE_SH+=	configure version.sh
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	ffserver.c
 SUBST_SED.conf=		-e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
 SUBST_MESSAGE.conf=	Fixing configuration path.
diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 2f7d797cba5..88538f9aef2 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2018/02/25 20:35:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.56 2018/07/04 13:40:26 jperkin Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
@@ -76,7 +76,7 @@ REPLACE_PERL+=	doc/texi2pod.pl
 REPLACE_SH+=	configure version.sh
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	ffserver.c
 SUBST_SED.conf=		-e 's,/etc/ffserver.conf,${PKG_SYSCONFDIR}/ffserver.conf,g'
 SUBST_MESSAGE.conf=	Fixing configuration path.
diff --git a/multimedia/libmp4v2/Makefile b/multimedia/libmp4v2/Makefile
index 36acad94f6c..6feec06300f 100644
--- a/multimedia/libmp4v2/Makefile
+++ b/multimedia/libmp4v2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/02/05 18:37:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:26 jperkin Exp $
 
 DISTNAME=		mpeg4ip-1.6.1
 PKGNAME=		libmp4v2-1.6.1
@@ -29,7 +29,7 @@ BUILD_DIRS=		. lib/mp4v2/util
 
 # lowercase min,max cannot be used as macros, conflicts with libstdc++6
 SUBST_CLASSES+=		minmax
-SUBST_STAGE.minmax=	post-patch
+SUBST_STAGE.minmax=	pre-configure
 SUBST_FILES.minmax=	common/video/iso-mpeg4/src/*
 SUBST_SED.minmax=	-e 's,min *(,MIN(,g' -e 's,max *(,MAX(,g'
 SUBST_MESSAGE.minmax=	replace lowercase min,max with uppercase
diff --git a/multimedia/mediatomb/Makefile b/multimedia/mediatomb/Makefile
index 82c231ec13b..ad226f9a067 100644
--- a/multimedia/mediatomb/Makefile
+++ b/multimedia/mediatomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2018/04/29 21:31:57 adam Exp $
+# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:26 jperkin Exp $
 
 DISTNAME=	mediatomb-0.12.1
 PKGREVISION=	38
@@ -39,7 +39,7 @@ MEDIATOMB_HOME=		${PKG_HOME.${MEDIATOMB_USER}}
 SUBST_CLASSES+=		config
 SUBST_FILES.config=	config.xml mediatomb.desktop
 SUBST_VARS.config=	MEDIATOMB_HOME PREFIX OPSYS
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 
 INSTALLATION_DIRS+=	share/applications share/examples/mediatomb
 
diff --git a/multimedia/mplayer-plugin/Makefile b/multimedia/mplayer-plugin/Makefile
index c698a1fcec3..7ce310cbd29 100644
--- a/multimedia/mplayer-plugin/Makefile
+++ b/multimedia/mplayer-plugin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2018/04/16 14:34:57 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2018/07/04 13:40:26 jperkin Exp $
 #
 
 DISTNAME=		mplayerplug-in-3.55
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--disable-gtk1
 CONFIGURE_ENV+=		ac_cv_path_GECKO_XPIDL=${BUILDLINK_PREFIX.xulrunner192}/lib/xulrunner192/xpidl
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	Source/plugin-setup.cpp
 SUBST_SED.conf=		-e "s|/etc/|${PKG_SYSCONFDIR}/|g"
 SUBST_MESSAGE.conf=	Fixing harcoded paths.
diff --git a/multimedia/sickbeard/Makefile b/multimedia/sickbeard/Makefile
index 96fad433b98..af998bb792f 100644
--- a/multimedia/sickbeard/Makefile
+++ b/multimedia/sickbeard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/03 05:03:26 adam Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:26 jperkin Exp $
 
 DISTNAME=	sickbeard-507
 PKGREVISION=	3
@@ -43,7 +43,7 @@ SUBST_FILES.paths=	sickbeard.sh
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
 SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/sickbeard.sh ${WRKSRC}/sickbeard.sh
diff --git a/multimedia/xine-lib/Makefile b/multimedia/xine-lib/Makefile
index 043578d4b10..811c3862a44 100644
--- a/multimedia/xine-lib/Makefile
+++ b/multimedia/xine-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2018/03/12 11:15:41 wiz Exp $
+# $NetBSD: Makefile,v 1.148 2018/07/04 13:40:26 jperkin Exp $
 
 PKGREVISION= 11
 .include "Makefile.common"
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=	--disable-mlib
 BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20nb1
 
 SUBST_CLASSES+=		oss
-SUBST_STAGE.oss=	post-patch
+SUBST_STAGE.oss=	pre-configure
 SUBST_FILES.oss=	src/audio_out/audio_oss_out.c
 SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
@@ -25,7 +25,7 @@ SUBST_SED.oss+=		-e "s,\"dsp\",\"audio\",g"
 SUBST_MESSAGE.oss=	Fixing hardcoded audio device.
 
 SUBST_CLASSES+=		w32path
-SUBST_STAGE.w32path=	post-patch
+SUBST_STAGE.w32path=	pre-configure
 SUBST_FILES.w32path=	src/libw32dll/common.c
 SUBST_SED.w32path=	-e "s,@W32PATH@,${PREFIX}/lib/win32,"
 SUBST_MESSAGE.w32path=	Fixing win32 dll path.
diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile
index 260d0c69bef..4f69f8ea363 100644
--- a/net/DarwinStreamingServer/Makefile
+++ b/net/DarwinStreamingServer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/08/07 07:42:34 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:26 jperkin Exp $
 
 DISTNAME=	DarwinStreamingSrvr5.5.5-Source
 PKGNAME=	DarwinStreamingServer-5.5.5
@@ -77,7 +77,7 @@ CONF_FILES+=	share/examples/streaming/relayconfig.xml-Sample ${PKG_SYSCONFDIR}/r
 CONF_FILES+=	share/examples/streaming/streamingserver.xml-POSIX ${PKG_SYSCONFDIR}/streamingserver.xml
 
 SUBST_CLASSES+=		makefile
-SUBST_STAGE.makefile=	post-patch
+SUBST_STAGE.makefile=	pre-configure
 SUBST_MESSAGE.makefile=	Fixing Makefiles
 SUBST_FILES.makefile+=	APIModules/QTSSDemoAuthorizationModule.bproj/Makefile.POSIX
 SUBST_FILES.makefile+=	APIModules/QTSSHomeDirectoryModule/Makefile.POSIX
@@ -104,7 +104,7 @@ SUBST_FILES.makefile+=	qtpasswd.tproj/Makefile.POSIX
 SUBST_SED.makefile+=	-e "s|-O[023]||"
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Fixing paths
 SUBST_FILES.path+=	defaultPaths.h
 SUBST_FILES.path+=	WebAdmin/src/streamingadminserver.pl
@@ -118,7 +118,7 @@ SUBST_SED.path+=	-e "s|/var/streaming/playlists|${PREFIX}/share/streaming/playli
 SUBST_SED.path+=	-e "s|/var/streaming/logs|${VARBASE}/log/streaming|"
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_MESSAGE.conf=	Fixing configuration file
 SUBST_FILES.conf+=	WebAdmin/streamingadminserver.conf
 SUBST_SED.conf+=	-e "s|/Library/QuickTimeStreaming/AdminHtml|${PREFIX}/share/streaming/AdminHtml|"
diff --git a/net/ORBit/hacks.mk b/net/ORBit/hacks.mk
index 029314d78f0..2c26a31e6a4 100644
--- a/net/ORBit/hacks.mk
+++ b/net/ORBit/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2006/05/14 21:10:01 schwarz Exp $
+# $NetBSD: hacks.mk,v 1.3 2018/07/04 13:40:27 jperkin Exp $
 
 .if !defined(ORBIT_HACKS_MK)
 ORBIT_HACKS_MK=	# defined
@@ -14,7 +14,7 @@ _SOCKLEN_T_TYPEDEFD!=	${GREP} -c '^typedef\ .*\ socklen_t;$$' ${LOCALBASE}/inclu
 PKG_HACKS+=		socklen_t-already-typedefd-in-pthread.h
 SUBST_CLASSES+=		socklen_t
 SUBST_FILES.socklen_t=	configure
-SUBST_STAGE.socklen_t=	post-patch
+SUBST_STAGE.socklen_t=	pre-configure
 SUBST_SED.socklen_t=	-e 's/^\#define\ socklen_t\ size_t$$//'
 # remark: \ before # needed to prevent make from interpreting
 #         remainder of line as a comment
diff --git a/net/aget/Makefile b/net/aget/Makefile
index dcc5893294c..45d41664cd3 100644
--- a/net/aget/Makefile
+++ b/net/aget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/02/25 16:20:50 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:27 jperkin Exp $
 #
 
 DISTNAME=	aget-0.4
@@ -14,7 +14,7 @@ NO_CONFIGURE=	yes
 
 SUBST_CLASSES+=		options
 SUBST_MESSAGE.options=	Fixing build options.
-SUBST_STAGE.options=	post-patch
+SUBST_STAGE.options=	pre-configure
 SUBST_FILES.options=	Makefile Makefile.Solaris
 SUBST_SED.options=	-e 's,CFLAGS =,\#CFLAGS =,'
 SUBST_SED.options+=	-e 's,LDFLAGS =,\#LDFLAGS =,'
diff --git a/net/aiccu/Makefile b/net/aiccu/Makefile
index a303ee36085..2db083b36ac 100644
--- a/net/aiccu/Makefile
+++ b/net/aiccu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/04/17 22:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:27 jperkin Exp $
 
 DISTNAME=		aiccu_20070115
 PKGNAME=		${DISTNAME:S/_/-/:S/.//g}
@@ -15,7 +15,7 @@ USE_FEATURES+=		inet6
 CHECK_PORTABILITY_SKIP+=debian/*
 
 SUBST_CLASSES+=		sysconfdir
-SUBST_STAGE.sysconfdir=	post-patch
+SUBST_STAGE.sysconfdir=	pre-configure
 SUBST_FILES.sysconfdir=	common/aiccu.h
 SUBST_SED.sysconfdir=	-e 's,/etc/aiccu.conf,${PKG_SYSCONFDIR}/aiccu.conf,'
 
diff --git a/net/apollo/Makefile b/net/apollo/Makefile
index 52d9e204eae..5f32ab4e735 100644
--- a/net/apollo/Makefile
+++ b/net/apollo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/08/07 17:56:13 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:27 jperkin Exp $
 #
 
 APOLLOVERS=	1.4
@@ -30,7 +30,7 @@ SUBST_CLASSES+=		home
 SUBST_FILES.home=	${WRKSRC}/bin/apollo
 SUBST_SED.home=		-e 's,@APOLLO_HOME@,${PREFIX},'
 SUBST_SED.home+=	-e 's,@JAVA_HOME@,${PKG_JAVA_HOME},'
-SUBST_STAGE.home=	post-patch
+SUBST_STAGE.home=	pre-configure
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/apollo ${DESTDIR}${PREFIX}/bin
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 27be82d83c4..c5b498fad60 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/02/06 19:30:55 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:27 jperkin Exp $
 #
 
 DISTNAME=	arpwatch-2.1a15
@@ -21,7 +21,7 @@ PLIST_SUBST+=	VARBASE=${VARBASE:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	arpsnmp.8 arpwatch.8
 SUBST_SED.paths=	-e 's,/usr/operator/arpwatch,${VARBASE}/db/arpwatch,g'
 
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index 8044be20ca8..bd9a9720a9c 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/01/03 18:00:19 roy Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:27 jperkin Exp $
 
 DISTNAME=	chrony-1.31.1
 PKGREVISION=	4
@@ -29,7 +29,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${EGFILES:S/^/examples\//} conf.c
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-install:
 	set -e; for file in ${EGFILES}; do			\
diff --git a/net/coilmq/Makefile b/net/coilmq/Makefile
index a82b4655dc7..908ee2a21ff 100644
--- a/net/coilmq/Makefile
+++ b/net/coilmq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/03 05:03:27 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:27 jperkin Exp $
 
 DISTNAME=	CoilMQ-0.6.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -22,7 +22,7 @@ REPLACE_PYTHON+=	distribute_setup.py coilmq/start.py
 PKG_SYSCONFSUBDIR=	coilmq
 
 SUBST_CLASSES+=		cfg
-SUBST_STAGE.cfg=	post-patch
+SUBST_STAGE.cfg=	pre-configure
 SUBST_FILES.cfg=	coilmq/config/__init__.py
 SUBST_SED.cfg=		-e 's,/path/to/config.cfg,${PKG_SYSCONFDIR}/defaults.cfg,'
 
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 6240c871d8d..602f6ff146a 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2017/08/01 17:40:14 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2018/07/04 13:40:27 jperkin Exp $
 
 DISTNAME=	dctc-0.85.9
 PKGREVISION=	13
@@ -23,7 +23,7 @@ CPPFLAGS+=		-I${BDBBASE}/include/${BDB_TYPE}
 BUILDLINK_TRANSFORM+=	l:db4:${BDB_TYPE}
 
 SUBST_CLASSES+=		inethack
-SUBST_STAGE.inethack=	post-patch
+SUBST_STAGE.inethack=	pre-configure
 SUBST_FILES.inethack=	src/dc_manage.c src/dc_manage_master.c
 SUBST_FILES.inethack+=	src/main.c src/main_master.c src/var.h
 SUBST_SED.inethack+=	-e 's,\(G_.*LOCK.*(\)inet_ntoa,\1my_inet_ntoa,g'
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index 3c3128a0e00..c21418971a1 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2016/07/09 06:38:41 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	ddclient-3.8.3
 PKGREVISION=	1
@@ -33,7 +33,7 @@ INSTALLATION_DIRS=	sbin share/doc/ddclient share/examples/ddclient
 SUBST_CLASSES+=		config
 SUBST_MESSAGE.config=	Adjust variables: PKG_SYSCONFDIR VARBASE PERL5 (in patch-aa)
 SUBST_FILES.config+=	ddclient
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_VARS.config=	PKG_SYSCONFDIR VARBASE PERL5
 
 NO_CONFIGURE=		yes
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 7a1a88870b0..a076ebe6f6e 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/10/09 14:06:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	dgd-1.2p4
 PKGNAME=	dgd-1.2.0.4
@@ -18,7 +18,7 @@ BUILD_DIRS=		src
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths and command names.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mud.dgd
 SUBST_SED.paths=	-e 's,/home/dworkin/,${PREFIX}/libdata/,g'
 
diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile
index 76b8f5beef3..d360bdb7ed6 100644
--- a/net/ez-ipupdate/Makefile
+++ b/net/ez-ipupdate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/08/01 16:47:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=		ez-ipupdate-3.0.11b7
 PKGREVISION=		1
@@ -15,7 +15,7 @@ EGDIR=			${PREFIX}/share/examples/ez-ipupdate
 RCD_SCRIPTS=		ez-ipupdate
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_MESSAGE.path=	Correcting paths in example scripts.
 SUBST_FILES.path=	example-*.conf example.conf
 SUBST_SED.path=		-e "s|/usr/local|${PREFIX}|g"
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 12b64e43a5a..25b2ae7a6d2 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/01/28 20:10:58 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
@@ -70,14 +70,14 @@ REPLACE_PERL=		src/modules/rlm_counter/rad_counter
 REPLACE_PERL+=		scripts/radsqlrelay
 
 SUBST_CLASSES+=		make
-SUBST_STAGE.make=	post-patch
+SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
 SUBST_SED.make+=	-e "s|RLM_SQL_LIBS	=|RLM_SQL_LIBS	= \
 			-L${PREFIX}/lib|g"
 SUBST_MESSAGE.make=	Fixing Makefiles.
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	raddb/radiusd.conf.in
 SUBST_SED.config=	-e "s|@@RADIUS_USER@@|${RADIUS_USER}|g"
 SUBST_SED.config+=	-e "s|@@RADIUS_GROUP@@|${RADIUS_GROUP}|g"
diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile
index 03428de8d27..368245b45f5 100644
--- a/net/hf6to4/Makefile
+++ b/net/hf6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2012/10/23 17:18:27 asau Exp $
+# $NetBSD: Makefile,v 1.17 2018/07/04 13:40:28 jperkin Exp $
 #
 
 DISTNAME=		hf6to4-1.3
@@ -31,7 +31,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	hf6to4
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/hf6to4 ${WRKSRC}/hf6to4
diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 312752a2d57..152fbeec944 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2016/07/09 06:38:42 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=		irrd2.3.9
 PKGNAME=		irrd-2.3.9
@@ -65,7 +65,7 @@ SUBST_CLASSES+=		confpaths
 SUBST_FILES.confpaths=	../samples/irrd.conf.sample
 SUBST_SED.confpaths=	-e 's,/var/spool/irr_database,'${VARBASE}'/irrd/db,'
 SUBST_SED.confpaths+=	-e 's,/var/log/irrd,'${VARBASE}'/irrd/log/irrd.log,'
-SUBST_STAGE.confpaths=	post-patch
+SUBST_STAGE.confpaths=	pre-configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/../samples/irrd.conf.sample ${DESTDIR}${EGDIR}/irrd.conf
diff --git a/net/jftpgw/Makefile b/net/jftpgw/Makefile
index cf4d9f6b566..53f6cb58021 100644
--- a/net/jftpgw/Makefile
+++ b/net/jftpgw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:30 asau Exp $
+# $NetBSD: Makefile,v 1.14 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	    jftpgw-0.13.5
 #PKGREVISION=	    1
@@ -20,7 +20,7 @@ EGDIR=			${PREFIX}/share/examples/jftpgw
 CONF_FILES=		${EGDIR}/jftpgw.conf ${PKG_SYSCONFDIR}/jftpgw.conf
 
 SUBST_CLASSES+=		log
-SUBST_STAGE.log=	post-patch
+SUBST_STAGE.log=	pre-configure
 SUBST_FILES.log=	active.c bindport.c cache.c cmds.c config.c \
 			ftpread.c fw_auth_cmds.c jftpgw.c log.c log.h \
 			login.c openport.c passive.c states.c std_cmds.c \
diff --git a/net/knot/Makefile b/net/knot/Makefile
index 716186351a6..0725bf95190 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/04/17 22:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	knot-2.5.7
 PKGREVISION=	1
@@ -50,7 +50,7 @@ PKG_SYSCONFSUBDIR=	knot
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/samples/Makefile.in
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 
 CONF_FILES=	${EGDIR}/knot.sample.conf \
diff --git a/net/libnipper/Makefile b/net/libnipper/Makefile
index d3a40807be7..6f78239a5f2 100644
--- a/net/libnipper/Makefile
+++ b/net/libnipper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/08/16 20:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:28 jperkin Exp $
 #
 
 DISTNAME=	libnipper-0.12.1
@@ -17,7 +17,7 @@ CONF_FILES+=	${PREFIX}/share/examples/nipper.conf \
 		${PKG_SYSCONFDIR}/nipper.conf
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	CMakeLists.txt libnipper.cpp nipper.cpp
 SUBST_SED.config=	-e "s|@@PREFIX@@|${PREFIX}|g"
 SUBST_SED.config+=	-e "s|@@PKGMANDIR@@|${PKGMANDIR}|g"
diff --git a/net/libquic/Makefile b/net/libquic/Makefile
index cdfd46bf90a..42050c9e9ca 100644
--- a/net/libquic/Makefile
+++ b/net/libquic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/06/12 17:50:25 bsiegert Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	libquic-0.0.3
 PKGREVISION=	2
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 BUILD_DEPENDS+=		go-[0-9]*:../../lang/go
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.link=	post-patch
+SUBST_STAGE.link=	pre-configure
 SUBST_MESSAGE.link=	Fix paths
 SUBST_FILES.link=	src/base/base_paths_posix.cc
 SUBST_SED.link=		-e 's|@PREFIX@|'${PREFIX}'|'
diff --git a/net/mono-nat/Makefile b/net/mono-nat/Makefile
index 649d2de641d..53b5c825b52 100644
--- a/net/mono-nat/Makefile
+++ b/net/mono-nat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/04/14 07:34:00 adam Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	mono-nat-1.0.2
 PKGREVISION=	19
@@ -14,7 +14,7 @@ MAKE_JOBS_SAFE=	no
 USE_TOOLS+=	gmake pkg-config
 
 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 Mono.Nat/Makefile.in
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/net/monotorrent/Makefile b/net/monotorrent/Makefile
index f1868bfd3cd..cb8604019fd 100644
--- a/net/monotorrent/Makefile
+++ b/net/monotorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/04/14 07:34:00 adam Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:28 jperkin Exp $
 
 DISTNAME=	monotorrent-0.72
 PKGREVISION=	19
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake bsdtar pkg-config
 EXTRACT_USING=	bsdtar
 
 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 MonoTorrent/Makefile.in
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/net/monsoon/Makefile b/net/monsoon/Makefile
index b719702fc26..65c3b7c9c1b 100644
--- a/net/monsoon/Makefile
+++ b/net/monsoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2018/04/16 14:35:02 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	monsoon-0.20
 PKGREVISION=	62
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake gtar intltool perl pkg-config msgfmt
 EXTRACT_USING=	gtar
 
 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 Monsoon/Makefile.in
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 0f10b4046db..42b1b1a1717 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2018/03/12 11:17:21 wiz Exp $
+# $NetBSD: Makefile,v 1.125 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	mrtg-2.17.4
 PKGREVISION=	11
@@ -27,7 +27,7 @@ CONF_FILES=	${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
 .include "options.mk"
 
 SUBST_CLASSES+=		files
-SUBST_STAGE.files=	post-patch
+SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	../mrtg.conf.example ../netstat2mrtg	\
 			../sys2mrtg ../envstat2mrtg
 SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/net/nagios-plugin-radius/Makefile b/net/nagios-plugin-radius/Makefile
index bf66dffd6ac..5dba7f273dd 100644
--- a/net/nagios-plugin-radius/Makefile
+++ b/net/nagios-plugin-radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/07/04 19:48:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $
 #
 
 PKGNAME=	nagios-plugin-radius-${PLUGINSVERSION}
@@ -21,7 +21,7 @@ BUILD_DEFS+=	PKG_SYSCONFBASE
 BINARY_TARGET=	check_radius
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	plugins/check_radius.c
 SUBST_SED.config=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFBASE}|g"
 SUBST_MESSAGE.config=	Fixing configuration file path.
diff --git a/net/ndiff/Makefile b/net/ndiff/Makefile
index 1f965ddc1df..6d839215489 100644
--- a/net/ndiff/Makefile
+++ b/net/ndiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/14 13:04:33 adam Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:29 jperkin Exp $
 
 .include "../../net/nmap/Makefile.common"
 
@@ -13,7 +13,7 @@ EXTRACT_ELEMENTS=	${DISTNAME}/ndiff
 PYTHON_VERSIONS_ACCEPTED=	27
 
 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/net/nipper/Makefile b/net/nipper/Makefile
index a2db3165183..92c4fcab1b8 100644
--- a/net/nipper/Makefile
+++ b/net/nipper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/08/16 20:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:29 jperkin Exp $
 #
 
 DISTNAME=	nipper-cli-0.12.0
@@ -15,7 +15,7 @@ USE_LANGUAGES=	c++ c
 USE_CMAKE=	yes
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	CMakeLists.txt nipper.cpp
 SUBST_SED.config=	-e "s|@@PREFIX@@|${PREFIX}|g"
 SUBST_SED.config+=	-e "s|@@PKGMANDIR@@|${PKGMANDIR}|g"
diff --git a/net/ocsinventory-agent/Makefile b/net/ocsinventory-agent/Makefile
index 202dc4d492b..169144502e5 100644
--- a/net/ocsinventory-agent/Makefile
+++ b/net/ocsinventory-agent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/06/28 08:27:44 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/07/04 13:40:29 jperkin Exp $
 #
 VERS=			1.1.2.1
 PKGREVISION=		9
@@ -41,13 +41,13 @@ REPLACE_PERL+=	ocsinventory-agent
 REPLACE_PERL+=	postinst.pl
 
 SUBST_CLASSES+=			sysconfdir path varbase apachevers
-SUBST_STAGE.sysconfdir=		post-patch
+SUBST_STAGE.sysconfdir=		pre-configure
 SUBST_FILES.sysconfdir=		lib/Ocsinventory/Agent/Config.pm
 SUBST_FILES.sysconfdir+=	postinst.pl
 SUBST_SED.sysconfdir=		-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_MESSAGE.sysconfdir=	Fixing hardcoded install directory path.
 
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	lib/Ocsinventory/Agent/Common.pm
 SUBST_SED.path=		-e "s|/usr/local/bin|${PREFIX}/bin|g"
 SUBST_SED.path+=	-e "s|/usr/local/sbin|${PREFIX}/sbin|g"
diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index e75179dadff..0e55db8e9dd 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/07/09 06:38:44 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	oinkmaster-2.0
 PKGREVISION=	5
@@ -28,7 +28,7 @@ REPLACE_PERL+=	${WRKSRC}/oinkmaster.pl
 PKG_SYSCONFSUBDIR=	snort
 
 SUBST_CLASSES+=		pub
-SUBST_STAGE.pub=	post-patch
+SUBST_STAGE.pub=	pre-configure
 SUBST_FILES.pub=	oinkmaster.pl oinkmaster.conf oinkmaster.1
 SUBST_SED.pub=		-e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g"
 SUBST_SED.pub+=		-e "s|/usr/local|${PREFIX}|g"
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index d59b7d153e0..76152f12bf2 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/06/05 14:24:24 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	RPC-XML-0.80
 PKGNAME=	p5-${DISTNAME}
@@ -29,7 +29,7 @@ USE_TOOLS+=		gmake
 USE_LANGUAGES=		# empty
 
 SUBST_CLASSES+=		usebase
-SUBST_STAGE.usebase=	post-patch
+SUBST_STAGE.usebase=	pre-configure
 SUBST_FILES.usebase=	lib/RPC/XML.pm
 SUBST_SED.usebase=	-e "s|^use base 'RPC::XML::|use parent -norequire, 'RPC::XML::|g"
 
diff --git a/net/pconsole/Makefile b/net/pconsole/Makefile
index 90db83b7a9b..1f5dcdaad46 100644
--- a/net/pconsole/Makefile
+++ b/net/pconsole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/03 11:55:30 wiedi Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:29 jperkin Exp $
 #
 
 DISTNAME=	pconsole-1.0
@@ -18,7 +18,7 @@ USE_TOOLS+=	ksh:run
 REPLACE_KSH=	pconsole.sh.in
 
 SUBST_CLASSES=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	pconsole.sh.in
 SUBST_VARS.path=	PREFIX X11BASE
 
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index 5fb9b4b7fdb..2c5e89015ad 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/23 17:18:59 asau Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	pptpd-1.3.4
 PKGNAME=	${DISTNAME:S/pptpd/poptop/}
@@ -16,12 +16,12 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-libwrap
 
 SUBST_CLASSES+=		sysconf
-SUBST_STAGE.sysconf=	post-patch
+SUBST_STAGE.sysconf=	pre-configure
 SUBST_FILES.sysconf=	defaults.h pptpd.8 pptpd.conf.5
 SUBST_SED.sysconf=	-e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},
 
 SUBST_CLASSES+=		logwtmp
-SUBST_STAGE.logwtmp=	post-patch
+SUBST_STAGE.logwtmp=	pre-configure
 SUBST_FILES.logwtmp=	pptpctrl.c
 SUBST_SED.logwtmp=	-e s,@@PREFIX@@,${PREFIX},
 
diff --git a/net/pptp/Makefile b/net/pptp/Makefile
index 3cd1ff9b2c7..de53f7b6787 100644
--- a/net/pptp/Makefile
+++ b/net/pptp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/23 17:19:00 asau Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:29 jperkin Exp $
 
 DISTNAME=	pptp-1.7.1
 PKGREVISION=	1
@@ -39,7 +39,7 @@ MAKE_FLAGS+=	PPPD=/usr/sbin/pppd
 
 SUBST_CLASSES+=		pptp
 SUBST_MESSAGE.pptp=	"Fixing hardcoded paths."
-SUBST_STAGE.pptp=	post-patch
+SUBST_STAGE.pptp=	pre-configure
 SUBST_FILES.pptp=	pptp.8
 SUBST_SED.pptp=		-e 's,/usr,${PREFIX},g'
 
diff --git a/net/proxytunnel/Makefile b/net/proxytunnel/Makefile
index 1a9afcb7951..5186e5d0275 100644
--- a/net/proxytunnel/Makefile
+++ b/net/proxytunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/03/05 11:29:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:30 jperkin Exp $
 #
 
 DISTNAME=	proxytunnel-1.9.0
@@ -18,7 +18,7 @@ BUILD_TARGET=	proxytunnel
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1 bin
 
 SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		post-patch
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		proxytunnel.1
 SUBST_SED.fix-paths=		-e 's,/usr,${PREFIX},g'
diff --git a/net/publicfile-run/Makefile b/net/publicfile-run/Makefile
index b2682246297..e474a044604 100644
--- a/net/publicfile-run/Makefile
+++ b/net/publicfile-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/11/25 12:52:12 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=		publicfile-run-20150109
 CATEGORIES=		net
@@ -30,7 +30,7 @@ FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Substituting paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	libexec-pubftpd
 SUBST_VARS.paths=	PREFIX
 
diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile
index ae11924f069..be83c4e3637 100644
--- a/net/py-pcap/Makefile
+++ b/net/py-pcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/03 05:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	pypcap-1.1
 PKGNAME=	${PYPKGPREFIX}-pcap-1.1
@@ -16,12 +16,12 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
 SUBST_CLASSES+=		python
 SUBST_FILES.python=	Makefile
 SUBST_SED.python+=	-e 's,@PYTHON@,${PYTHONBIN},g'
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 
 SUBST_CLASSES+=		prefix
 SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 
 PYDISTUTILSPKG=			yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-pyrex
diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile
index 513c3f3ea3b..d08e73c37c3 100644
--- a/net/pygopherd/Makefile
+++ b/net/pygopherd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/07/03 05:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	pygopherd_2.0.16
 PKGREVISION=	4
@@ -42,7 +42,7 @@ REPLACE_PYTHON+=	pygopherd/initializationTest.py
 REPLACE_PYTHON+=	pygopherd/testutil.py
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	setup.py
 SUBST_FILES.man+=	bin/pygopherd
 SUBST_FILES.man+=	conf/pygopherd.conf
diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index b9355d87805..3a167a17100 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/05/21 06:49:09 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:30 jperkin Exp $
 #
 
 DISTNAME=		rinetd
@@ -24,7 +24,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	rinetd.8
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 62b669a9702..6f35987a982 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2018/01/29 11:32:59 adam Exp $
+# $NetBSD: Makefile,v 1.109 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	rsync-3.1.3
 CATEGORIES=	net
@@ -28,7 +28,7 @@ SMF_NAME=		rsyncd
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	rsync.1 rsyncd.conf.5
 SUBST_SED.paths=	-e 's|/etc/rsyncd|${PKG_SYSCONFDIR}/rsyncd|g'
 SUBST_SED.paths+=	-e 's|/usr/bin/rsync|${PREFIX}/bin/rsync|g'
diff --git a/net/ruby-stompserver/Makefile b/net/ruby-stompserver/Makefile
index 5e7a3be31fd..fe6461790ac 100644
--- a/net/ruby-stompserver/Makefile
+++ b/net/ruby-stompserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/10/08 14:05:55 taca Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	drizztbsd-stompserver-1c7a275
 PKGNAME=	${RUBY_PKGPREFIX}-stompserver-1.0.0
@@ -75,7 +75,7 @@ OWN_DIRS_PERMS+=	${ST_ROOT}/${STOMPSERVER_CFGDIR}	\
 			${STOMPSERVER_USER} ${STOMPSERVER_GROUP} 0700
 
 SUBST_CLASSES+=		cfg
-SUBST_STAGE.cfg=	post-patch
+SUBST_STAGE.cfg=	pre-configure
 SUBST_FILES.cfg=	config/stompserver.conf
 SUBST_SED.cfg=		-e 's,@STOMPSERVER_WRKDIR@,${STOMPSERVER_WRKDIR},g'
 SUBST_SED.cfg+=		-e 's,@STOMPSERVER_LOGDIR@,${STOMPSERVER_LOGDIR},g'
diff --git a/net/samba/Makefile b/net/samba/Makefile
index c42fcd0f159..1de5afa89d8 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.268 2018/04/17 22:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.269 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	samba-${VERSION}
 CATEGORIES=	net
@@ -104,7 +104,7 @@ RCD_SCRIPTS+=	samba nmbd smbd ${WINBINDD_RCD_SCRIPT}
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_FILES.paths=	${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_VARS.paths+=	AWK CAT MKTEMP RM PWD_MKDB SH
 
 SUBST_CLASSES+=		def-cfg
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index aa320113659..1cfdd679ffb 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/07/03 05:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	samba-${VERSION}
 PKGREVISION=	7
@@ -149,7 +149,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing paths.
 SUBST_FILES.paths=	${WRKDIR}/adduser.sh ${WRKDIR}/deluser.sh
 SUBST_FILES.paths+=	source3/script/findsmb.in source4/heimdal_build/roken.h
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths+=	-e 's,@PERL@,${PERL5},g'
 SUBST_VARS.paths=	AWK CAT MKTEMP RM PWD_MKDB SH PERL PKG_SYSCONFBASE
 
diff --git a/net/scapy/Makefile b/net/scapy/Makefile
index 5f35f5d568d..1b13a173d06 100644
--- a/net/scapy/Makefile
+++ b/net/scapy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/07/03 05:03:29 adam Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	scapy-2.3.2
 CATEGORIES=	net
@@ -26,7 +26,7 @@ CONF_FILES=	${PREFIX}/share/examples/scapy/ethertypes \
 		${PKG_SYSCONFDIR}/ethertypes
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	scapy/data.py setup.py
 SUBST_SED.config=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
 SUBST_SED.config+=	-e "s|share/man|${PKGMANDIR}|g"
diff --git a/net/sipsak/Makefile b/net/sipsak/Makefile
index 6e40479de80..4afa88c98f4 100644
--- a/net/sipsak/Makefile
+++ b/net/sipsak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/04/29 10:21:54 schwarz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:30 jperkin Exp $
 
 DISTNAME=	sipsak-0.9.6-1
 PKGNAME=	${DISTNAME:S/-1//}
@@ -18,7 +18,7 @@ USE_TOOLS+=	gmake
 
 # get rid of inline
 SUBST_CLASSES+=	inline
-SUBST_STAGE.inline=	post-patch
+SUBST_STAGE.inline=	pre-configure
 SUBST_FILES.inline=	header_f.h header_f.c
 SUBST_SED.inline=	-e 's/^inline //g'
 
diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index d4a4beff5ae..3796b7951e3 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2017/09/04 18:08:26 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:31 jperkin Exp $
 
 DISTNAME=	smokeping-2.6.7
 PKGREVISION=	6
@@ -48,7 +48,7 @@ REPLACE_PERL+=		bin/smokeinfo bin/tSmoke
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		files
-SUBST_STAGE.files=	post-patch
+SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	etc/config.dist.in bin/smokeping \
 			bin/smokeping_cgi bin/tSmoke \
 			htdocs/Makefile.in smokeping.conf
@@ -60,7 +60,7 @@ SUBST_SED.files+=	-e "s|@SPDIR@|${SPDIR}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
 SUBST_CLASSES+=		libs
-SUBST_STAGE.libs=	post-patch
+SUBST_STAGE.libs=	pre-configure
 SUBST_FILES.libs=	bin/smokeping_cgi bin/smokeping bin/smokeinfo bin/tSmoke
 SUBST_SED.libs=	-e "s|FindBin::Bin/../lib|FindBin::Bin/../lib/smokeping|g"
 SUBST_MESSAGE.libs=	Fixing library path
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 928ed354407..d06d25320df 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2018/04/17 22:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2018/07/04 13:40:31 jperkin Exp $
 #
 
 DISTNAME=		snort-2.9.9.0
@@ -65,7 +65,7 @@ CONF_FILES+=		${EGDIR}/rules/white_list.rules \
 			${PKG_SYSCONFDIR}/rules/white_list.rules
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	etc/snort.conf src/snort.c
 SUBST_SED.paths=	-e "s|/usr/local|${PREFIX}|g"
 SUBST_SED.paths+=	-e "s|../rules|rules|g"
diff --git a/net/socat/Makefile b/net/socat/Makefile
index 8a171d4f873..d862c3f83a4 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2017/11/11 19:43:06 maya Exp $
+# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:31 jperkin Exp $
 
 DISTNAME=	socat-1.7.3.2
 PKGREVISION=	1
@@ -32,7 +32,7 @@ CONFIGURE_ENV+=		ac_cv_ispeed_offset=9
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	doc/socat.1
 SUBST_SED.paths=	-e 's,/usr/,${PREFIX}/,g'
 
diff --git a/net/sysmon/Makefile b/net/sysmon/Makefile
index 822c2f2fb6a..7e0ee6af72b 100644
--- a/net/sysmon/Makefile
+++ b/net/sysmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/02/11 15:53:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:31 jperkin Exp $
 
 DISTNAME=		sysmon-0.93
 CATEGORIES=		net
@@ -23,7 +23,7 @@ CONF_FILES=		${EGDIR}/sysmon.conf.dist \
 
 SUBST_CLASSES+=         paths
 SUBST_FILES.paths=      ${WRKSRC}/autoconf/Makefile.in
-SUBST_STAGE.paths=      post-patch
+SUBST_STAGE.paths=      pre-configure
 SUBST_SED.paths=        -e 's,@destdir@,${DESTDIR},g'
 
 INSTALLATION_DIRS=      share/examples/sysmon
diff --git a/net/twittering-mode/Makefile b/net/twittering-mode/Makefile
index e41c215cb18..b930b6e4630 100644
--- a/net/twittering-mode/Makefile
+++ b/net/twittering-mode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/06/14 13:41:46 mef Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:31 jperkin Exp $
 
 DISTNAME=	twittering-mode-3.0.0
 CATEGORIES=	net
@@ -17,7 +17,7 @@ USE_LANGUAGES=	# none
 # to tell a user the version number by this command (mef@).
 SUBST_CLASSES+=		version
 SUBST_MESSAGE.version=	Replace version string 'HEAD' by ${PKGVERSION}
-SUBST_STAGE.version=	post-patch
+SUBST_STAGE.version=	pre-configure
 SUBST_FILES.version=	twittering-mode.el
 SUBST_SED.version=	-e '/defconst/s,HEAD,${PKGVERSION},'
 
diff --git a/net/ucspi-tcp/options.mk b/net/ucspi-tcp/options.mk
index 0c0d4540075..c6f3cd0dc79 100644
--- a/net/ucspi-tcp/options.mk
+++ b/net/ucspi-tcp/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2017/01/04 02:14:12 schmonz Exp $
+# $NetBSD: options.mk,v 1.6 2018/07/04 13:40:31 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ucspi-tcp
 PKG_SUPPORTED_OPTIONS+=	inet6 ucspi-tcp-nodefaultrbl
@@ -15,7 +15,7 @@ PATCH_DIST_STRIP.${IPV6_PATCH}=	-p1
 PLIST.inet6=			yes
 
 SUBST_CLASSES+=		hier
-SUBST_STAGE.hier=	post-patch
+SUBST_STAGE.hier=	pre-configure
 SUBST_MESSAGE.hier=	Fixing manpage path.
 SUBST_FILES.hier=	hier.c
 SUBST_SED.hier=		-e 's,man,${PKGMANDIR},'
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index 7c7fb842f37..8dbb029dec9 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2017/09/06 09:03:03 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:31 jperkin Exp $
 #
 
 DISTNAME=		vpnc-0.5.3
@@ -21,7 +21,7 @@ OWN_DIRS=		${PKG_SYSCONFDIR}/vpnc
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	fixing pathnames
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	config.c vpnc-script.in makeman.pl pcf2vpnc
 SUBST_FILES.paths+=	vpnc.8.template vpnc-disconnect
 SUBST_SED.paths=	-e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g'
diff --git a/net/vpnc/options.mk b/net/vpnc/options.mk
index 5ec04782c0a..a0af1cc7f01 100644
--- a/net/vpnc/options.mk
+++ b/net/vpnc/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/02/15 13:02:31 obache Exp $
+# $NetBSD: options.mk,v 1.4 2018/07/04 13:40:31 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openvpnc
 PKG_SUPPORTED_OPTIONS=	openssl		# off by default
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=
 .include "../../security/openssl/buildlink3.mk"
 SUBST_CLASSES+=		openssl
 SUBST_MESSAGE.openssl=	adding openssl option
-SUBST_STAGE.openssl=	post-patch
+SUBST_STAGE.openssl=	pre-configure
 SUBST_FILES.openssl=	Makefile
 SUBST_SED.openssl=	-e 's/^.OPENSSL_GPL_VIOLATION/OPENSSL_GPL_VIOLATION/'
 SUBST_SED.openssl+=	-e 's/^.OPENSSLLIBS/OPENSSLLIBS/'
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile
index 3309415b257..193329829a6 100644
--- a/net/vsftpd/Makefile
+++ b/net/vsftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2018/02/09 16:46:42 triaxx Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:31 jperkin Exp $
 
 DISTNAME=	vsftpd-3.0.3
 CATEGORIES=	net
@@ -32,7 +32,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	vsftpd.8 vsftpd.conf.5 vsftpd.conf
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 MAKE_ENV+=		LIBS=${LIBS:Q}
 
diff --git a/net/xymon/Makefile b/net/xymon/Makefile
index 120627800e5..99040a3538f 100644
--- a/net/xymon/Makefile
+++ b/net/xymon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/04/16 14:35:04 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:31 jperkin Exp $
 #
 
 DISTNAME=		xymon-4.3.28
@@ -125,7 +125,7 @@ CONFIGURE_ENV+=		MANROOT=${PREFIX}/${PKGMANDIR}/
 SUBST_CLASSES+=		bashpath
 SUBST_FILES.bashpath=	xymond/xymonreports.sh.DIST
 SUBST_SED.bashpath=	-e 's,/bin/bash,'${BASH:Q}','
-SUBST_STAGE.bashpath=	post-patch
+SUBST_STAGE.bashpath=	pre-configure
 
 USE_TOOLS+=	awk:run		cat:run		cp:run
 USE_TOOLS+=	cut:run		date:run	egrep:run
diff --git a/net/zenmap/Makefile b/net/zenmap/Makefile
index d6a952bb063..8101780b5d6 100644
--- a/net/zenmap/Makefile
+++ b/net/zenmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/04/14 13:04:33 adam Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:31 jperkin Exp $
 
 .include "../../net/nmap/Makefile.common"
 
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 PYSETUPARGS+=		vanilla
 
 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,\(self.create_uninstaller\),\#\1,g'
diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile
index d661c46e398..26a6547a4d1 100644
--- a/parallel/ganglia-monitor-core/Makefile
+++ b/parallel/ganglia-monitor-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2018/06/28 01:05:01 bacon Exp $
+# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:31 jperkin Exp $
 #
 
 DISTNAME=		ganglia-3.7.2
@@ -76,14 +76,14 @@ SUBST_VARS.paths+=	GANGLIA_VARBASE
 ## gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but
 ## doing so requires perl installed in the build stage.
 SUBST_CLASSES+=		etcdir
-SUBST_STAGE.etcdir=	post-patch
+SUBST_STAGE.etcdir=	pre-configure
 SUBST_FILES.etcdir=	${WRKSRC}/README \
 			${WRKSRC}/mans/gmetad.1 \
 			${WRKSRC}/mans/gmond.1
 SUBST_SED.etcdir=	-e "s|/etc/ganglia/\(gm.*d\.conf\)|${PREFIX}/etc/\1|g"
 
 SUBST_CLASSES+=			linux_init
-SUBST_STAGE.linux_init=		post-patch
+SUBST_STAGE.linux_init=		pre-configure
 SUBST_FILES.linux_init=		gmond/gmond.init
 SUBST_FILES.linux_init+=	gmetad/gmetad.init
 SUBST_SED.linux_init=		-e 's|/usr/sbin|${PREFIX}/sbin|g'
@@ -92,7 +92,7 @@ SUBST_SED.linux_init+=		-e 's|/etc/ganglia|${PREFIX}&|g'
 SUBST_SED.linux_init+=		-e 's|/var/lock/subsys|${PREFIX}&|g'
 
 SUBST_CLASSES+=		systemd
-SUBST_STAGE.systemd=	post-patch
+SUBST_STAGE.systemd=	pre-configure
 SUBST_FILES.systemd=	gmond/gmond.service gmetad/gmetad.service
 SUBST_SED.systemd=	-e 's|@runstatedir@|${PREFIX}/var/run|g'
 SUBST_SED.systemd+=	-e 's|@sbindir@|${PREFIX}/sbin|g'
diff --git a/parallel/gridscheduler/Makefile b/parallel/gridscheduler/Makefile
index 763d8a6c9c5..d5763981749 100644
--- a/parallel/gridscheduler/Makefile
+++ b/parallel/gridscheduler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/01/01 18:16:38 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/04 13:40:31 jperkin Exp $
 
 PKGNAME=	gridscheduler-2011.11.1
 PKGREVISION=	2
@@ -113,7 +113,7 @@ post-patch:
 	${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	source/dist/util/arch_variables
 SUBST_SED.paths=	-e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
 
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index d11f307c31e..61f58de1697 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2016/10/03 11:48:31 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2018/07/04 13:40:32 jperkin Exp $
 
 DISTNAME=		sge-8.1.6
 PKGREVISION=		5
@@ -123,7 +123,7 @@ post-patch:
 	rm ${WRKSRC}/source/dist/util/*.orig
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	source/dist/util/arch_variables
 SUBST_SED.paths=	-e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
 
diff --git a/parallel/slurm-wlm/Makefile b/parallel/slurm-wlm/Makefile
index a6d44dc5454..7bd776ee781 100644
--- a/parallel/slurm-wlm/Makefile
+++ b/parallel/slurm-wlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/29 21:32:01 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:32 jperkin Exp $
 
 DISTNAME=	slurm-17.11.5
 PKGNAME=	slurm-wlm-17.11.5
@@ -50,7 +50,7 @@ PKG_SHELL.slurm=	${NOLOGIN}
 RCD_SCRIPTS+=		slurmd slurmctld
 
 SUBST_CLASSES+=		linuxinit
-SUBST_STAGE.linuxinit=	post-patch
+SUBST_STAGE.linuxinit=	pre-configure
 SUBST_FILES.linuxinit=	etc/init.d.slurm.in
 SUBST_SED.linuxinit=	-e 's|^exec_prefix=|&${PREFIX}|'
 SUBST_SED.linuxinit+=	-e 's|^prefix=|&${PREFIX}|'
@@ -61,7 +61,7 @@ SUBST_SED.linuxinit+=	-e 's|@sysconfdir@|$${prefix}/etc|'
 
 # Configure flag to disable gtk does not work, so set an impossible requirement
 SUBST_CLASSES+=		gtk
-SUBST_STAGE.gtk=	post-patch
+SUBST_STAGE.gtk=	pre-configure
 SUBST_SED.gtk=		-e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|'
 SUBST_FILES.gtk=	configure
 
diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index f12f09f6708..7515b5cd6fd 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/03/03 03:42:05 obache Exp $
+# $NetBSD: Makefile,v 1.17 2018/07/04 13:40:32 jperkin Exp $
 #
 
 PKGNAME=	dfdisk-1.0
@@ -33,7 +33,7 @@ SUBST_SED.paths+=	-e 's,@PKGVERSION@,${PKGVERSION},g'
 SUBST_SED.paths+=	-e 's,@PKGBASE@,${PKGBASE},g'
 SUBST_SED.paths+=	-e 's,@FTP@,${FTP},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 .for f in dfdisk.sh dfdisk.1 dfdisk.conf
diff --git a/pkgtools/libkver/Makefile b/pkgtools/libkver/Makefile
index c314210691c..556198b1f70 100644
--- a/pkgtools/libkver/Makefile
+++ b/pkgtools/libkver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/01/27 19:07:46 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:32 jperkin Exp $
 
 PKGNAME=		libkver-${VERSION}
 CATEGORIES=		pkgtools
@@ -34,7 +34,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kver/kver.sh kver/kver.8 lib/kver.3
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man8 ${PKGMANDIR}/cat8
 INSTALLATION_DIRS+=	lib ${PKGMANDIR}/man3 ${PKGMANDIR}/cat3
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index c429d341346..b5e35c7295d 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2016/12/18 22:59:35 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2018/07/04 13:40:32 jperkin Exp $
 
 PKGNAME=	pbulk-0.65
 COMMENT=	Modular bulk build framework
@@ -21,7 +21,7 @@ TARGET_MAKE=	$${prefix}/bin/bmake
 NEATO=		${PREFIX}/bin/neato
 
 SUBST_CLASSES+=		tools
-SUBST_STAGE.tools=	post-patch
+SUBST_STAGE.tools=	pre-configure
 SUBST_MESSAGE.tools=	Fixing references to tools
 SUBST_FILES.tools=	pbulk.conf scripts/build scripts/build-client-start \
 	scripts/bulkbuild scripts/bulkbuild-rebuild scripts/bulkbuild-restart \
diff --git a/pkgtools/pkg/Makefile b/pkgtools/pkg/Makefile
index f711855cb57..8bca6c92fe9 100644
--- a/pkgtools/pkg/Makefile
+++ b/pkgtools/pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/01/27 19:07:47 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/04 13:40:32 jperkin Exp $
 
 DISTNAME=	pkg-1.9.99.4
 PKGREVISION=	1
@@ -80,7 +80,7 @@ SUBST_SED.portsdir=	-e "s|/usr/ports|${PKG.portsdir}|g" \
 SUBST_MESSAGE.portsdir=	Correct reference to FreeBSD portsdir.
 
 SUBST_CLASSES+=		config
-SUBST_STAGE.config=	post-patch
+SUBST_STAGE.config=	pre-configure
 SUBST_FILES.config=	libpkg/pkg_config.c
 SUBST_SED.config=	-e "s|/usr/ports|${PKG.portsdir}|g" \
 			-e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \
@@ -88,7 +88,7 @@ SUBST_SED.config=	-e "s|/usr/ports|${PKG.portsdir}|g" \
 SUBST_MESSAGE.config=	Update pkg(8) defaults.
 
 SUBST_CLASSES+=		vuxml
-SUBST_STAGE.vuxml=	post-patch
+SUBST_STAGE.vuxml=	pre-configure
 SUBST_FILES.vuxml=	libpkg/pkg_audit.c
 SUBST_SED.vuxml=	-e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
 SUBST_MESSAGE.vuxml=	Direct audit reports to Pkgsrc vuxml
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index d30c7920323..5d56504061e 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/01/27 19:07:47 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2018/07/04 13:40:32 jperkin Exp $
 #
 
 PKGNAME=	pkg_filecheck-0.4
@@ -31,7 +31,7 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
 SUBST_SED.paths+=	-e 's,@PKG_DBDIR@,${PKG_DBDIR},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 .for f in builddb.pl builddb.1 pkg_filecheck.conf pkg_filecheck.conf.5 \
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index 9689c23ea4d..8ea62d675cb 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/10/10 07:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:32 jperkin Exp $
 
 PKGNAME=	pkg_notify-0.4.6
 CATEGORIES=	pkgtools
@@ -22,7 +22,7 @@ CONF_FILES=		${EGDIR}/${PKGBASE}.list \
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=			pkg_notify
-SUBST_STAGE.pkg_notify=		post-patch
+SUBST_STAGE.pkg_notify=		pre-configure
 SUBST_FILES.pkg_notify=		pkg_notify
 SUBST_FILES.pkg_notify+=	pkg_notify.1
 SUBST_SED.pkg_notify=		-e 's|@PKGSRCDIR@|${PKGSRCDIR}|'
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index d0404a9dc8b..47e9c66c3d2 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:32 jperkin Exp $
 
 PKGNAME=	pkgclean-20051116
 CATEGORIES=	pkgtools
@@ -20,7 +20,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pkgclean.1
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	pkgclean.sh pkgclean.1
 SUBST_SED.path+=	-e 's,@SH@,${SH},g'
 SUBST_SED.path+=	-e 's,@PKGSRCDIR@,${PKGSRCDIR},g'
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index e3d68d5e105..a00883fbb2c 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2014/10/09 14:06:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:32 jperkin Exp $
 
 PKGNAME=	pkgfind-20111022
 CATEGORIES=	pkgtools
@@ -23,7 +23,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/pkgfind.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/pkgfind.1
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	pkgfind.c pkgfind.1
 SUBST_SED.path=		-e "s,/usr/pkgsrc,${PKGSRCDIR},g"
 SUBST_MESSAGE.path=	Adjusting pkgsrc directory.
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index a6c071aeb33..1c48f9067bb 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/10/03 15:12:42 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:32 jperkin Exp $
 
 DISTNAME=	apsfilter-7.2.8
 PKGREVISION=	1
@@ -33,7 +33,7 @@ CONF_FILES=	${PREFIX}/share/apsfilter/template/apsfilterrc \
 		${PKG_SYSCONFDIR}/apsfilterrc
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	bin/apsfilter.in SETUP.in tools/prtmgmt
 SUBST_SED.prefix=	-e 's,/usr/local,${LOCALBASE},g'
 SUBST_SED.prefix+=	-e 's,/usr/X11R6,${X11BASE},g'
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 6c57bfa0d47..573d2cf1cbb 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/06/22 14:12:45 bouyer Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:33 jperkin Exp $
 
 .include "../../print/cups/Makefile.common"
 PKGREVISION=1
@@ -115,20 +115,20 @@ OWN_DIRS_PERMS+=	${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/cups.pam
 SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=		rpathfix
 SUBST_FILES.rpathfix=	cups-config.in
 SUBST_MESSAGE.rpathfix=	Adding rpath to cups-config.
 SUBST_SED.rpathfix=	-e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
-SUBST_STAGE.rpathfix=	post-patch
+SUBST_STAGE.rpathfix=	pre-configure
 
 .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
 SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
-SUBST_STAGE.piefix=	post-patch
+SUBST_STAGE.piefix=	pre-configure
 .endif
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
diff --git a/print/cups15/Makefile b/print/cups15/Makefile
index 1cf76841ff3..d5673adeab4 100644
--- a/print/cups15/Makefile
+++ b/print/cups15/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/20 23:55:54 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:33 jperkin Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -143,20 +143,20 @@ OWN_DIRS_PERMS+=	${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/cups.pam
 SUBST_SED.paths+=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=		rpathfix
 SUBST_FILES.rpathfix=	cups-config.in
 SUBST_MESSAGE.rpathfix=	Adding rpath to cups-config.
 SUBST_SED.rpathfix=	-e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
-SUBST_STAGE.rpathfix=	post-patch
+SUBST_STAGE.rpathfix=	pre-configure
 
 .if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
 SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
-SUBST_STAGE.piefix=	post-patch
+SUBST_STAGE.piefix=	pre-configure
 .endif
 
 INSTALLATION_DIRS=	${DOCDIR} ${EGDIR} ${MIMEDIR}
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index bb8b664ede7..f1353557faa 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:33 jperkin Exp $
 #
 
 DISTNAME=	foo2zjs
@@ -25,7 +25,7 @@ SUBST_FILES.paths=	Makefile icc2ps/Makefile
 SUBST_SED.paths=	-e "s,@PREFIX@,${DESTDIR}${PREFIX},"
 SUBST_SED.paths+=	-e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR},"
 SUBST_SED.paths+=	-e "s,@RUNPREFIX@,${PREFIX},"
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE} ${PROGS}
diff --git a/print/indexinfo/Makefile b/print/indexinfo/Makefile
index 268403bce6a..f8f187b8e79 100644
--- a/print/indexinfo/Makefile
+++ b/print/indexinfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/12/05 19:54:15 marino Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:33 jperkin Exp $
 
 PKGNAME=	indexinfo-0.2.6
 CATEGORIES=	print
@@ -17,7 +17,7 @@ pre-install:
 
 .if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly"
 SUBST_CLASSES+=		reallocf
-SUBST_STAGE.reallocf=	post-patch
+SUBST_STAGE.reallocf=	pre-configure
 SUBST_FILES.reallocf=	indexinfo.c
 SUBST_SED.reallocf=	-e "s|reallocf|realloc|"
 SUBST_MESSAGE.reallocf=	Replace reallocf with realloc on ${OPSYS}
diff --git a/print/pdfmod/Makefile b/print/pdfmod/Makefile
index afba593f185..1e7ff3047eb 100644
--- a/print/pdfmod/Makefile
+++ b/print/pdfmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/04/16 14:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	pdfmod-0.9.1
 PKGREVISION=	20
@@ -20,7 +20,7 @@ REPLACE_SH=		icon-theme-installer
 INSTALLATION_DIRS+=	lib/pdfmod
 
 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/print/py-cups/Makefile b/print/py-cups/Makefile
index 94ff73e6148..a4b38343b99 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/04/17 22:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	pycups-1.9.73
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -19,7 +19,7 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fix cups paths.
 SUBST_FILES.paths=	cupsconnection.c
 SUBST_SED.paths=	-e 's:"/usr/share/cups":"${BUILDLINK_PREFIX.cups-base}/share/cups/", "/usr/share/cups":'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "../../lang/python/distutils.mk"
 .include "../../print/cups-base/buildlink3.mk"
diff --git a/print/xpdf-korean/Makefile b/print/xpdf-korean/Makefile
index c411fceaea0..02608b68c67 100644
--- a/print/xpdf-korean/Makefile
+++ b/print/xpdf-korean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/21 13:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	xpdf-korean-2011-sep-02
 PKGNAME=	xpdf-korean-20110902
@@ -22,7 +22,7 @@ INSTALLATION_DIRS+=	share/xpdf/korean/CMap
 
 SUBST_CLASSES+=		xpdfrc
 SUBST_MESSAGE.xpdfrc=	Adjusting xpdfrc wedge.
-SUBST_STAGE.xpdfrc=	post-patch
+SUBST_STAGE.xpdfrc=	pre-configure
 SUBST_FILES.xpdfrc=	add-to-xpdfrc
 SUBST_SED.xpdfrc+=	-e 's,/usr/\.\.\.\.,'${PREFIX}'/share/fonts/X11/TTF,' \
 			-e 's:/usr/local:'${PREFIX}':g' \
diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index a01ba745c19..8a80b3f282c 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2018/04/21 13:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	xpdf-3.04
 CATEGORIES=	print
@@ -40,7 +40,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths+=	doc/sample-xpdfrc doc/xpdf.1 doc/xpdfrc.5
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 OWN_DIRS=		share/xpdf
 
diff --git a/security/base/Makefile b/security/base/Makefile
index c4b5e38b2d0..2a07a5e395f 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/02/21 12:25:23 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	base-1.4.3.1
 PKGREVISION=	12
@@ -58,7 +58,7 @@ CONF_FILES_PERMS=	${EGDIR}/base_conf.php ${BASE_DIR}/base_conf.php \
 BUILD_DEFS+=		APACHE_USER APACHE_GROUP
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	base.conf base_conf.php.dist
 SUBST_SED.conf=		-e "s|@BASE_DIR@|${BASE_DIR}|g"
 SUBST_SED.conf+=	-e "s|@DBTYPE@|${DBTYPE}|g"
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index b8a7eed4ffb..8c15296a4f1 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2015/04/29 15:55:47 christos Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:33 jperkin Exp $
 #
 
 DISTNAME=		chkrootkit-0.50
@@ -19,7 +19,7 @@ PROGRAMS=	chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static \
 DOCDIR=		${PREFIX}/share/doc/chkrootkit
 
 SUBST_CLASSES+=		helper
-SUBST_STAGE.helper=	post-patch
+SUBST_STAGE.helper=	pre-configure
 SUBST_FILES.helper=	chkrootkit
 SUBST_SED.helper=	-e "s|./chklastlog|${PREFIX}/bin/chklastlog|g"
 SUBST_SED.helper+=	-e "s|./chkproc|${PREFIX}/bin/chkproc|g"
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 078c4989acc..7f93ad49257 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/11/09 19:00:25 snj Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:33 jperkin Exp $
 
 DISTNAME=	dropbear-2017.75
 CATEGORIES=	security
@@ -25,7 +25,7 @@ PKG_SUPPORTED_OPTIONS=	pam
 CONFIGURE_ARGS+=	--enable-pam
 SUBST_CLASSES+=		pam
 SUBST_MESSAGE.pam=	Enabling PAM in options.h
-SUBST_STAGE.pam=	post-patch
+SUBST_STAGE.pam=	pre-configure
 SUBST_FILES.pam=	options.h
 SUBST_SED.pam=		-e "s/ENABLE_SVR_PASSWORD_AUTH/ENABLE_SVR_PAM_AUTH/"
 .endif
diff --git a/security/duo-unix/Makefile b/security/duo-unix/Makefile
index 1870b4c9576..cf6d6ab20a5 100644
--- a/security/duo-unix/Makefile
+++ b/security/duo-unix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/02/16 07:20:56 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	duo_unix-1.10.1
@@ -32,7 +32,7 @@ CONF_FILES_PERMS+=	share/examples/duo-unix/login_duo.conf	\
 SPECIAL_PERMS+=		sbin/login_duo ${SETUID_ROOT_PERMS}
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_MESSAGE.man=	Fixing sysconfdir references
 SUBST_FILES.man=	login_duo/login_duo.8 pam_duo/pam_duo.8
 SUBST_SED.man=		-e 's,/etc/duo,${PKG_SYSCONFDIR},g'
diff --git a/security/easy-rsa/Makefile b/security/easy-rsa/Makefile
index c1347b0a3e3..7e451554c28 100644
--- a/security/easy-rsa/Makefile
+++ b/security/easy-rsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/06/24 07:31:09 adam Exp $
+# $NetBSD: Makefile,v 1.7 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	EasyRSA-3.0.4
 PKGNAME=	${DISTNAME:S/EasyRSA/easy-rsa/}
@@ -29,7 +29,7 @@ REQD_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 SUBST_CLASSES+=		sysconf
-SUBST_STAGE.sysconf=	post-patch
+SUBST_STAGE.sysconf=	pre-configure
 SUBST_FILES.sysconf=	easyrsa vars.example
 SUBST_SED.sysconf=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index ecf546436a9..0c6d64aee48 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2018/07/04 12:46:29 adam Exp $
+# $NetBSD: Makefile,v 1.89 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	gpgme-1.11.1
 CATEGORIES=	security
@@ -21,7 +21,7 @@ SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	src/gpgme-config.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
 SUBST_SED.pthread+=	-e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
-SUBST_STAGE.pthread=	post-patch
+SUBST_STAGE.pthread=	pre-configure
 
 CPPFLAGS.Darwin=	-D_POSIX_C_SOURCE=200809L
 LIBS.SunOS+=		-lnsl -lsocket
diff --git a/security/ike-scan/Makefile b/security/ike-scan/Makefile
index 4cab24da3aa..0086c522853 100644
--- a/security/ike-scan/Makefile
+++ b/security/ike-scan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/08/16 20:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	ike-scan-1.9
 PKGREVISION=	5
@@ -13,7 +13,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	ike-scan.1
 SUBST_SED.man=		-e "s|/usr/local|${PREFIX}|g"
 SUBST_MESSAGE.man=	Fixing man pages.
diff --git a/security/libprelude/Makefile.common b/security/libprelude/Makefile.common
index f0d05d81cf2..1a7588e21ab 100644
--- a/security/libprelude/Makefile.common
+++ b/security/libprelude/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2017/09/12 06:14:08 dholland Exp $
+# $NetBSD: Makefile.common,v 1.13 2018/07/04 13:40:34 jperkin Exp $
 #
 # used by security/libprelude/Makefile
 # used by security/libprelude-lua/Makefile
@@ -50,7 +50,7 @@ MAKE_DIRS=		${PKG_SYSCONFDIR}/default ${PKG_SYSCONFDIR}/profile
 MAKE_DIRS_PERMS+=	${PKG_SYSCONFDIR}/profile ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0711
 
 SUBST_CLASSES+=		make
-SUBST_STAGE.make=	post-patch
+SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
 SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index dd60ee23872..32ad89c7f99 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2017/09/03 08:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	nikto-2.1.5
 PKGREVISION=	2
@@ -17,20 +17,20 @@ NO_BUILD=	yes
 AUTO_MKDIRS=	yes
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	nikto.pl docs/nikto.1
 SUBST_SED.conf=		-e "s|/etc/nikto\.conf|${PKG_SYSCONFDIR}/nikto.conf|g"
 SUBST_SED.conf+=	-e "s|/etc/nikto\\\&\.conf|${PKG_SYSCONFDIR}/nikto\\\\\\&.conf|g"
 SUBST_MESSAGE.conf=	Fixing path to nikto.conf
 
 SUBST_CLASSES+=		execdir
-SUBST_STAGE.execdir=	post-patch
+SUBST_STAGE.execdir=	pre-configure
 SUBST_FILES.execdir=	nikto.conf
 SUBST_SED.execdir=	-e "s|^\# EXECDIR=/opt/nikto|EXECDIR=${PREFIX}/libdata/nikto|g"
 SUBST_MESSAGE.execdir=	Fixing path to EXECDIR
 
 SUBST_CLASSES+=		manual
-SUBST_STAGE.manual=	post-patch
+SUBST_STAGE.manual=	pre-configure
 SUBST_FILES.manual=	docs/nikto.1
 SUBST_SED.manual=	-e "s|/usr/local/bin/nikto|nikto|g"
 SUBST_MESSAGE.manual=	Fixing path to nikto
diff --git a/security/opendnssec/Makefile b/security/opendnssec/Makefile
index b38cec2e2bb..e8c5e04ddc8 100644
--- a/security/opendnssec/Makefile
+++ b/security/opendnssec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/04/14 07:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	opendnssec-1.4.13
@@ -50,7 +50,7 @@ PKG_SYSCONFSUBDIR=	opendnssec
 
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/conf/Makefile.in
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/security/openvas-server/Makefile b/security/openvas-server/Makefile
index 1b6551365ab..22d46fe1283 100644
--- a/security/openvas-server/Makefile
+++ b/security/openvas-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	openvas-server-2.0.0
@@ -18,7 +18,7 @@ USE_TOOLS+=	pkg-config gettext:run
 RCD_SCRIPTS=	openvasd
 
 SUBST_CLASSES+=		user
-SUBST_STAGE.user=	post-patch
+SUBST_STAGE.user=	pre-configure
 SUBST_FILES.user=	openvas-adduser.in openvas-mkcert-client.in
 SUBST_FILES.user+=	openvas-mkcert.in openvas-rmuser.in
 SUBST_SED.user=		-e "s|/usr/bin/gettext|${BUILDLINK_PREFIX.gettext}/bin/gettext|g"
diff --git a/security/p5-Crypt-GPG/Makefile b/security/p5-Crypt-GPG/Makefile
index 8fc544acc02..f788934c6c3 100644
--- a/security/p5-Crypt-GPG/Makefile
+++ b/security/p5-Crypt-GPG/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/06/05 14:24:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=		Crypt-GPG-1.64
@@ -21,7 +21,7 @@ DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 SUBST_CLASSES+=		local
 SUBST_FILES.local=	GPG.pm
 SUBST_SED.local=	-e s,/usr/local,${PREFIX},
-SUBST_STAGE.local=	post-patch
+SUBST_STAGE.local=	pre-configure
 
 USE_LANGUAGES=		# empty
 PERL5_PACKLIST=		auto/Crypt/GPG/.packlist
diff --git a/security/p5-pcsc/Makefile b/security/p5-pcsc/Makefile
index 644c8a6db6b..bd68bd2c618 100644
--- a/security/p5-pcsc/Makefile
+++ b/security/p5-pcsc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/06/05 14:24:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	pcsc-perl-1.4.14
 PKGNAME=	p5-${DISTNAME:S/-perl//}
@@ -15,7 +15,7 @@ PERL5_MODULE_TYPE=	MakeMaker
 LICENSE=		gnu-gpl-v2
 
 SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	Card/t/test.t examples/test_iso_error.pl examples/gsm_directory.pl t/test.t test/multiple_readers.pl test/single_reader.pl
 SUBST_SED.perl=		-e 's,/usr/bin/perl,${PERL5},'
 
diff --git a/security/pam-tacplus/Makefile b/security/pam-tacplus/Makefile
index 63e493b10cb..7f64aa9ee2b 100644
--- a/security/pam-tacplus/Makefile
+++ b/security/pam-tacplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $
 #
 
 DISTNAME=	pam_tacplus-1.3.6
@@ -17,7 +17,7 @@ EGDIR=		${PREFIX}/share/examples/pam_tacplus
 GNU_CONFIGURE=yes
 
 SUBST_CLASSES+=		egdir
-SUBST_STAGE.egdir=	post-patch
+SUBST_STAGE.egdir=	pre-configure
 SUBST_FILES.egdir=	Makefile.in
 SUBST_SED.egdir=	-e "s,@EGDIR@,${EGDIR},"
 
diff --git a/security/password-store/Makefile b/security/password-store/Makefile
index d719c22383e..b31d9621716 100644
--- a/security/password-store/Makefile
+++ b/security/password-store/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/06/14 16:08:39 leot Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:34 jperkin Exp $
 
 DISTNAME=	password-store-1.7.2
 CATEGORIES=	security
@@ -26,7 +26,7 @@ REPLACE_BASH+=	src/password-store.sh
 REPLACE_BASH+=	tests/*.sh
 
 SUBST_CLASSES+=		fixsh
-SUBST_STAGE.fixsh=	post-patch
+SUBST_STAGE.fixsh=	pre-configure
 SUBST_MESSAGE.fixsh=	Fixing shell script
 SUBST_FILES.fixsh=	src/password-store.sh
 SUBST_SED.fixsh+=	-e 's,GETOPT="getopt",GETOPT="${PREFIX}/bin/getopt",'
diff --git a/security/pcsc-tools/Makefile b/security/pcsc-tools/Makefile
index 77b038c3feb..037d43265d0 100644
--- a/security/pcsc-tools/Makefile
+++ b/security/pcsc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/02/16 14:47:56 gdt Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	pcsc-tools-1.4.27
 CATEGORIES=	security
@@ -19,7 +19,7 @@ DESTDIR_VARNAME=	# empty
 INSTALL_ENV+=		DESTDIR=${DESTDIR}${PREFIX:Q}
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	ATR_analysis ./ATR_analysis.1p
 SUBST_SED.prefix=	-e 's,/usr/local/pcsc,${PREFIX}/share/pcsc,'
 
diff --git a/security/pks/Makefile b/security/pks/Makefile
index fcd3db2c93d..fbb4130e5c3 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/09/03 08:36:59 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	pks-0.9.4
 PKGREVISION=	5
@@ -57,7 +57,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${EGDIR:Q}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	pks-commands.html
 SUBST_SED.paths=	-e "s|localhost|${PKS_SERVER}|g"
 
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 36eec6a80a5..8f95dbcde92 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.15
@@ -49,13 +49,13 @@ FILES_SUBST+=	PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-lml.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
 SUBST_CLASSES+=		make
-SUBST_STAGE.make=	post-patch
+SUBST_STAGE.make=	pre-configure
 SUBST_FILES.make=	Makefile.in
 SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 86ce78d8c51..52bbed97b99 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2018/04/17 22:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=		prelude-manager-0.9.15
@@ -48,7 +48,7 @@ FILES_SUBST+=		PRELUDE_USER=${PRELUDE_USER:Q}
 FILES_SUBST+=		PRELUDE_GROUP=${PRELUDE_USER:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-manager.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile
index ee7d2f1085b..936d22565b4 100644
--- a/security/prelude-pflogger/Makefile
+++ b/security/prelude-pflogger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/04/17 22:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:35 jperkin Exp $
 #
 
 DISTNAME=	prelude-pflogger-0.9.0-rc2
@@ -43,13 +43,13 @@ MESSAGE_SUBST+=	PRELUDE_USER=${PRELUDE_USER:Q}
 MESSAGE_SUBST+=	PRELUDE_GROUP=${PRELUDE_GROUP:Q}
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	run-prelude-pflogger.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
 SUBST_CLASSES+=         make
-SUBST_STAGE.make=       post-patch
+SUBST_STAGE.make=       pre-configure
 SUBST_FILES.make=       Makefile.am
 SUBST_SED.make=         -e 's,@EGDIR@,${EGDIR},g'
 
diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index 0a00b3e7605..9bf6f567e7b 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2018/07/03 05:03:32 adam Exp $
+# $NetBSD: Makefile,v 1.48 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=		prewikka-${VERSION}
 PKGNAME=		${PYPKGPREFIX}-prewikka-${VERSION}
@@ -42,7 +42,7 @@ PKG_GROUPS_VARS+=	PREWIKKA_GROUP
 PKG_USERS_VARS+=	PREWIKKA_USER
 
 SUBST_CLASSES+=		code
-SUBST_STAGE.code=	post-patch
+SUBST_STAGE.code=	pre-configure
 SUBST_FILES.code=	runPrewikka.c
 SUBST_SED.code=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=	-e 's,@PREWIKKA_USER@,${PREWIKKA_USER},g'
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 66a6f737a93..b8cd1b9b316 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/02 10:59:49 markd Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 DISTNAME=	requests-kerberos-0.12.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ DEPENDS+=	${PYPKGPREFIX}-requests>=1.1.0:../../devel/py-requests
 USE_LANGUAGES=	# none
 
 SUBST_CLASSES+=		requires
-SUBST_STAGE.requires=	post-patch
+SUBST_STAGE.requires=	pre-configure
 SUBST_FILES.requires=	setup.py
 SUBST_SED.requires=	-e 's/pykerberos/kerberos/'
 
diff --git a/security/qca2-gnupg/Makefile b/security/qca2-gnupg/Makefile
index bb3ac616a87..14a85a608a6 100644
--- a/security/qca2-gnupg/Makefile
+++ b/security/qca2-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/03/12 11:17:30 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-gnupg-${DISTNAME:C/.*-//}
 PKGREVISION=	1
@@ -17,7 +17,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-gnupg/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-ossl/Makefile b/security/qca2-ossl/Makefile
index 9bdfa48a39f..b6ffe9e83fb 100644
--- a/security/qca2-ossl/Makefile
+++ b/security/qca2-ossl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/03/12 11:17:30 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-ossl-${DISTNAME:C/.*-//}
 PKGREVISION=	1
@@ -15,7 +15,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-ossl/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-qt5-gnupg/Makefile b/security/qca2-qt5-gnupg/Makefile
index ac12bac398a..676ed15c182 100644
--- a/security/qca2-qt5-gnupg/Makefile
+++ b/security/qca2-qt5-gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/14 07:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-qt5-gnupg-${DISTNAME:C/.*-//}
 PKGREVISION=	2
@@ -16,7 +16,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca-qt5
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-gnupg/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2-qt5-ossl/Makefile b/security/qca2-qt5-ossl/Makefile
index df8b22281a9..a29318b8e9c 100644
--- a/security/qca2-qt5-ossl/Makefile
+++ b/security/qca2-qt5-ossl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/04/14 07:34:40 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:35 jperkin Exp $
 
 PKGNAME=	qca2-qt5-ossl-${DISTNAME:C/.*-//}
 PKGREVISION=	2
@@ -14,7 +14,7 @@ CMAKE_ARGS+=	-DBUILD_TOOLS=OFF
 CMAKE_ARGS+=	-DINST_QCA_LIB_NAME=-lqca-qt5
 
 SUBST_CLASSES+=		libname
-SUBST_STAGE.libname=	post-patch
+SUBST_STAGE.libname=	pre-configure
 SUBST_MESSAGE.libname=	Use installed lib.
 SUBST_FILES.libname=	plugins/qca-ossl/CMakeLists.txt
 SUBST_SED.libname=	-e 's:{QCA_LIB_NAME}:{INST_QCA_LIB_NAME}:'
diff --git a/security/qca2/Makefile.common b/security/qca2/Makefile.common
index f94e46c8a87..c5e4b187227 100644
--- a/security/qca2/Makefile.common
+++ b/security/qca2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2018/01/31 09:14:55 markd Exp $
+# $NetBSD: Makefile.common,v 1.2 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	qca-2.1.3
 CATEGORIES=	security
@@ -22,6 +22,6 @@ CMAKE_ARGS+=	-DOSX_FRAMEWORK=OFF
 CMAKE_ARGS+=	-DBUILD_TESTS=OFF
 
 SUBST_CLASSES+=		certs 
-SUBST_STAGE.certs=	post-patch
+SUBST_STAGE.certs=	pre-configure
 SUBST_FILES.certs=	CMakeLists.txt
 SUBST_VARS.certs=	PREFIX
diff --git a/security/skey/hacks.mk b/security/skey/hacks.mk
index bbaea03491e..3697f3121ec 100644
--- a/security/skey/hacks.mk
+++ b/security/skey/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2008/12/13 12:07:54 obache Exp $
+# $NetBSD: hacks.mk,v 1.5 2018/07/04 13:40:36 jperkin Exp $
 
 .if !defined(SKEY_HACKS_MK)
 SKEY_HACKS_MK=	# defined
@@ -11,7 +11,7 @@ PKG_HACKS+=		enforce-troff-style-man-pages
 CONFIGURE_ARGS+=	--with-catman=man
 SUBST_CLASSES+=		tsmp
 SUBST_MESSAGE.tsmp=	enforce use of troff style man pages
-SUBST_STAGE.tsmp=	post-patch
+SUBST_STAGE.tsmp=	pre-configure
 SUBST_FILES.tsmp=	configure
 SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
 
@@ -22,7 +22,7 @@ SUBST_SED.tsmp=		-e 's,$$(CATMAN),$$(TROFFMAN),g'
 PKG_HACKS+=		use-sginap-instead-of-usleep
 SUBST_CLASSES+=		sginap
 SUBST_MESSAGE.sginap=	use sginap() instead of usleep()
-SUBST_STAGE.sginap=	post-patch
+SUBST_STAGE.sginap=	pre-configure
 SUBST_FILES.sginap=	skeyinit.c skeylogin.c
 SUBST_SED.sginap=	-e 's,usleep(100000),sginap(CLK_TCK/10),g'
 .endif
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index bc51f6fd6e8..4f4d4e1926a 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/01 14:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:36 jperkin Exp $
 #
 
 DISTNAME=	SnortSnarf-050314.1
@@ -20,7 +20,7 @@ REPLACE_PERL=	snortsnarf.pl include/ann_xml.pl include/web_utils.pl	\
 		include/xml_help.pl
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	snortsnarf.pl
 SUBST_SED.paths=	-e "s|./include|${PREFIX}/share/snortsnarf|g"
 SUBST_MESSAGE.paths=	Fixing paths.
diff --git a/security/softhsm/Makefile b/security/softhsm/Makefile
index 556b3bb9b91..477c5fba454 100644
--- a/security/softhsm/Makefile
+++ b/security/softhsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2018/04/14 07:34:01 adam Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:36 jperkin Exp $
 #
 
 DISTNAME=	softhsm-1.3.7
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/softhsm
 
 SUBST_CLASSES+=         paths
 SUBST_FILES.paths=      ${WRKSRC}/Makefile.in
-SUBST_STAGE.paths=      post-patch
+SUBST_STAGE.paths=      pre-configure
 SUBST_SED.paths=        -e 's,@EGDIR@,${EGDIR},'
 
 CXXFLAGS.NetBSD+=	-D_NETBSD_SOURCE
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index b710c0bfce5..1b5f722752c 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2015/03/06 23:22:25 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2018/07/04 13:40:36 jperkin Exp $
 
 # See here for new version: http://www.mcafee.com/apps/downloads/free-evaluations/default.aspx?pc=aaad13320&plat=linux&pid=&eid=&ilv=LatestVersions&sz=25&pg=1&segment=false&region=us
 BROKEN=			distfile is gone, package must be updated to version 6.0.4
@@ -51,7 +51,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	update_dat.sh uvscan.sh
 SUBST_VARS.paths=	AWK BASENAME CP DATFILES ECHO GTAR MKDIR MV	\
 			PREFIX RM SED UVSCANDIR
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 post-extract:
 	${CP} ${FILESDIR}/update_dat.sh ${WRKSRC}/update_dat.sh
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index 21d26ea8030..4733234f6b7 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/03 05:03:33 adam Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	lshell-0.9.16
 CATEGORIES=	shells python
@@ -22,7 +22,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.9.16
 EGDIR=			share/examples/lshell
 
 SUBST_CLASSES+=		setup
-SUBST_STAGE.setup=	post-patch
+SUBST_STAGE.setup=	pre-configure
 SUBST_FILES.setup=	setup.py
 SUBST_SED.setup=	-e 's,/etc,${EGDIR},'
 SUBST_SED.setup+=	-e 's,share/man,${PKGMANDIR},'
diff --git a/shells/xonsh/Makefile b/shells/xonsh/Makefile
index b925ae9b383..4aaf1a009d9 100644
--- a/shells/xonsh/Makefile
+++ b/shells/xonsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/21 11:34:57 kamil Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/04 13:40:36 jperkin Exp $
 
 DISTNAME=	xonsh-0.4.5
 CATEGORIES=	shells python
@@ -21,7 +21,7 @@ PKG_SHELL=	${PREFIX}/bin/xon.sh
 PKG_SHELL+=	${PREFIX}/bin/xonsh
 
 SUBST_CLASSES+=		xonsh
-SUBST_STAGE.xonsh=	post-patch
+SUBST_STAGE.xonsh=	pre-configure
 SUBST_FILES.xonsh=	scripts/xon.sh
 SUBST_SED.xonsh=	-e 's,python3,${PYTHONBIN},'
 
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.
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 03884f4e4c6..38295b737e6 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/01/19 18:52:27 agc Exp $
+# $NetBSD: Makefile,v 1.55 2018/07/04 13:40:39 jperkin Exp $
 
 DISTNAME=	eb-4.3
 PKGREVISION=	8
@@ -65,7 +65,7 @@ EGDIR=		${PREFIX}/share/examples/eb
 # -    ZLIBLIBS="-L$z_libdir -lz"
 # +    ZLIBLIBS="-Wl,-R$z_libdir -L$z_libdir -lz"
 SUBST_CLASSES+=		runpath
-SUBST_STAGE.runpath=	post-patch
+SUBST_STAGE.runpath=	pre-configure
 SUBST_FILES.runpath=	configure configure.ac
 SUBST_SED.runpath=	-e 's|^\(.*LIBS=['\''"]\)-L\(\$$[^[:blank:]][^[:blank:]]*\)\(.*\)$$|\1${COMPILER_RPATH_FLAG}\2 -L\2\3|'
 
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 6f218bf4333..86007889583 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/08/01 14:59:06 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:39 jperkin Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 #
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 PLIST_SRC=	${PKGDIR}/PLIST
 
 SUBST_CLASSES+=			java_home
-SUBST_STAGE.java_home=		post-patch
+SUBST_STAGE.java_home=		pre-configure
 SUBST_MESSAGE.java_home=	Setting JAVA_HOME to a sane value.
 SUBST_FILES.java_home=		fop
 SUBST_FILES.java_home+=		fop-ttfreader.sh
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index 6f2b7cd6bb3..7837546c933 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/08/16 20:21:15 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:39 jperkin Exp $
 #
 
 DISTNAME=		helpdeco-2.1.3
@@ -22,7 +22,7 @@ USE_TOOLS+=		gmake
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Configuring to use PREFIX.
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	Makefile
 SUBST_SED.prefix=	-e "s,/usr/local,${DESTDIR}${PREFIX},g"
 
diff --git a/textproc/p5-Pod-Spell/Makefile b/textproc/p5-Pod-Spell/Makefile
index 3a5ce76fe5d..6624b5441e3 100644
--- a/textproc/p5-Pod-Spell/Makefile
+++ b/textproc/p5-Pod-Spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/06/05 14:24:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/04 13:40:39 jperkin Exp $
 
 DISTNAME=	Pod-Spell-1.20
 PKGNAME=	p5-${DISTNAME}
@@ -23,7 +23,7 @@ BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 PERL5_PACKLIST=		auto/Pod/Spell/.packlist
 
 SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_MESSAGE.perl=	Fixing path to perl
 SUBST_FILES.perl+=	bin/podspell
 SUBST_SED.perl=		-e "s|/usr/bin/env perl|${PERL5}|"
diff --git a/textproc/p5-XML-Bare/Makefile b/textproc/p5-XML-Bare/Makefile
index deb215ac218..c6b34f28009 100644
--- a/textproc/p5-XML-Bare/Makefile
+++ b/textproc/p5-XML-Bare/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/06/05 14:24:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:39 jperkin Exp $
 #
 
 DISTNAME=	XML-Bare-0.53
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c
 
 SUBST_CLASSES+=		perl
 SUBST_MESSAGE.perl=	Fixing the path of perl.
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	Bare.pm
 SUBST_SED.perl=		-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
 
diff --git a/textproc/rfcutil/Makefile b/textproc/rfcutil/Makefile
index b2989b18d7e..503f7121b7e 100644
--- a/textproc/rfcutil/Makefile
+++ b/textproc/rfcutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/09/04 18:01:02 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:39 jperkin Exp $
 #
 
 DISTNAME=	rfc-3.2
@@ -24,7 +24,7 @@ RFCINDEXURL=	http://www.ietf.org/download/
 INSTALLATION_DIRS=	bin
 
 SUBST_CLASSES+=		rfcutil
-SUBST_STAGE.rfcutil=	post-patch
+SUBST_STAGE.rfcutil=	pre-configure
 SUBST_FILES.rfcutil=	rfc
 SUBST_SED.rfcutil+=	-e 's,/usr/local,${PREFIX},'
 SUBST_SED.rfcutil+=	-e '/VIEWER=/s,w3m lynx,${RFCVIEWER},'
diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile
index c9e808f6be8..f4b3502e96a 100644
--- a/textproc/robodoc/Makefile
+++ b/textproc/robodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/09/04 18:08:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:39 jperkin Exp $
 #
 
 DISTNAME=	robodoc-3.2.3
@@ -16,7 +16,7 @@ USE_TOOLS+=	gm4 gmake
 SUBST_CLASSES+=		gm4
 SUBST_FILES.gm4=	Docs/makefile.in
 SUBST_SED.gm4+=		-e 's,@M4@,${TOOLS_M4},g'
-SUBST_STAGE.gm4=	post-patch
+SUBST_STAGE.gm4=	pre-configure
 
 MAKE_FILE=	makefile
 
diff --git a/time/hamster-applet/Makefile b/time/hamster-applet/Makefile
index 6c82c458852..cdf029b1a82 100644
--- a/time/hamster-applet/Makefile
+++ b/time/hamster-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2018/07/03 05:03:38 adam Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:39 jperkin Exp $
 
 DISTNAME=	hamster-applet-2.28.1
 PKGREVISION=	36
@@ -21,7 +21,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-ORBit via py-gnome2, py-gtk2
 
 SUBST_CLASSES+=		python
 SUBST_MESSAGE.python=	Fixing path to Python interpreter.
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	hamster/hamster-applet.py
 SUBST_SED.python=	-e 's@/usr/bin/env python@${PYTHONBIN}@g'
 
diff --git a/wm/compiz/Makefile b/wm/compiz/Makefile
index faedcd9c757..8fea2029fbe 100644
--- a/wm/compiz/Makefile
+++ b/wm/compiz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/04/29 21:32:06 adam Exp $
+# $NetBSD: Makefile,v 1.106 2018/07/04 13:40:39 jperkin Exp $
 #
 
 PKGVER=		0.8.8
@@ -59,7 +59,7 @@ PKGCONFIG_OVERRIDE+=	libdecoration/libdecoration.pc.in
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	metadata/decoration.xml.in
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "options.mk"
 
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index d11ec390b21..d4ffa647cc9 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/03/12 11:17:43 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2018/07/04 13:40:39 jperkin Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGREVISION=	12
@@ -48,7 +48,7 @@ SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-Setup95
 SUBST_SED.perl=		-e "s|${TOOLS_CMD.perl}|${PERL5}|"
 
 SUBST_CLASSES+=		mail
-SUBST_STAGE.mail=	post-patch
+SUBST_STAGE.mail=	pre-configure
 SUBST_MESSAGE.mail=	Fixing mail address
 SUBST_FILES.mail+=	bin/fvwm-bug.in
 SUBST_SED.mail=		-e "s|@MAINTAINER@|${MAINTAINER}|"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 698c3c5ae89..8702c430d40 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/06/24 06:28:02 dholland Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:40 jperkin Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -42,7 +42,7 @@ CONF_FILES=	${EGDIR}/golemrc.default ${PKG_SYSCONFDIR}/golemrc
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	sample.golem/golemrc
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	${EGDIR}
 INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile
index d687182066d..e566339565e 100644
--- a/wm/larswm/Makefile
+++ b/wm/larswm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/08/16 20:45:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/07/04 13:40:40 jperkin Exp $
 #
 
 DISTNAME=	larswm-7.5.3
@@ -27,7 +27,7 @@ CPPFLAGS+=	-DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR:Q}\"
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	larswm.man
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	share/doc/larswm share/examples/larswm
 
diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile
index 2bb8e74dda0..af7087c6e64 100644
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/04/16 14:35:17 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:40 jperkin Exp $
 #
 
 DISTNAME=	OroboROX-0.9.8
@@ -33,19 +33,19 @@ INSTALLATION_DIRS=	share/rox/OroboROX
 
 SUBST_CLASSES+=		bin
 SUBST_MESSAGE.bin=	Fixing binary path.
-SUBST_STAGE.bin=	post-patch
+SUBST_STAGE.bin=	pre-configure
 SUBST_FILES.bin=	AppRun
 SUBST_SED.bin=		-e 's,BIN="$$APP_DIR/$$PLATFORM,BIN="${PREFIX}/libexec/rox,g'
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	AppRun
 SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	Configure/Keybindings/findrox.py
 SUBST_FILES.lib+=	Configure/Windows/findrox.py
 SUBST_FILES.lib+=	Configure/Workspaces/findrox.py
@@ -54,7 +54,7 @@ SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
 SUBST_CLASSES+=		py
 SUBST_MESSAGE.py=	Replace shell magic by python version.
-SUBST_STAGE.py=		post-patch
+SUBST_STAGE.py=		pre-configure
 SUBST_FILES.py=		Configure/Keybindings/AppRun
 SUBST_FILES.py+=	Configure/Keybindings/Messages/update-po
 SUBST_FILES.py+=	Configure/Windows/Messages/update-po
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 03d5e144b01..c3b285a0f4e 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/05/14 10:31:14 maya Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:40 jperkin Exp $
 
 DISTNAME=		wmii+ixp-3.9.2
 PKGNAME=		wmii-3.9.2
@@ -50,7 +50,7 @@ CONF_FILES+=		${EGDIR}/${EGSUBDIR.${subdir}}/${file} \
 LDFLAGS.SunOS+=		-lsocket -lnsl -liconv
 
 SUBST_CLASSES+=		vars
-SUBST_STAGE.vars=	post-patch
+SUBST_STAGE.vars=	pre-configure
 SUBST_FILES.vars=	util/compile
 SUBST_VARS.vars=	EGREP SED SH AWK
 
diff --git a/wm/xmonad-contrib/options.mk b/wm/xmonad-contrib/options.mk
index e6b15cbb434..0d4dabba317 100644
--- a/wm/xmonad-contrib/options.mk
+++ b/wm/xmonad-contrib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/08/25 13:58:21 szptvlfn Exp $
+# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:40 jperkin Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xmonad-contrib
 PKG_SUPPORTED_OPTIONS= xft2
@@ -15,7 +15,7 @@ SUBST_FILES.1=	xmonad-contrib.cabal
 SUBST_SED.1=	-e "s|render text|render text+  default: False|"
 
 SUBST_CLASSES+=	2
-SUBST_STAGE.2=	post-patch
+SUBST_STAGE.2=	pre-configure
 SUBST_FILES.2=	xmonad-contrib.cabal
 SUBST_FILTER_CMD.2=	${TR} '+' \\n
 .endif
diff --git a/wm/xmonad/Makefile b/wm/xmonad/Makefile
index 9f7bcf7c390..43b2ad3da6f 100644
--- a/wm/xmonad/Makefile
+++ b/wm/xmonad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/26 04:29:56 dholland Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:40 jperkin Exp $
 
 DISTNAME=	xmonad-0.12
 PKGNAME=	${DISTNAME}
@@ -15,7 +15,7 @@ SUBST_FILES.1=	xmonad.cabal
 SUBST_SED.1=	-e "s|executable xmonad|executable xmonad+    buildable: False|"
 
 SUBST_CLASSES+=	2
-SUBST_STAGE.2=	post-patch
+SUBST_STAGE.2=	pre-configure
 SUBST_FILES.2=	xmonad.cabal
 SUBST_FILTER_CMD.2=	${TR} '+' \\n
 
diff --git a/www/SOGo3/Makefile b/www/SOGo3/Makefile
index 70a768546ee..9ec0edc5727 100644
--- a/www/SOGo3/Makefile
+++ b/www/SOGo3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/29 21:32:06 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:40 jperkin Exp $
 #
 
 DISTNAME=	SOGo-3.2.9
@@ -50,7 +50,7 @@ RCD_SCRIPTS=	sogod
 
 SUBST_CLASSES+=         paths
 SUBST_MESSAGE.paths=    Fixing hardcoded paths.
-SUBST_STAGE.paths=      post-patch
+SUBST_STAGE.paths=      pre-configure
 SUBST_FILES.paths=      SoObjects/SOGo/SOGoSystemDefaults.m
 SUBST_SED.paths=        -e 's,/etc/sogo/,${PKG_SYSCONFDIR}/,g'
 
diff --git a/www/SpeedyCGI/Makefile b/www/SpeedyCGI/Makefile
index 5f91338c535..41489ac437c 100644
--- a/www/SpeedyCGI/Makefile
+++ b/www/SpeedyCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/08/23 17:54:53 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2018/07/04 13:40:40 jperkin Exp $
 
 DISTNAME=	CGI-SpeedyCGI-2.22
 PKGNAME=	SpeedyCGI-2.22
@@ -18,7 +18,7 @@ PERL5_PACKLIST= 	auto/CGI/SpeedyCGI/.packlist
 MAKE_ENV+=		PERL_USE_UNSAFE_INC=1
 
 SUBST_CLASSES+=		run
-SUBST_STAGE.run=	post-patch
+SUBST_STAGE.run=	pre-configure
 SUBST_FILES.run=	src/optdefs
 SUBST_SED.run+=		-e "s|@@PREFIX@@|${PREFIX}|g"
 SUBST_MESSAGE.run=	Fixing hardcoded paths.
diff --git a/www/album/Makefile b/www/album/Makefile
index ea75fcfe07d..28f7acb0970 100644
--- a/www/album/Makefile
+++ b/www/album/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/12/16 15:24:20 hans Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:40 jperkin Exp $
 
 DISTNAME=	album-4.15
 PKGREVISION=	
@@ -26,7 +26,7 @@ AUTO_MKDIRS=		yes
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Adjust Install Path to ${PREFIX}
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	album
 SUBST_VARS.prefix=	PREFIX
 
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index c912e1c3b4f..0e1ce8d4c73 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2018/04/29 21:32:07 adam Exp $
+# $NetBSD: Makefile,v 1.69 2018/07/04 13:40:40 jperkin Exp $
 #
 # When updating this package, make sure that no strings like
 # "PR 12345" are in the commit message. Upstream likes
@@ -109,7 +109,7 @@ FIX_MAN_PERMS+=		man8/apachectl.8 man1/ab.1 man1/httxt2dbm.1
 
 # Fix paths in the apache manpages.
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_MESSAGE.man=	Fixing paths in man pages.
 SUBST_FILES.man=	docs/man/*.1 docs/man/*.8
 SUBST_SED.man=		-e 's,/usr/local/etc/apache,${PKG_SYSCONFDIR},'
diff --git a/www/aws-demos/Makefile b/www/aws-demos/Makefile
index 0534b6f9172..dc6aec9dc16 100644
--- a/www/aws-demos/Makefile
+++ b/www/aws-demos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/04/17 22:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:40 jperkin Exp $
 
 DISTNAME=	aws-${AWS_VERSION}
 PKGNAME=	aws-demos-${AWS_VERSION}
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=	LPATH=${BUILDLINK_PREFIX.openssl}/lib
 CONFIGURE_ARGS+=	ZPATH=${BUILDLINK_PREFIX.zlib}/lib
 
 SUBST_CLASSES+= 	lpath
-SUBST_STAGE.lpath=	post-patch
+SUBST_STAGE.lpath=	pre-configure
 SUBST_MESSAGE.lpath=	Add library path for ldap
 SUBST_FILES.lpath=	demos/test_ldap/test_ldap.gpr
 SUBST_SED.lpath=	-e 's|@PREFIX@|${PREFIX}|g'
diff --git a/www/bannerfilter/Makefile b/www/bannerfilter/Makefile
index c645669d3d3..fe2e91c4fce 100644
--- a/www/bannerfilter/Makefile
+++ b/www/bannerfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/07/09 06:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:40 jperkin Exp $
 #
 
 DISTNAME=	bannerfilter-1.31
@@ -18,7 +18,7 @@ CONF_FILES=	${SHAREDIR}/bannerfilter.conf ${PKG_SYSCONFDIR}/bannerfilter.conf
 REPLACE_PERL=	redirector.pl
 
 SUBST_CLASSES+=	bf
-SUBST_STAGE.bf=	post-patch
+SUBST_STAGE.bf=	pre-configure
 SUBST_FILES.bf=	bannerfilter.conf
 SUBST_SED.bf=	-e s,@SHAREDIR@,${SHAREDIR},g
 
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index ff41ddd00c6..4c8b652f5fe 100644
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/08/01 14:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	crawl-0.4
 PKGREVISION=	12
@@ -25,7 +25,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/crawl.conf ${DESTDIR}${PREFIX}/share/examples/crawl/crawl.conf
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	cfg.h
 SUBST_SED.path=		-e 's,crawl.conf,${PKG_SYSCONFDIR}/crawl.conf,g'
 SUBST_MESSAGE.path=	Fixing hardcoded path.
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index c2832956b81..ddb44e4de09 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/08/01 14:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/07/04 13:40:41 jperkin Exp $
 #
 
 DISTNAME=		cvsweb-3.0.6
@@ -62,7 +62,7 @@ do-install:
 .endfor
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	cvsweb.conf cvsweb.cgi INSTALL
 SUBST_SED.prefix=	-e "s,/usr/local/etc/apache,${PKG_SYSCONFBASE}/httpd,g"
 SUBST_SED.prefix+=	-e "s,/usr/local/etc/cvsweb,${PKG_SYSCONFDIR},g"
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 2be466f10ad..f846ddbb625 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 06:39:12 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/07/04 13:40:41 jperkin Exp $
 #
 
 DISTNAME=		drraw-2.2b2
@@ -45,7 +45,7 @@ do-install:
 .endfor
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	drraw.cgi
 SUBST_SED.prefix=	-e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g"
 SUBST_MESSAGE.prefix=	Fixing harcoded paths.
diff --git a/www/drupal8/Makefile b/www/drupal8/Makefile
index 08d2a0406dd..ba551568359 100644
--- a/www/drupal8/Makefile
+++ b/www/drupal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/06/22 12:59:08 wen Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	drupal-8.5.4
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME}
@@ -43,7 +43,7 @@ REPLACE_FILES.php+=	core/scripts/update-countries.sh
 REPLACE_FILES.php+=	core/scripts/rebuild_token_calculator.sh
 
 SUBST_CLASSES+=		sh
-SUBST_STAGE.sh=		post-patch
+SUBST_STAGE.sh=		pre-configure
 SUBST_MESSAGE.sh=	Fixing path to sh
 SUBST_FILES.sh+=	vendor/paragonie/random_compat/build-phar.sh
 SUBST_SED.sh=		-e "s|/usr/bin/env bash|${SH}|"
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index 5f5d5c64b52..c23941febf7 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:39:12 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:41 jperkin Exp $
 #
 
 DISTNAME=	gallery-1.5.10
@@ -40,7 +40,7 @@ FILES_SUBST+=	G1DIR=${G1DIR}
 SUBST_CLASSES+=	paths
 SUBST_FILES.paths=	${WRKDIR}/gallery.conf
 SUBST_VARS.paths+=	G1DIR
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS=	share/examples/gallery
 INSTALLATION_DIRS+=	share/gallery
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index bc99cb98bba..eaea6640bca 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/08/08 16:39:12 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:41 jperkin Exp $
 #
 
 DISTNAME=		gallery-2.3.2-full
@@ -58,7 +58,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/gallery2.conf
 SUBST_FILES.paths+=	${WRKDIR}/config.php
 SUBST_VARS.paths+=	G2DIR G2DATA
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 OWN_DIRS_PERMS+=	${G2DATA} ${APACHE_USER} ${APACHE_GROUP} 755
 
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 60da41bf189..4c85cea32cf 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2017/12/30 13:43:32 wen Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	mediawiki-${VER}.${PVER}
 CATEGORIES=	www
@@ -39,12 +39,12 @@ NO_BUILD=		YES
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing pathnames in configuration file.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	../mediawiki.conf
 SUBST_SED.paths=	-e "s,@MEDIAWIKI@,${MEDIAWIKI},g"
 
 SUBST_CLASSES+=		sh
-SUBST_STAGE.sh=		post-patch
+SUBST_STAGE.sh=		pre-configure
 SUBST_MESSAGE.sh=	Fixing path to sh
 SUBST_FILES.sh+=	maintenance/storage/make-blobs
 SUBST_FILES.sh+=	maintenance/dev/install.sh maintenance/dev/installphp.sh
@@ -53,27 +53,27 @@ SUBST_FILES.sh+=	includes/limit.sh
 SUBST_SED.sh=		-e "s|/bin/bash|${SH}|"
 
 SUBST_CLASSES+=		sh2
-SUBST_STAGE.sh2=	post-patch
+SUBST_STAGE.sh2=	pre-configure
 SUBST_MESSAGE.sh2=	Fixing path to sh
 SUBST_FILES.sh2+=	maintenance/mwjsduck-gen
 SUBST_FILES.sh2+=	docs/kss/scripts/kss-node-check.sh
 SUBST_SED.sh2=		-e "s|/usr/bin/env bash|${SH}|"
 
 SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_MESSAGE.perl=	Fixing path to perl
 SUBST_FILES.perl+=	maintenance/postgres/compare_schemas.pl
 SUBST_FILES.perl+=	maintenance/postgres/mediawiki_mysql2postgres.pl
 SUBST_SED.perl=		-e "s|/usr/bin/perl|${PERL5}|"
 
 SUBST_CLASSES+=		python
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_MESSAGE.python=	Fixing python path
 SUBST_FILES.python+=	extensions/ConfirmEdit/captcha.py
 SUBST_SED.python=	-e "s,/usr/bin/python,${PYTHONBIN},"
 
 SUBST_CLASSES+=		python2
-SUBST_STAGE.python2=	post-patch
+SUBST_STAGE.python2=	pre-configure
 SUBST_MESSAGE.python2=	Fixing python path
 SUBST_FILES.python2+=	maintenance/language/zhtable/Makefile.py
 SUBST_SED.python2=	-e "s,/usr/bin/env python,${PYTHONBIN},"
diff --git a/www/mono-xsp/Makefile b/www/mono-xsp/Makefile
index 84a3dc8cb4a..cb1cdd6dcfc 100644
--- a/www/mono-xsp/Makefile
+++ b/www/mono-xsp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2018/04/14 07:34:04 adam Exp $
+# $NetBSD: Makefile,v 1.44 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	xsp-3.8
 PKGNAME=	mono-${DISTNAME}
@@ -25,7 +25,7 @@ SUBST_SED.unwrap_mk=		-e 's,^MAKEINFO = .*,MAKEINFO = makeinfo,'
 SUBST_SED.unwrap_mk+=		-e 's,^PKG_CONFIG = .*,PKG_CONFIG = ${PREFIX}/bin/pkg-config,'
 
 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/www/moodle/Makefile b/www/moodle/Makefile
index 7323b4327c4..171af34846c 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2018/05/20 10:43:53 wen Exp $
+# $NetBSD: Makefile,v 1.64 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	moodle-3.5
 CATEGORIES=	www
@@ -56,7 +56,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST ${WRKDIR}/PLIST.AUTO
 
 SUBST_CLASSES+=		conf
 SUBST_MESSAGE.conf=	Fixing pathnames in configuration file.
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	../moodle.conf
 SUBST_SED.conf=		-e "s,@MOODLEDIR@,${MOODLEDIR},g"
 SUBST_SED.conf+=	-e "s,@MOODLEDATADIR@,${MOODLEDATADIR},g"
@@ -67,7 +67,7 @@ SUBST_SED.conf+=	-e "s,Allow from all,Require all granted,g"
 
 SUBST_CLASSES+=		php
 SUBST_MESSAGE.php=	Fixing the path of php.
-SUBST_STAGE.php=	post-patch
+SUBST_STAGE.php=	pre-configure
 SUBST_FILES.php=	admin/cli/mysql_engine.php admin/cli/maintenance.php admin/cli/cron.php
 SUBST_FILES.php+=	admin/cli/reset_password.php admin/cli/automated_backups.php
 SUBST_FILES.php+=	admin/cli/install.php admin/cli/install_database.php admin/cli/upgrade.php
@@ -78,7 +78,7 @@ SUBST_SED.php=		-e "s,/usr/bin/php,${PREFIX}/bin/php,g"
 
 SUBST_CLASSES+=		perl
 SUBST_MESSAGE.perl=	Fixing the path of perl.
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	filter/algebra/algebra2tex.pl
 SUBST_SED.perl=		-e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
 
diff --git a/www/nspluginwrapper/Makefile b/www/nspluginwrapper/Makefile
index d4a98a84ed0..37ed400dc02 100644
--- a/www/nspluginwrapper/Makefile
+++ b/www/nspluginwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2018/04/29 21:32:07 adam Exp $
+# $NetBSD: Makefile,v 1.63 2018/07/04 13:40:41 jperkin Exp $
 #
 
 DISTNAME=	nspluginwrapper-1.4.4
@@ -38,7 +38,7 @@ PLUGIN_SRCDIR=		${WRKDIR}/usr/${PLUGIN_SUBDIR}
 LDFLAGS.DragonFly=	-lgmodule-2.0
 
 SUBST_CLASSES+=		npw-config
-SUBST_STAGE.npw-config=	post-patch
+SUBST_STAGE.npw-config=	pre-configure
 SUBST_FILES.npw-config=	src/npw-config.c
 SUBST_SED.npw-config=	-e "s|/usr/pkg/|${PREFIX}/|g"
 
diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile
index 1e56ed2cfa9..7eeb666f2f6 100644
--- a/www/p5-Catalyst-Plugin-Session/Makefile
+++ b/www/p5-Catalyst-Plugin-Session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/06/16 09:48:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:41 jperkin Exp $
 
 DISTNAME=	Catalyst-Plugin-Session-0.40
 PKGNAME=	p5-${DISTNAME}
@@ -31,7 +31,7 @@ BUILD_DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
 
 SUBST_CLASSES+=		perl
 SUBST_MESSAGE.perl=	Fixing the path of perl.
-SUBST_STAGE.perl=	post-patch
+SUBST_STAGE.perl=	pre-configure
 SUBST_FILES.perl=	lib/Catalyst/Plugin/Session.pm lib/Catalyst/Plugin/Session/State.pm \
 			lib/Catalyst/Plugin/Session/Store.pm lib/Catalyst/Plugin/Session/Store/Dummy.pm \
 			lib/Catalyst/Plugin/Session/Test/Store.pm
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 1a22d3fd503..29c53c3a853 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/06/05 14:25:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	libapreq2-2.13
 PKGNAME=	p5-${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -18,7 +18,7 @@ USE_LIBTOOL=	YES
 PERL5_PACKLIST=	auto/libapreq2/.packlist
 
 SUBST_CLASSES+=		apxs
-SUBST_STAGE.apxs=	post-patch
+SUBST_STAGE.apxs=	pre-configure
 SUBST_FILES.apxs=	env/Makefile.in
 SUBST_SED.apxs=		-e "s|@APACHE2_APXS@ -i -a -n|@APACHE2_APXS@ -i -n|g"
 SUBST_MESSAGE.apxs=	Fixing module installation.
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index b362cb4bc86..5495a393dab 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2018/03/21 23:18:09 gdt Exp $
+# $NetBSD: Makefile,v 1.61 2018/07/04 13:40:42 jperkin Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -62,7 +62,7 @@ FILES_SUBST+=		PRIVOXY_USER=${PRIVOXY_USER:Q}
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	config
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 .include "options.mk"
 
diff --git a/www/shibboleth-sp/Makefile b/www/shibboleth-sp/Makefile
index 34d60d164ba..faea939eddf 100644
--- a/www/shibboleth-sp/Makefile
+++ b/www/shibboleth-sp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/04/29 21:32:08 adam Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:42 jperkin Exp $
 #
 
 DISTNAME=	shibboleth-sp-2.5.5
@@ -34,7 +34,7 @@ PLIST_SUBST+=	PKG_APACHE_NUM=${PKG_APACHE:S/apache//}
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKSRC}/configs/Makefile.in
 SUBST_FILES.paths+=	${WRKSRC}/configs/keygen.sh
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_SED.paths=	-e 's,@EGDIR@,${EGDIR},'
 SUBST_SED.paths+=	-e 's,@SHIB_CONFDIR@,${SHIB_CONFDIR},'
 
diff --git a/www/siege/Makefile b/www/siege/Makefile
index 16968dfd703..2d6648e05ba 100644
--- a/www/siege/Makefile
+++ b/www/siege/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/09/25 22:39:56 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/04 13:40:42 jperkin Exp $
 #
 
 DISTNAME=		siege-3.1.3
@@ -25,7 +25,7 @@ CONF_FILES=		${EGDIR}/urls.txt ${PKG_SYSCONFDIR}/urls.txt
 CONF_FILES+=		${EGDIR}/siegerc ${PKG_SYSCONFDIR}/siegerc
 
 SUBST_CLASSES+=		siege
-SUBST_STAGE.siege=	post-patch
+SUBST_STAGE.siege=	pre-configure
 SUBST_FILES.siege=	doc/Makefile.am doc/Makefile.in
 SUBST_SED.siege+=	-e "s|@EGDIR@|${EGDIR}|g"
 
diff --git a/www/squidview/Makefile b/www/squidview/Makefile
index 733b90d8955..b6c90d04b91 100644
--- a/www/squidview/Makefile
+++ b/www/squidview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/12/23 22:30:50 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	squidview-0.80
 PKGREVISION=	3
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 .include "../../www/squid3/Makefile.common"
 
 SUBST_CLASSES+=	files
-SUBST_STAGE.files=	post-patch
+SUBST_STAGE.files=	pre-configure
 SUBST_FILES.files=	squidview.h squidview.1
 SUBST_SED.files=	-e "s|/var/log/squid|${LOGDIR}|g"
 SUBST_MESSAGE.files=	Fixing logfile location.
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 2c216eb52a5..9e34e7b56a5 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/10/09 14:07:12 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	swiggle-0.4
 PKGREVISION=	3
@@ -10,7 +10,7 @@ HOMEPAGE=	http://homepage.univie.ac.at/l.ertl/swiggle/
 COMMENT=	Lightweight image gallery generator
 
 SUBST_CLASSES+=		mf
-SUBST_STAGE.mf=		post-patch
+SUBST_STAGE.mf=		pre-configure
 SUBST_FILES.mf=		Makefile
 SUBST_SED.mf=		-e "s/gcc/${CC}/"
 SUBST_SED.mf+=		-e "s/-O3//"
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 30909e76bb4..4d7cd8a5078 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2018/05/07 07:01:37 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	thttpd-2.28
 CATEGORIES=	www
@@ -34,7 +34,7 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man1 share/thttpd ${EGDIR}
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	thttpd.conf
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 MAKE_JOBS_SAFE=	no
 
diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile
index f10135f1327..1101ab1c5ce 100644
--- a/www/viewvc/Makefile
+++ b/www/viewvc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2018/07/03 05:03:41 adam Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	viewvc-1.1.26
 CATEGORIES=	devel www
@@ -32,7 +32,7 @@ CONF_FILES+=	${PREFIX}/share/examples/viewvc/cvsgraph.conf \
 .include "options.mk"
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_MESSAGE.conf=	Fixing configuration files.
 SUBST_FILES.conf=	conf/viewvc.conf.dist
 SUBST_FILES.conf+=	conf/cvsgraph.conf.dist
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 3d30073ffc5..8bbc4512d9d 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2016/02/26 10:57:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=	w3c-httpd-3.0A
 PKGREVISION=	1
@@ -30,7 +30,7 @@ CPPFLAGS.Darwin+=	-Dunix
 CFLAGS+=	${CPPFLAGS}
 
 SUBST_CLASSES+=		strcasestr
-SUBST_STAGE.strcasestr=	post-patch
+SUBST_STAGE.strcasestr=	pre-configure
 SUBST_FILES.strcasestr=	Daemon/Implementation/HTWild.c \
 	Library/Implementation/HTString.c \
 	Library/Implementation/HTString.h \
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 1e7043f4ced..fc3dea99083 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.66 2018/05/14 14:40:17 leot Exp $
+# $NetBSD: Makefile.common,v 1.67 2018/07/04 13:40:42 jperkin Exp $
 #
 # used by www/w3m/Makefile
 # used by www/w3m-img/Makefile
@@ -57,13 +57,13 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 SUBST_CLASSES+=		man-ja
 SUBST_MESSAGE.man-ja=	Fixing the path to Japanese manual pages.
-SUBST_STAGE.man-ja=	post-patch
+SUBST_STAGE.man-ja=	pre-configure
 SUBST_FILES.man-ja=	Makefile.in config.h.dist
 SUBST_SED.man-ja=	-e 's|/ja/|/ja_JP.eucJP/|g'
 
 SUBST_CLASSES+=		fh
 SUBST_MESSAGE.fh=	Rename file_handle.
-SUBST_STAGE.fh=		post-patch
+SUBST_STAGE.fh=		pre-configure
 SUBST_FILES.fh=		istream.*
 SUBST_SED.fh=		-e 's/file_handle/file_handle_rofl/g'
 
diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index a37da1e2dde..2a4bd5c7041 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/07/09 06:39:15 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/04 13:40:42 jperkin Exp $
 #
 
 DISTNAME=	validate-1.2.2
@@ -25,7 +25,7 @@ NO_BUILD=	YES
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	validate
 SUBST_SED.paths=	-e 's,/usr/local/share,${PREFIX}/share,g'
 SUBST_SED.paths+=	-e 's,/usr/local/bin/lq-nsgmls,${LOCALBASE}/bin/lq-nsgmls,g'
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 909708885a4..78878c4ddb9 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2018/05/18 14:22:40 jklos Exp $
+# $NetBSD: Makefile,v 1.79 2018/07/04 13:40:42 jperkin Exp $
 
 DISTNAME=		wordpress-${VERSION}
 VERSION=		4.9.6
@@ -45,7 +45,7 @@ DEPENDS+=		${PHP_PKG_PREFIX}-zlib>=5.6.0:../../archivers/php-zlib
 
 SUBST_CLASSES+=		conf
 SUBST_MESSAGE.conf=	Fixing pathnames in configuration file.
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	../wordpress.conf
 SUBST_SED.conf=		-e "s,@WPHOME@,${WPHOME},g"
 .if !empty(PKG_OPTIONS:Map-php) && ${PKG_APACHE} == "apache24"
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index d0000645cbe..2edebed2bcc 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/12/29 13:41:58 bsiegert Exp $
+# $NetBSD: Makefile,v 1.39 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=		xaos-3.6
@@ -18,7 +18,7 @@ INFO_FILES=		yes
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	configure
 SUBST_SED.paths=	-e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g'
 
diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 1caac94c93b..65623b92f88 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/01/02 21:11:10 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=	xbae-4.51.01
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--with-motif-libraries=${MOTIFBASE}/lib
 INSTALLATION_DIRS=	share/aclocal
 
 SUBST_CLASSES+=		dirs
-SUBST_STAGE.dirs=	post-patch
+SUBST_STAGE.dirs=	pre-configure
 SUBST_FILES.dirs=	Makefile.in doc/Makefile.in doc/images/Makefile.in src/Makefile.in
 SUBST_SED.dirs=		-e '/^mandir =/         s,=.*,= @mandir@,'
 SUBST_SED.dirs+=	-e '/^SUBDIRS =/        s,examples,,'
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index 212fcc17eca..8643d96e392 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/07/03 05:03:42 adam Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:43 jperkin Exp $
 
 DISTNAME=	avant-window-navigator-0.4.0
 PKGREVISION=	29
@@ -26,13 +26,13 @@ GCONF_SCHEMAS+=		avant-window-navigator.schemas
 GCONF_SCHEMAS+=		awn-applet-taskmanager.schemas
 
 SUBST_CLASSES+=		python
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_MESSAGE.python=	Fixing python path
 SUBST_FILES.python=	applet-activation/main.c
 SUBST_SED.python=	-e "s,@PYTHONBIN@,${PYTHONBIN},"
 
 SUBST_CLASSES+=		pathfix
-SUBST_STAGE.pathfix=	post-patch
+SUBST_STAGE.pathfix=	pre-configure
 SUBST_MESSAGE.pathfix=	Fixing hardcoded paths
 SUBST_FILES.pathfix=	applets/taskmanager/awn-applet-taskmanager.schema-ini.in
 SUBST_FILES.pathfix+=	doc/reference/html/*.html
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 94ff393a85e..0cd5721b4a2 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.189 2018/04/16 14:35:20 wiz Exp $
+# $NetBSD: Makefile,v 1.190 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=	gdm-2.20.11
@@ -83,7 +83,7 @@ SUBST_SED.desktop+=	-e 's|^PreFetchProgram=.*$$|PreFetchProgram=${PREFIX}/libexe
 
 SUBST_CLASSES+=		gdmsetup
 SUBST_MESSAGE.gdmsetup=	Patching gdmsetup theme installer to use ${REAL_ROOT_USER}:${REAL_ROOT_GROUP}
-SUBST_STAGE.gdmsetup=	post-patch
+SUBST_STAGE.gdmsetup=	pre-configure
 SUBST_FILES.gdmsetup=	gui/gdmsetup.c
 SUBST_SED.gdmsetup=	-e 's/root:root/${REAL_ROOT_USER}:${REAL_ROOT_GROUP}/g'
 
diff --git a/x11/gnome-desktop-sharp/Makefile b/x11/gnome-desktop-sharp/Makefile
index 980de97c71c..f3b9be17716 100644
--- a/x11/gnome-desktop-sharp/Makefile
+++ b/x11/gnome-desktop-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2018/04/17 22:29:34 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=	gnome-desktop-sharp-2.26.0
@@ -26,7 +26,7 @@ PKGCONFIG_OVERRIDE+=	vte/vte-sharp-0.16.pc.in
 PKGCONFIG_OVERRIDE+=	wnck/wnck-sharp-1.0.pc.in
 
 SUBST_CLASSES=		pc
-SUBST_STAGE.pc=		post-patch
+SUBST_STAGE.pc=		pre-configure
 SUBST_FILES.pc=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.pc=		-e "s|\$${pcfiledir}/../..|@prefix@|g"
 SUBST_MESSAGE.pc=	Fixing hardcoded paths.
diff --git a/x11/gnome-sharp/Makefile b/x11/gnome-sharp/Makefile
index d8530a38df2..e1de4881940 100644
--- a/x11/gnome-sharp/Makefile
+++ b/x11/gnome-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2018/04/16 14:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=	gnome-sharp-2.24.2
@@ -33,7 +33,7 @@ PKGCONFIG_OVERRIDE+=	gnome/gnome-sharp-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gnomevfs/gnome-vfs-sharp-2.0.pc.in
 
 SUBST_CLASSES=		pc
-SUBST_STAGE.pc=		post-patch
+SUBST_STAGE.pc=		pre-configure
 SUBST_FILES.pc=		${PKGCONFIG_OVERRIDE}
 SUBST_SED.pc=		-e "s|\$${pcfiledir}/../..|@prefix@|g"
 SUBST_MESSAGE.pc=	Fixing hardcoded paths.
diff --git a/x11/gtk-sharp/Makefile b/x11/gtk-sharp/Makefile
index d1ecf0b2491..2d894be74e3 100644
--- a/x11/gtk-sharp/Makefile
+++ b/x11/gtk-sharp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2018/04/16 14:35:21 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2018/07/04 13:40:43 jperkin Exp $
 #
 
 DISTNAME=		gtk-sharp-2.12.26
@@ -29,7 +29,7 @@ PKGCONFIG_OVERRIDE+=	glade/glade-sharp-2.0.pc.in
 
 SUBST_CLASSES+=		relprefix
 SUBST_MESSAGE.relprefix=Replacing relative prefix in pkg-config files.
-SUBST_STAGE.relprefix=	post-patch
+SUBST_STAGE.relprefix=	pre-configure
 SUBST_FILES.relprefix=	${PKGCONFIG_OVERRIDE}
 SUBST_SED.relprefix=	-e 's|$${pcfiledir}/../..|@prefix@|g'
 
diff --git a/x11/gtkada/Makefile b/x11/gtkada/Makefile
index 4a9ab8e369a..9a6a5a5ee76 100644
--- a/x11/gtkada/Makefile
+++ b/x11/gtkada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/04/16 14:33:59 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:43 jperkin Exp $
 
 DISTNAME=	gtkada-${GTKADA_VERSION}
 PKGREVISION=	16
@@ -26,13 +26,13 @@ CONFIGURE_ARGS+=	--enable-nls \
 MAKE_ENV+=		PROCESSORS=${MAKE_JOBS}
 
 SUBST_CLASSES+=		docs lgnat sphinx
-SUBST_STAGE.docs=	post-patch
+SUBST_STAGE.docs=	pre-configure
 SUBST_FILES.docs=	Makefile.in
 SUBST_SED.docs=		-e 's/^all: \(.*\)/all: \1 docs/g'
-SUBST_STAGE.lgnat=	post-patch
+SUBST_STAGE.lgnat=	pre-configure
 SUBST_FILES.lgnat=	src/tools/Makefile.in testgtk/Makefile.in
 SUBST_SED.lgnat=	-e 's|-largs|-largs -lgnat|'
-SUBST_STAGE.sphinx=	post-patch
+SUBST_STAGE.sphinx=	pre-configure
 SUBST_FILES.sphinx=	docs/gtkada_ug/Makefile
 SUBST_SED.sphinx=	-e 's|sphinx-build|${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}|'
 
diff --git a/x11/hyena/Makefile b/x11/hyena/Makefile
index 095c5912201..0c82f0ef76c 100644
--- a/x11/hyena/Makefile
+++ b/x11/hyena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/04/14 07:34:45 adam Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:43 jperkin Exp $
 
 DISTNAME=	hyena-0.5
 PKGREVISION=	11
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	build/pkg-config/hyena.gui.pc.in
 PKGCONFIG_OVERRIDE+=	build/pkg-config/hyena.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/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index a79bff06285..b8a2b4fd8c7 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2018/04/29 21:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.88 2018/07/04 13:40:43 jperkin Exp $
 
 DISTNAME=	kde-runtime-15.12.0
 PKGNAME=	${DISTNAME:S/-1/4-1/}
@@ -44,7 +44,7 @@ PLIST.x11=	yes
 .endif
 
 SUBST_CLASSES+=		htdig
-SUBST_STAGE.htdig=	post-patch
+SUBST_STAGE.htdig=	pre-configure
 SUBST_MESSAGE.htdig=	Fix htdig paths.
 SUBST_FILES.htdig=	khelpcenter/searchhandlers/khc_htsearch.pl
 SUBST_SED.htdig=	-e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
@@ -52,7 +52,7 @@ SUBST_SED.htdig=	-e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kioslave/info/kde-info2html.conf
 SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 REPLACE_PERL+= \
 	khelpcenter/searchhandlers/khc_docbookdig.pl.cmake \
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index 84af6c1abfe..8713cf8e93f 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2018/04/29 21:31:25 adam Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:43 jperkin Exp $
 
 DISTNAME=	kde-workspace-4.11.22
 PKGNAME=	${DISTNAME:S/-4/4-4/}
@@ -87,17 +87,17 @@ CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.powerdevil.backlighthel
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	kdm/kcm/main.cpp
 SUBST_SED.paths=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 SUBST_CLASSES+=		qtpath
 SUBST_FILES.qtpath=	startkde.cmake
 SUBST_VARS.qtpath=	QTDIR
-SUBST_STAGE.qtpath=	post-patch
+SUBST_STAGE.qtpath=	pre-configure
 
 SUBST_CLASSES+=		isocodes
 SUBST_FILES.isocodes=	kcontrol/keyboard/iso_codes.h
 SUBST_SED.isocodes=	-e 's,/usr/share/xml/iso-codes,${BUILDLINK_PREFIX.iso-codes}/share/xml/iso-codes,g'
-SUBST_STAGE.isocodes=	post-patch
+SUBST_STAGE.isocodes=	pre-configure
 
 ICONDIR=		share/icons
 
diff --git a/x11/lxsession/Makefile b/x11/lxsession/Makefile
index fa4816b5bd8..c9ce7fcb365 100644
--- a/x11/lxsession/Makefile
+++ b/x11/lxsession/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/05/22 16:07:01 youri Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	lxsession-0.5.3
 CATEGORIES=	x11
@@ -23,7 +23,7 @@ CONF_FILES+=	${LXDE_CONF}/lxpolkit.desktop \
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fixing paths.
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	lxsession/environement.c
 SUBST_FILES.prefix+=	lxsession/app.c
 SUBST_FILES.prefix+=	lxsession/settings.c
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile
index 9463e78c9aa..d5b6af2dece 100644
--- a/x11/ocaml-graphics/Makefile
+++ b/x11/ocaml-graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/04/13 13:55:29 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:44 jperkin Exp $
 
 .include "../../lang/ocaml/Makefile.common"
 DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo
@@ -43,19 +43,19 @@ PLIST_SRC+=	${PKGDIR}/PLIST.stub
 BUILDLINK_DEPMETHOD.ocaml=	full
 
 SUBST_CLASSES+=		depend
-SUBST_STAGE.depend=	post-patch
+SUBST_STAGE.depend=	pre-configure
 SUBST_FILES.depend=	otherlibs/graph/.depend
 SUBST_SED.depend=	-e 's,/usr/X11R6,${X11BASE},g'
 SUBST_MESSAGE.depend=	Fixing .depend in otherlibs/graph.
 
 SUBST_CLASSES+=		mklib
-SUBST_STAGE.mklib=	post-patch
+SUBST_STAGE.mklib=	pre-configure
 SUBST_FILES.mklib=	otherlibs/Makefile.shared
 SUBST_SED.mklib=	-e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
 SUBST_MESSAGE.mklib=	Fixing MKLIB in otherlibs/Makefile.shared.
 
 SUBST_CLASSES+=		comp
-SUBST_STAGE.comp=	post-patch
+SUBST_STAGE.comp=	pre-configure
 SUBST_FILES.comp=	otherlibs/Makefile
 SUBST_SED.comp=		-e 's,^CAMLC=.*,CAMLC=ocamlc,g'
 SUBST_SED.comp+=	-e '/^CAMLOPT=/{;N;s,^CAMLOPT=.*,CAMLOPT=ocamlopt,g;}'
@@ -63,7 +63,7 @@ SUBST_SED.comp+=	-e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
 SUBST_MESSAGE.comp=	Fixing CAMLC OCAMLOPT MKLIB in otherlibs/Makefile.
 
 SUBST_CLASSES+=		comp2
-SUBST_STAGE.comp2=	post-patch
+SUBST_STAGE.comp2=	pre-configure
 SUBST_FILES.comp2=	otherlibs/graph/Makefile
 SUBST_SED.comp2=	-e 's,..CAMLRUN..*ocamldep,ocamldep,g'
 SUBST_MESSAGE.comp2=	Fixing ocamldep in otherlibs/graph/Makefile.
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index 5ab274cd9b6..8f2ee66b681 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2017/09/04 12:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	Tk-804.034
 PKGNAME=	p5-${DISTNAME}
@@ -25,7 +25,7 @@ REPLACE_PERL+=		pTk/mkVFunc
 REPLACE_PERL+=		demos/widget
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	PNG/Makefile.PL
 SUBST_SED.prefix=	-e 's,%%LOCALBASE%%,${LOCALBASE},g'
 
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile
index 575e72a3bb5..c6845d52a23 100644
--- a/x11/pixman/Makefile
+++ b/x11/pixman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2016/12/01 15:47:24 marino Exp $
+# $NetBSD: Makefile,v 1.66 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	pixman-0.34.0
 PKGREVISION=	1
@@ -23,7 +23,7 @@ PKGCONFIG_OVERRIDE+=	pixman-1.pc.in
 PKGCONFIG_OVERRIDE+=	pixman-1-uninstalled.pc.in
 
 SUBST_CLASSES=		subdirs
-SUBST_STAGE.subdirs=	post-patch
+SUBST_STAGE.subdirs=	pre-configure
 SUBST_FILES.subdirs=	Makefile.in
 SUBST_SED.subdirs=	-e "s|pixman demos test|pixman|"
 SUBST_MESSAGE.lbase=	Skip building demos and test SUBDIRS
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 32637c7a743..25accf5eac3 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/06/23 11:23:46 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	PyQt5_gpl-5.10.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/PyQt5_gpl/qt5/}
@@ -27,7 +27,7 @@ PLIST_VARS+=		webkit
 PY_PATCHPLIST=		yes
 
 SUBST_CLASSES+=		x11lib
-SUBST_STAGE.x11lib=	post-patch
+SUBST_STAGE.x11lib=	pre-configure
 SUBST_MESSAGE.x11lib=	Fixing rpath for X11 and pulseaudio libraries.
 SUBST_FILES.x11lib+=	configure.py
 SUBST_FILES.x11lib+=	designer/designer.pro-in
diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index a1f486c169e..efe83a81f8d 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2018/07/03 05:03:44 adam Exp $
+# $NetBSD: Makefile,v 1.54 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	rox-session-0.28
 PKGREVISION=	33
@@ -24,13 +24,13 @@ INSTALLATION_DIRS=	share/rox/ROX-Session
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	Login
 SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile
index b913da8fece..5b3efd3948f 100644
--- a/x11/rox-wallpaper/Makefile
+++ b/x11/rox-wallpaper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:50 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:44 jperkin Exp $
 #
 
 DISTNAME=	wallpaper-2.0
@@ -25,7 +25,7 @@ INSTALLATION_DIRS=	share/rox/Wallpaper
 
 SUBST_CLASSES+=		lib
 SUBST_MESSAGE.lib=	Fixing hardcoded paths for ROX-Lib.
-SUBST_STAGE.lib=	post-patch
+SUBST_STAGE.lib=	pre-configure
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
diff --git a/x11/xf86-input-joystick/Makefile b/x11/xf86-input-joystick/Makefile
index b7a4280015a..327ef809bef 100644
--- a/x11/xf86-input-joystick/Makefile
+++ b/x11/xf86-input-joystick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:41 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=	xf86-input-joystick-1.6.3
 PKGREVISION=	2
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=	xorg-joystick.pc.in
 CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
 SUBST_CLASSES.DragonFly+=	usbhid
-SUBST_STAGE.usbhid=		post-patch
+SUBST_STAGE.usbhid=		pre-configure
 SUBST_FILES.usbhid=		configure
 SUBST_FILES.usbhid+=		src/backend_bsd.c
 SUBST_SED.usbhid=		-e 's,dev/usb/,bus/u4b/,g'
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index cd26636de4e..676fa92f0a7 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/03/07 11:57:46 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=		xfstt-1.9.3
 PKGREVISION=		1
@@ -32,7 +32,7 @@ INSTALLATION_DIRS=	bin			\
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	doc/FAQ
 SUBST_SED.paths=	-e 's,/usr,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xfstt ${DESTDIR}${PREFIX}/bin
diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 51d25194bc0..0e58669c2ce 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:44 jperkin Exp $
 
 DISTNAME=		xorg-cf-files-1.0.6
 PKGREVISION=		5
@@ -22,7 +22,7 @@ DARWIN_USE_QUARTZ?=	1
 DEPENDS+=		byacc-[0-9]*:../../devel/byacc
 DEPENDS+=		flex-[0-9]*:../../devel/flex
 SUBST_CLASSES+=		fixpaths
-SUBST_STAGE.fixpaths=	post-patch
+SUBST_STAGE.fixpaths=	pre-configure
 SUBST_MESSAGE.fixpaths=	Fixing compiler tool paths
 SUBST_FILES.fixpaths=	svr4.cf
 SUBST_SED.fixpaths+=	-e 's,/usr/ccs/bin/ar,/usr/bin/ar,g'
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 5bcd2fc4a2f..2735474d1aa 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2017/09/06 09:03:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29 2018/07/04 13:40:44 jperkin Exp $
 #
 # used by x11/xmms-osd/Makefile
 
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 SHLIBTOOL_OVERRIDE=	libtool-disable-static
 
 SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
+SUBST_STAGE.fixme=	pre-configure
 SUBST_FILES.fixme=	configure
 SUBST_SED.fixme=	-e "s|-lpthread|"${PTHREAD_LIBS:M*:Q}"|g"
author	jperkin <jperkin@pkgsrc.org>	2018-07-04 13:40:07 +0000
committer	jperkin <jperkin@pkgsrc.org>	2018-07-04 13:40:07 +0000
commit	3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch)
tree	4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6
parent	063580a062ba10ffba035c8d96b541b5ce7a426d (diff)
download	pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz