*: 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/ham/chirp/Makefile b/ham/chirp/Makefile
index 3e41a707765..18e3887ac14 100644
--- a/ham/chirp/Makefile
+++ b/ham/chirp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/16 14:34:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	chirp-0.4.1
 PKGREVISION=	6
@@ -18,13 +18,13 @@ DEPENDS+=       ${PYPKGPREFIX}-serial>=2.7:../../comms/py-serial
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=			fix-manpaths
-SUBST_STAGE.fix-manpaths=	post-patch
+SUBST_STAGE.fix-manpaths=	pre-configure
 SUBST_MESSAGE.fix-manpaths=	Fixing man paths
 SUBST_FILES.fix-manpaths=	setup.py
 SUBST_SED.fix-manpaths=		-e 's,share/man/man1,${PKGMANDIR}/man1,g'
 
 SUBST_CLASSES+=			fix-sharepaths
-SUBST_STAGE.fix-sharepaths=	post-patch
+SUBST_STAGE.fix-sharepaths=	pre-configure
 SUBST_MESSAGE.fix-sharepaths=	Fixing /usr/share paths
 SUBST_FILES.fix-sharepaths=	chirpw
 SUBST_FILES.fix-sharepaths+=	chirp/generic_xml.py
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index c8197bf82ff..11e781aa963 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2018/04/29 21:31:46 adam Exp $
+# $NetBSD: Makefile,v 1.103 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	fldigi-4.0.16
 PKGREVISION=	2
@@ -26,7 +26,7 @@ SUBST_MESSAGE.asciidoc=	Replacing asciidoc PATH
 SUBST_SED.asciidoc=	-e s\|/usr/share\|${PREFIX}/share\|g
 
 SUBST_CLASSES+=		brag-os
-SUBST_STAGE.brag-os=	post-patch
+SUBST_STAGE.brag-os=	pre-configure
 SUBST_FILES.brag-os=	src/misc/newinstall.cxx
 SUBST_MESSAGE.brag-os=	Show OS name correctly with Brag button
 SUBST_SED.brag-os=	-e s/@@OS@@/${OPSYS}/
diff --git a/ham/gnuradio-core/Makefile.common b/ham/gnuradio-core/Makefile.common
index 740a83dd534..0525de7ea48 100644
--- a/ham/gnuradio-core/Makefile.common
+++ b/ham/gnuradio-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2018/07/03 05:03:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2018/07/04 13:40:21 jperkin Exp $
 # This Makefile fragment is included in the package Makefiles for
 # GNU Radio distributed packages (they all share common configure and build
 # settings).
@@ -107,7 +107,7 @@ SUBST_MESSAGE.alsa=	Arrange the patched line depepending on alsa is in PKG_OPTIO
 SUBST_FILES.alsa+=	gr-audio/lib/CMakeLists.txt
 ## The value of ${ALSA_ENABLED} is either '#' or '' by options.mk.
 SUBST_SED.alsa=		-e 's,@@ALSA@@,${ALSA_ENABLED},'
-SUBST_STAGE.alsa=	post-patch
+SUBST_STAGE.alsa=	pre-configure
 
 SUBST_CLASSES+=		pyvers
 SUBST_FILES.pyvers=	cmake/Modules/FindSphinx.cmake
diff --git a/ham/trustedQSL/Makefile b/ham/trustedQSL/Makefile
index d5f7e6e5a7b..157ab237bc4 100644
--- a/ham/trustedQSL/Makefile
+++ b/ham/trustedQSL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/04/29 21:31:48 adam Exp $
+# $NetBSD: Makefile,v 1.32 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=		tqsl-2.3.1
 PKGREVISION=		1
@@ -27,7 +27,7 @@ USE_CMAKE=		yes
 # remove the string $(LIB_SUFFIX), tested with NetBSD at least
 SUBST_CLASSES+=		lib-suffix
 SUBST_MESSAGE.lib-suffix= Removing $$(LIB_SUFFIX) from src/CMakeLists.txt
-SUBST_STAGE.lib-suffix= post-patch
+SUBST_STAGE.lib-suffix= pre-configure
 SUBST_FILES.lib-suffix= src/CMakeLists.txt
 SUBST_SED.lib-suffix= 	-e s/\$$\(LIB_SUFFIX\)//