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

9 files changed, 18 insertions, 18 deletions

diff --git a/comms/asterisk/options.mk b/comms/asterisk/options.mk
index d8c2620ed34..7b9bd65c349 100644
--- a/comms/asterisk/options.mk
+++ b/comms/asterisk/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/10/27 08:49:01 jnemeth Exp $
+# $NetBSD: options.mk,v 1.9 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk13/options.mk b/comms/asterisk13/options.mk
index f72d51ad596..fcd716bb551 100644
--- a/comms/asterisk13/options.mk
+++ b/comms/asterisk13/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+# $NetBSD: options.mk,v 1.3 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk14/options.mk b/comms/asterisk14/options.mk
index 13e1fcc82a5..8a15366a48e 100644
--- a/comms/asterisk14/options.mk
+++ b/comms/asterisk14/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2016/10/25 08:17:03 jnemeth Exp $
+# $NetBSD: options.mk,v 1.2 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index 7e30bf111f7..81ba0a86a52 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2015/01/29 21:48:07 jnemeth Exp $
+# $NetBSD: options.mk,v 1.13 2018/07/04 13:40:11 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.asterisk
 PKG_SUPPORTED_OPTIONS=		zaptel x11 unixodbc ilbc webvmail ldap spandsp
@@ -78,7 +78,7 @@ post-configure:
 .if !empty(PKG_OPTIONS:Mwebvmail)
 DEPENDS+=		p5-DBI-[0-9]*:../../databases/p5-DBI
 SUBST_CLASSES+=		webvmail
-SUBST_STAGE.webvmail=	post-patch
+SUBST_STAGE.webvmail=	pre-configure
 SUBST_FILES.webvmail=	contrib/scripts/vmail.cgi
 SUBST_SED.webvmail+=	-e 's|@ASTETCDIR@|${ASTETCDIR}|'
 SUBST_SED.webvmail+=	-e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 16a70427f6f..8afa6e7c5e9 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/09/11 15:21:27 hauke Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:11 jperkin Exp $
 #
 
 DISTNAME=	conserver-7.2.7
@@ -39,7 +39,7 @@ CONF_FILES+=	${EGDIR}/conserver.passwd.example ${PKG_SYSCONFDIR}/conserver.passw
 OWN_DIRS=	${VARBASE}/consoles
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	conserver.cf/conserver.cf
 SUBST_SED.conf=		-e s,/var/consoles,${VARBASE}/consoles,
 
diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile
index 13404d92105..5bd82f5db51 100644
--- a/comms/conserver8/Makefile
+++ b/comms/conserver8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/02/10 10:38:42 he Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:12 jperkin Exp $
 #
 
 PKGVER=		8.2.1
@@ -41,7 +41,7 @@ CONF_FILES+=	${EGDIR}/conserver.passwd ${PKG_SYSCONFDIR}/conserver.passwd
 OWN_DIRS=	${VARBASE}/consoles
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	conserver.cf/conserver.cf
 SUBST_SED.conf=		-e "s,/var/consoles,${VARBASE}/consoles,"
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 8ef1127f791..fa15a42075c 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2017/04/18 13:30:57 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2018/07/04 13:40:12 jperkin Exp $
 
 DISTNAME=	minicom-2.7.1
 CATEGORIES=	comms
@@ -24,7 +24,7 @@ EGDIR=			${PREFIX}/share/examples/minicom
 
 SUBST_CLASSES+=		minicom
 SUBST_MESSAGE.minicom=	Fixing hardcoded paths.
-SUBST_STAGE.minicom=	post-patch
+SUBST_STAGE.minicom=	pre-configure
 SUBST_FILES.minicom=	src/rwconf.c
 SUBST_VARS.minicom=	PREFIX
 
diff --git a/comms/op_panel/Makefile b/comms/op_panel/Makefile
index 88d584152df..9c258879116 100644
--- a/comms/op_panel/Makefile
+++ b/comms/op_panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:12 jperkin Exp $
 #
 
 DISTNAME=	op_panel-0.29
@@ -54,7 +54,7 @@ SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SMDIR@,${SMDIR},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=	-e 's,@PERL5@,${PERL5},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	share/examples/${FOP}
 INSTALLATION_DIRS+=	share/${FOP}
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index e7c80fface0..d46d3194abf 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/06/05 14:22:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:12 jperkin Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -40,7 +40,7 @@ BUILD_DIRS+=		src
 BUILD_DIRS+=		${INSTALL_DIRS}
 
 SUBST_CLASSES+=		progs
-SUBST_STAGE.progs=	post-patch
+SUBST_STAGE.progs=	pre-configure
 SUBST_MESSAGE.progs=	Trim programs to build
 SUBST_FILES.progs=	src/Makefile.in
 SUBST_SED.progs=	-e s:@ENABLE_CONDUITS_TRUE@bin_PROGRAMS:@ENABLE_CONDUITS_TRUE@bin_PROGRAMSX: