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

19 files changed, 41 insertions, 41 deletions

diff --git a/games/0verkill/Makefile b/games/0verkill/Makefile
index aa7ba435833..d57e3bbe075 100644
--- a/games/0verkill/Makefile
+++ b/games/0verkill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2017/07/30 22:37:57 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	0verkill-0.16
 PKGREVISION=	1
@@ -16,13 +16,13 @@ INSTALLATION_DIRS=	bin share/0verkill share/doc/0verkill
 INSTALLATION_DIRS+=	share/0verkill/data share/0verkill/grx
 
 SUBST_CLASSES+=		grx
-SUBST_STAGE.grx=	post-patch
+SUBST_STAGE.grx=	pre-configure
 SUBST_MESSAGE.grx=	Fix game data paths
 SUBST_FILES.grx=	data/sprites.dat data/level1.sp data/level2.sp
 SUBST_SED.grx=		-e "s|grx/|${PREFIX}/share/0verkill/grx/|g"
 
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix game configuration path prefix
 SUBST_FILES.prefix=	cfg.h
 SUBST_SED.prefix=	-e "s|@PREFIX@|${PREFIX}|g"
diff --git a/games/blindmine/Makefile b/games/blindmine/Makefile
index f100aef29c3..b83c71fe0c6 100644
--- a/games/blindmine/Makefile
+++ b/games/blindmine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/07/03 05:03:17 adam Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	blindmine-0.3-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing paths.
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	blindmine.py sdl_ui.py
 SUBST_SED.path=		-e 's,/usr/bin/env python,${PYTHONBIN},g'
 
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index abab6fc7ed9..abb65a6bd98 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2018/04/29 21:31:36 adam Exp $
+# $NetBSD: Makefile,v 1.62 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	bzflag-2.4.2
 PKGREVISION=	15
@@ -21,7 +21,7 @@ USE_CURSES=	resizeterm
 
 .if ${OPSYS} !=  "Linux"
 SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
+SUBST_STAGE.fixme=	pre-configure
 SUBST_FILES.fixme=	src/platform/Makefile.in
 SUBST_SED.fixme=	-e "s|@LINUX_TRUE@||g"
 SUBST_SED.fixme+=	-e "s|@LINUX_FALSE@|\#|g"
diff --git a/games/crossfire-client/Makefile.common b/games/crossfire-client/Makefile.common
index ea51250419b..7c9c0107283 100644
--- a/games/crossfire-client/Makefile.common
+++ b/games/crossfire-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/10/06 11:54:34 asau Exp $
+# $NetBSD: Makefile.common,v 1.7 2018/07/04 13:40:18 jperkin Exp $
 # used by games/crossfire-client/Makefile
 # used by games/crossfire-client-gtk/Makefile
 # used by games/crossfire-client-gtk2/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 REPLACE_PERL+=		common/items.pl utils/deftoheader.pl
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting path to sound device.
 SUBST_FILES.dsp=	sound-src/cfsndserv.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/et/Makefile b/games/et/Makefile
index 38e9f93db96..f927830c44a 100644
--- a/games/et/Makefile
+++ b/games/et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/08/16 20:45:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	et-linux-2.56-2.x86
@@ -28,7 +28,7 @@ SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/et ${WRKDIR}/etded
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@SH@,${SH},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 pre-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index ca19c9574c6..dc33d165e73 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2016/05/17 10:32:07 fhajny Exp $
+# $NetBSD: Makefile,v 1.46 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=		nethack_source_331_jtp_193
@@ -33,7 +33,7 @@ LIBS.SunOS+=		-lm
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Configuring program paths.
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	include/config.h src/fe-config.in
 SUBST_FILES.paths+=	sys/unix/nethack.sh
 SUBST_SED.paths=	-e "s,XXXPREFIXXXX,${PREFIX},g"
@@ -41,7 +41,7 @@ SUBST_SED.paths+=	-e "s,@GZIP_PROGRAM@,${GZIP_CMD:M*gzip},g"
 
 SUBST_CLASSES.NetBSD+=	unixconf
 SUBST_MESSAGE.unixconf=	Configuring to use NetBSD presets.
-SUBST_STAGE.unixconf=	post-patch
+SUBST_STAGE.unixconf=	pre-configure
 SUBST_FILES.unixconf=	include/unixconf.h
 SUBST_SED.unixconf=	-e 's,^\/\* \#define BSD 1 \*\/,\#define BSD 1,'
 SUBST_SED.unixconf+=	-e 's,^\#define SYSV,\/\* \#define SYSV \*\/,'
diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile
index 36c86d6b196..3dfabc0baee 100644
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/04/25 14:22:54 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	fillets-ng-0.7.3
@@ -19,7 +19,7 @@ LDFLAGS.DragonFly=	-lX11
 LDFLAGS.SunOS+=		-lX11
 
 SUBST_CLASSES+=		man
-SUBST_STAGE.man=	post-patch
+SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	fillets.6
 SUBST_MESSAGE.man=	Fixing documentation path in the manual page.
 SUBST_SED.man=		"s,/usr/share/doc/fillets-ng/html/manual.html,${PREFIX}/share/doc/html/fillets-ng/manual.html,"
diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common
index f777e292c99..40399b013f9 100644
--- a/games/freeciv-share/Makefile.common
+++ b/games/freeciv-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile.common,v 1.52 2018/07/04 13:40:19 jperkin Exp $
 
 # used by games/freeciv-share/Makefile
 # used by games/freeciv-client/Makefile
@@ -28,7 +28,7 @@ REPLACE_PYTHON=			${WRKSRC}/common/generate_packets.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.3.2
 
 SUBST_CLASSES+=		data
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_FILES.data=	data/Makefile.in
 SUBST_SED.data+=	-e "s|@CLIENT_FALSE@|@MAKE_DATA_FALSE@|g"
 SUBST_SED.data+=	-e "s|@CLIENT_TRUE@|@MAKE_DATA_TRUE@|g"
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 84a681ab2f1..a74421c5df8 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile,v 1.164 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=		gnome-games-2.32.1
 PKGREVISION=		37
@@ -52,7 +52,7 @@ PY_PATCHPLIST=		yes
 
 #!/usr/bin/env sh is pretty dumb and REPLACE_SH doesn't support fixing it
 SUBST_CLASSES+=		swell
-SUBST_STAGE.swell=	post-patch
+SUBST_STAGE.swell=	pre-configure
 SUBST_FILES.swell=	swell-foop/swell-foop.in
 SUBST_SED.swell=	's:/usr/bin/env sh:${SH}:'
 
diff --git a/games/libkdegames/Makefile b/games/libkdegames/Makefile
index 49eea2cd207..12f8c86b483 100644
--- a/games/libkdegames/Makefile
+++ b/games/libkdegames/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/04/29 21:31:41 adam Exp $
+# $NetBSD: Makefile,v 1.28 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	libkdegames-${_KDE_VERSION}
 PKGREVISION=	11
@@ -6,7 +6,7 @@ CATEGORIES=	games
 COMMENT=	library for the kdegames package
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_FILES.path=	KDEGamesConfig.cmake.in
 SUBST_SED.path+=	-e 's;KDEGAMES_INCLUDE_DIR .*;KDEGAMES_INCLUDE_DIR "${PREFIX}/include");'
 
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index a4356b8ecf1..8f69d193452 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2018/04/16 14:34:31 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/07/04 13:40:19 jperkin Exp $
 #
 
 DISTNAME=	pioneers-0.11.3
