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

6 files changed, 15 insertions, 15 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,'