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

10 files changed, 21 insertions, 21 deletions

diff --git a/graphics/asymptote/Makefile b/graphics/asymptote/Makefile
index de5ba9bb296..8fcf194e503 100644
--- a/graphics/asymptote/Makefile
+++ b/graphics/asymptote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/06/08 08:47:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	asymptote-2.41
 CATEGORIES=	graphics
@@ -38,7 +38,7 @@ CFLAGS+=		-DGC_NO_THREAD_REDIRECTS
 REPLACE_PYTHON+=	GUI/*.py
 
 SUBST_CLASSES+=		python
-SUBST_STAGE.python=	post-patch
+SUBST_STAGE.python=	pre-configure
 SUBST_FILES.python=	Makefile.in
 SUBST_MESSAGE.python=	Fixing path to python interpreter.
 SUBST_SED.python+=	-e "s|/usr/bin/env python|${PYTHONBIN:Q}|g"
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index fa52bc94a7a..dbe9152c529 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2014/09/08 21:24:44 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	aview-1.3.0rc1
 PKGNAME=	aview-1.3.0.1
@@ -25,7 +25,7 @@ USE_TOOLS+=	mktemp:run
 .include "../../mk/bsd.prefs.mk"
 
 SUBST_CLASSES+=		programs
-SUBST_STAGE.programs=	post-patch
+SUBST_STAGE.programs=	pre-configure
 SUBST_MESSAGE.programs=	Filling @placeholders@.
 SUBST_FILES.programs=	Makefile.in
 .if (${MACHINE_ARCH} == "i386")
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 179ff103adc..f42545cd161 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/04/17 22:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2018/07/04 13:40:20 jperkin Exp $
 
 VERSION=		4.0.1
 PKGNAME=		camlimages-${VERSION}
@@ -21,7 +21,7 @@ MAKE_JOBS_SAFE=		no
 WRKSRC=			${WRKDIR}/camlspotter-camlimages-v${VERSION}
 
 SUBST_CLASSES+=		omf
-SUBST_STAGE.omf=	post-patch
+SUBST_STAGE.omf=	pre-configure
 SUBST_FILES.omf=	OMakefile
 SUBST_SED.omf=		-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.omf+=		-e 's,@X11BASE@,${X11BASE},g'
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 9453a98520d..2a34b0bfc66 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/26 10:10:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	colord-1.3.5
 CATEGORIES=	graphics gnome
@@ -41,7 +41,7 @@ CONF_FILES+=	${CONF_DIR}/org.freedesktop.ColorManager.conf \
 
 SUBST_CLASSES+=		prefix
 SUBST_MESSAGE.prefix=	Fix prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_FILES.prefix=	lib/colord/cd-icc-store.c
 SUBST_FILES.prefix+=	src/cd-main.c
 SUBST_FILES.prefix+=	client/cd-util.c
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 727674a354c..573690c7a2e 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2018/03/12 11:16:40 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	djview-4.10.6
@@ -18,7 +18,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config
 
 SUBST_CLASSES+=		nsdejavu
-SUBST_STAGE.nsdejavu=	post-patch
+SUBST_STAGE.nsdejavu=	pre-configure
 SUBST_MESSAGE.nsdejavu=	Fixing hardcoded paths.
 SUBST_FILES.nsdejavu=	nsdejavu/nsdejavu.c
 SUBST_SED.nsdejavu=	-e 's:/usr/local/lib:${LOCALBASE}/lib:'
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index d0f5f723cbc..2112ef33cd3 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2018/04/17 22:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	f-spot-0.8.2
 PKGREVISION=	49
@@ -30,7 +30,7 @@ REPLACE_BASH+=	src/Clients/MainApp/f-spot.in
 REPLACE_BASH+=	tools/f-spot-import
 
 SUBST_CLASSES+=			fix-x11
-SUBST_STAGE.fix-x11=		post-patch
+SUBST_STAGE.fix-x11=		pre-configure
 SUBST_MESSAGE.fix-x11=		Fixing libX11 references
 SUBST_FILES.fix-x11=		src/Core/FSpot.Utils/FSpot.Utils.dll.config.in
 SUBST_FILES.fix-x11+=		src/Core/FSpot.Utils/FSpot.Utils.dll.config
@@ -39,7 +39,7 @@ SUBST_FILES.fix-x11+=		lib/Hyena/build/DllMapVerifier.cs
 SUBST_SED.fix-x11=		-e 's,libX11.so.6,${X11BASE}/lib/libX11.so,'
 
 SUBST_CLASSES+=		fix-mcs
-SUBST_STAGE.fix-mcs=	post-patch
+SUBST_STAGE.fix-mcs=	pre-configure
 SUBST_MESSAGE.fix-mcs=	Fix compiler name
 SUBST_FILES.fix-mcs=	configure
 SUBST_SED.fix-mcs=	-e 's,gmcs,mcs,'
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 49a2b8d110b..4f6a2fcf3e8 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2018/01/25 20:13:08 leot Exp $
+# $NetBSD: Makefile,v 1.75 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	imlib2-1.4.10
 CATEGORIES=	graphics
@@ -27,7 +27,7 @@ SHLIB_SUFFIX=		so
 .endif
 
 SUBST_CLASSES+=		shlib rpath
-SUBST_STAGE.shlib=	post-patch
+SUBST_STAGE.shlib=	pre-configure
 SUBST_MESSAGE.shlib=	Replacing shared library suffix
 SUBST_FILES.shlib+=	src/lib/image.c
 SUBST_SED.shlib+=	-e 's,"\.so",".${SHLIB_SUFFIX}",'
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 4602fd250c0..9e9c4782aa8 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.217 2018/02/20 07:04:54 dholland Exp $
+# $NetBSD: Makefile,v 1.218 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	netpbm-10.79.04
 CATEGORIES=	graphics
@@ -43,7 +43,7 @@ WRKSRC=		${WRKDIR}/netpbm
 WRAPPER_REORDER_CMDS+=	reorder:l:rle:netpbm
 
 SUBST_CLASSES+=		rgb_txt
-SUBST_STAGE.rgb_txt=	post-patch
+SUBST_STAGE.rgb_txt=	pre-configure
 SUBST_MESSAGE.rgb_txt=	Configure RGB_TXT
 SUBST_FILES.rgb_txt=	config.mk
 SUBST_SED.rgb_txt+=	-e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,'
diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile
index 6b43d3b75e3..4c76c3733ed 100644
--- a/graphics/py-qrcode/Makefile
+++ b/graphics/py-qrcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/09/16 19:26:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	qrcode-5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -23,7 +23,7 @@ SUBST_CLASSES+=			pkgmandir
 SUBST_FILES.pkgmandir=		setup.py
 SUBST_MESSAGE.pkgmandir=	Fixing PKGMANDIR path.
 SUBST_SED.pkgmandir=		-e "s|share/man|${PKGMANDIR}|1"
-SUBST_STAGE.pkgmandir=		post-patch
+SUBST_STAGE.pkgmandir=		pre-configure
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/qr \
diff --git a/graphics/tkpiechart/Makefile b/graphics/tkpiechart/Makefile
index 41afcc80cd1..859c53c3b94 100644
--- a/graphics/tkpiechart/Makefile
+++ b/graphics/tkpiechart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/10/09 14:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:21 jperkin Exp $
 
 DISTNAME=	tkpiechart-5.4
 PKGREVISION=	1
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		patch
 SUBST_MESSAGE.patch=	Remove version numbers for required packages.
-SUBST_STAGE.patch=	post-patch
+SUBST_STAGE.patch=	pre-configure
 SUBST_FILES.patch=	demo demo.tcl instapkg.tcl piechart.htm
 SUBST_SED.patch=	-e '/require/s/stooop 3.7/stooop/g'
 SUBST_SED.patch+=	-e '/require/s/switched 1.4/switched/g'