@@ -18,7 +18,7 @@ USE_PKGLOCALEDIR=	YES
 BUILDLINK_DEPMETHOD.librsvg=	build	# generates icons
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing hardcoded paths.
 SUBST_FILES.paths=	docs/*.6
 SUBST_SED.paths=	-e s,/usr/share/,${PREFIX}/share/,
diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile
index db78943c895..87da8bedb2a 100644
--- a/games/powermanga/Makefile
+++ b/games/powermanga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	powermanga-0.90
 PKGREVISION=	2
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--x-libraries=${PREFIX}/lib
 .endif
 
 SUBST_CLASSES+=		path
-SUBST_STAGE.path=	post-patch
+SUBST_STAGE.path=	pre-configure
 SUBST_SED.path+=	-e "s,/games/powermanga,/powermanga,g"
 SUBST_MESSAGE.path=	Fixing support file installation paths.
 SUBST_FILES.path+=	data/Makefile.in
diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile
index 97b0183c027..3e36ce47ae5 100644
--- a/games/prboom-plus/Makefile
+++ b/games/prboom-plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/01/14 17:34:01 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	prboom-plus-2.5.1.3
 PKGREVISION=	1
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-waddir=${PREFIX}/share/doom
 
 SUBST_CLASSES+=		gamesdir
-SUBST_STAGE.gamesdir=	post-patch
+SUBST_STAGE.gamesdir=	pre-configure
 SUBST_MESSAGE.gamesdir=	Fixing hard-coded gamesdir
 SUBST_FILES.gamesdir=	src/Makefile.in
 SUBST_SED.gamesdir+=	-e '/^gamesdir =/ s;/games;/bin;g'
diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index 2d823645e81..58f2dd51162 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/01/14 17:34:00 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	prboom-2.5.0
 PKGREVISION=	2
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--with-waddir=${PREFIX}/share/doom
 #CONFIGURE_ARGS+=	--enable-gl
 
 SUBST_CLASSES+=		gamesdir
-SUBST_STAGE.gamesdir=	post-patch
+SUBST_STAGE.gamesdir=	pre-configure
 SUBST_MESSAGE.gamesdir=	Fixing hard-coded gamesdir
 SUBST_FILES.gamesdir=	src/Makefile.in
 SUBST_SED.gamesdir+=	-e '/^gamesdir =/ s;/games;/bin;g'
diff --git a/games/pysolfc/Makefile b/games/pysolfc/Makefile
index d3195bacb9b..54134759df1 100644
--- a/games/pysolfc/Makefile
+++ b/games/pysolfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/07/03 05:03:18 adam Exp $
+# $NetBSD: Makefile,v 1.25 2018/07/04 13:40:19 jperkin Exp $
 
 DISTNAME=	PySolFC-2.0
 PKGNAME=	${DISTNAME:tl}
@@ -221,7 +221,7 @@ REPLACE_PYTHON+= \
 	pysollib/wizardutil.py
 
 SUBST_CLASSES+=			fix-paths
-SUBST_STAGE.fix-paths=		post-patch
+SUBST_STAGE.fix-paths=		pre-configure
 SUBST_MESSAGE.fix-paths=	Fixing absolute paths.
 SUBST_FILES.fix-paths=		pysollib/settings.py
 SUBST_SED.fix-paths=		-e s,@DATADIR@,${PREFIX}/share/PySolFC/,
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 0534c8a8eb5..b8bed998cf0 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/04/25 14:23:03 tnn Exp $
+# $NetBSD: Makefile,v 1.30 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	quake2-0.3
@@ -25,11 +25,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/quake2forge
 
 SUBST_CLASSES+=		snd data
-SUBST_STAGE.snd=	post-patch
+SUBST_STAGE.snd=	pre-configure
 SUBST_FILES.snd=	src/snd_dma.c data/baseq2/config.cfg
 SUBST_SED.snd=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
 SUBST_MESSAGE.snd=	Fixing hardcoded audio device.
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_FILES.data=	configure
 SUBST_SED.data=		-e s,PACKAGE=\'quake2\',PACKAGE=\'${PKGBASE}\',g
 SUBST_MESSAGE.data=	Fixing installation directories.
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 0b1034e8799..b3439b6702f 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		16
@@ -18,7 +18,7 @@ USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	libs/audio/targets/snd_oss.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/tyrquake/Makefile b/games/tyrquake/Makefile
index 472aa884ef3..e0a58388ef4 100644
--- a/games/tyrquake/Makefile
+++ b/games/tyrquake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:30 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/07/04 13:40:20 jperkin Exp $
 
 DISTNAME=	tyrquake-0.61_20140630
 PKGREVISION=	2
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/tyrquake
 LDFLAGS+=	${LIBOSSAUDIO}
 
 SUBST_CLASSES+=		audio
-SUBST_STAGE.audio=	post-patch
+SUBST_STAGE.audio=	pre-configure
 SUBST_MESSAGE.audio=	Fixing path to the audio device.
 SUBST_FILES.audio=	common/snd_oss.c
 SUBST_SED.audio=	-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 5fd19b00159..614afb8cda7 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2015/04/25 14:23:05 tnn Exp $
+# $NetBSD: Makefile,v 1.27 2018/07/04 13:40:20 jperkin Exp $
 #
 
 DISTNAME=	xrick-021212
@@ -20,7 +20,7 @@ NO_SRC_ON_FTP=	    ${RESTRICTED}
 USE_TOOLS+=		gmake gunzip
 
 SUBST_CLASSES+=		data
-SUBST_STAGE.data=	post-patch
+SUBST_STAGE.data=	pre-configure
 SUBST_MESSAGE.data=	Adjusting path to data.zip
 SUBST_FILES.data=	src/xrick.c
 SUBST_SED.data=		-e "s|data.zip|${PREFIX}/share/xrick/&|"