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

4 files changed, 9 insertions, 9 deletions

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/