*: 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, 11 insertions, 11 deletions

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