*: 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.

8 files changed, 19 insertions, 19 deletions

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