*: 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/cad/klayout/Makefile b/cad/klayout/Makefile
index bae2c2c3c46..537c65877ba 100644
--- a/cad/klayout/Makefile
+++ b/cad/klayout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/03/12 11:16:08 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $
 
 DISTNAME=	klayout-0.24.10
 PKGREVISION=	1
@@ -19,7 +19,7 @@ NO_CONFIGURE=	yes
 SUBST_CLASSES+= 	rpath
 SUBST_MESSAGE.rpath=	Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file
 SUBST_FILES.rpath+=	config/Makefile.conf.netbsd-32-gcc-release
-SUBST_STAGE.rpath=	post-patch
+SUBST_STAGE.rpath=	pre-configure
 SUBST_VARS.rpath=	COMPILER_RPATH_FLAG PREFIX
 SUBST_SED.rpath=	-e 's|@@LDFLAGS@@|${LDFLAGS}|'
 
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index f7847430208..66af154ed83 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/08 13:25:14 asau Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $
 #
 
 .include "../../cad/wcalc/Makefile.common"
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--without-octave
 CONFIGURE_ARGS+=	--without-scilab
 
 SUBST_CLASSES+=		mwc
-SUBST_STAGE.mwc=	post-patch
+SUBST_STAGE.mwc=	pre-configure
 SUBST_FILES.mwc=	mex-wcalc/mexopts.sh.in
 SUBST_SED.mwc=		-e 's;\.\./libwcalc;${BUILDLINK_DIR}/lib;g'
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 578c45d4ba6..1a2c4e6a634 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/03/24 17:11:57 joerg Exp $
+# $NetBSD: Makefile,v 1.71 2018/07/04 13:40:10 jperkin Exp $
 #
 
 DISTNAME=		qcad-3.19.1.0
@@ -23,7 +23,7 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Attending to hard-coded paths.
 SUBST_FILES.paths+=	shared.pri src/core/RS.cpp src/core/RSettings.cpp
 SUBST_FILES.paths+=	scripts/Help/ShowReadme/ShowReadme.js
diff --git a/cad/solvespace/Makefile b/cad/solvespace/Makefile
index 9c2d8be255d..fc6e41a0fd0 100644
--- a/cad/solvespace/Makefile
+++ b/cad/solvespace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/04/16 14:34:12 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/07/04 13:40:10 jperkin Exp $
 #
 #
 # Both of these hashes need to be updated when the solvespace version
@@ -38,13 +38,13 @@ USE_CMAKE=		yes
 CMAKE_ARGS+=		-DGIT_COMMIT_HASH=${SOLVESPACE_HASH}
 
 SUBST_CLASSES+=		desktop
-SUBST_STAGE.desktop=	post-patch
+SUBST_STAGE.desktop=	pre-configure
 SUBST_MESSAGE.desktop=	Fixing absolute path in desktop file
 SUBST_FILES.desktop=	src/unix/solvespace.desktop
 SUBST_SED.desktop=	-e "s,/usr/bin,${PREFIX}/bin,"
 
 SUBST_CLASSES+=		libdxfrw
-SUBST_STAGE.libdxfrw=	post-patch
+SUBST_STAGE.libdxfrw=	pre-configure
 SUBST_MESSAGE.libdxfrw=	Set libdxfrw directory
 SUBST_FILES.libdxfrw=	CMakeLists.txt
 SUBST_SED.libdxfrw=	-e "s,extlib/libdxfrw,extlib/libdxfrw-${LIBDXF_HASH},"