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

5 files changed, 10 insertions, 10 deletions

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: