From 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Wed, 4 Jul 2018 13:40:07 +0000
Subject: *: 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.
---
 emulators/dosbox/Makefile           |  4 ++--
 emulators/dynagen/Makefile          |  4 ++--
 emulators/dynamips/Makefile         |  4 ++--
 emulators/emulationstation/Makefile |  8 ++++----
 emulators/fceu/Makefile             |  4 ++--
 emulators/gxemul/Makefile           |  4 ++--
 emulators/pearpc/Makefile           |  4 ++--
 emulators/simulavr/Makefile         | 10 +++++-----
 emulators/ski/Makefile              |  4 ++--
 emulators/spim/Makefile             |  4 ++--
 emulators/tuxnes/Makefile           |  6 +++---
 emulators/xbeeb/Makefile            | 10 +++++-----
 emulators/xbeeb/options.mk          |  4 ++--
 13 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'emulators')

diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index f0a8374e44f..e80c4b46c9a 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/09/16 03:27:20 maya Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dosbox-0.74
 PKGREVISION=	10
@@ -22,7 +22,7 @@ LDFLAGS.SunOS+=		-lsocket
 INSTALLATION_DIRS=	share/doc/dosbox
 
 SUBST_CLASSES+=		fixme
-SUBST_STAGE.fixme=	post-patch
+SUBST_STAGE.fixme=	pre-configure
 SUBST_FILES.fixme=	docs/dosbox.1
 SUBST_SED.fixme=	-e s,/usr/share/,${PREFIX}/share/,g
 
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index e873f170974..9bfb74be272 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/08/01 16:47:38 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dynagen-0.11.0
 PKGREVISION=	4
@@ -18,7 +18,7 @@ REPLACE_PYTHON+= dynagen confConsole.py console.py dynamips_lib.py pemu_lib.py \
 		pemubin.py pemuwrapper.py
 
 SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	dynagen
 SUBST_SED.paths=	-e "s|@SYSCONFDIR@|${PKG_SYSCONFDIR}|"
 SUBST_SED.paths+=	-e "s|@PREFIX@|${PREFIX}|"
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 42b4536a24e..54b85c1c2b2 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/01/17 20:22:36 markd Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	dynamips-0.2.17
 CATEGORIES=	emulators
@@ -15,7 +15,7 @@ USE_TOOLS+=	gmake
 USE_CMAKE=	yes
 
 SUBST_CLASSES+=		libelf
-SUBST_STAGE.libelf=	post-patch
+SUBST_STAGE.libelf=	pre-configure
 SUBST_FILES.libelf=	common/dynamips.h common/rom2c.c
 SUBST_SED.libelf=	-e 's,<libelf.h>,<libelf/libelf.h>,'
 SUBST_MESSAGE.libelf=	Fix libelf header file path
diff --git a/emulators/emulationstation/Makefile b/emulators/emulationstation/Makefile
index 3f21d9d746f..d364eca7d82 100644
--- a/emulators/emulationstation/Makefile
+++ b/emulators/emulationstation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/04/29 21:31:35 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	abba19584636c28cd98e3810e857f493cb63d06c
 PKGNAME=	emulationstation-2.0.0_rc1_20150210
@@ -22,19 +22,19 @@ WRKSRC=		${WRKDIR}/EmulationStation-${DISTNAME}
 INSTALLATION_DIRS=	bin share/doc/emulationstation
 
 SUBST_CLASSES+=		fceu
-SUBST_STAGE.fceu=	post-patch
+SUBST_STAGE.fceu=	pre-configure
 SUBST_MESSAGE.fceu=	Adjusting config file path to retroarch backend
 SUBST_FILES.fceu=	es-app/src/SystemData.cpp
 SUBST_SED.fceu=		-e "s|~/cores/libretro-fceumm.so|${PREFIX}/lib/libretro/fceumm_libretro.so|"
 
 SUBST_CLASSES+=		ra
-SUBST_STAGE.ra=		post-patch
+SUBST_STAGE.ra=		pre-configure
 SUBST_MESSAGE.ra=	Adjusting path to retroarch backends in documentation
 SUBST_FILES.ra=		SYSTEMS.md
 SUBST_SED.ra=		-e "s|/usr|${PREFIX}|"
 
 SUBST_CLASSES+=		etc
-SUBST_STAGE.etc=	post-patch
+SUBST_STAGE.etc=	pre-configure
 SUBST_MESSAGE.etc=	Adjusting path to global configuration files
 SUBST_FILES.etc=	es-app/src/SystemData.cpp es-core/src/ThemeData.cpp
 SUBST_FILES.etc+=	GAMELISTS.md README.md THEMES.md
diff --git a/emulators/fceu/Makefile b/emulators/fceu/Makefile
index 33f675653c1..5b9c8fa71e8 100644
--- a/emulators/fceu/Makefile
+++ b/emulators/fceu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/04/25 14:20:44 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:17 jperkin Exp $
 #
 
 DISTNAME=		fceu-0.98.13.src
@@ -17,7 +17,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	src/drivers/sexyal/drivers/oss.c
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index f7b3616d51a..f078667fc4e 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/08/24 22:52:55 mrg Exp $
+# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	gxemul-0.6.0.1
 PKGREVISION=	6
@@ -37,7 +37,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 .if !empty(PKG_OPTIONS:Mx11)
 GLOBAL_LDFLAGS=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 SUBST_CLASSES+=		x11
-SUBST_STAGE.x11=	post-patch
+SUBST_STAGE.x11=	pre-configure
 SUBST_FILES.x11=	configure
 SUBST_SED.x11=		-e 's|-L/usr/X11R6/lib|${GLOBAL_LDFLAGS:Q}|g'
 SUBST_SED.x11+=		-e 's|/usr/X11R6|${X11BASE}|g'
diff --git a/emulators/pearpc/Makefile b/emulators/pearpc/Makefile
index 541e6df4d85..0cb15fcc78d 100644
--- a/emulators/pearpc/Makefile
+++ b/emulators/pearpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/03/17 01:27:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=		pearpc-0.5
 CATEGORIES=		emulators
@@ -40,7 +40,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ppccfg.example ${DESTDIR}${EGDIR}
 
 SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	post-patch
+SUBST_STAGE.conf=	pre-configure
 SUBST_FILES.conf=	ppccfg.example
 SUBST_SED.conf=		-e "s|\"nvram\"|\"/tmp/nvram\"|"
 SUBST_MESSAGE.conf=	Fixing configuration file.
diff --git a/emulators/simulavr/Makefile b/emulators/simulavr/Makefile
index 432f62ba9ad..abaa83823c2 100644
--- a/emulators/simulavr/Makefile
+++ b/emulators/simulavr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/08/18 07:31:07 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:17 jperkin Exp $
 #
 DISTNAME=		simulavr-1.0.0
 PKGREVISION=		3
@@ -35,7 +35,7 @@ INFO_FILES=		yes
 
 # Interim fix
 SUBST_CLASSES+=		prefix
-SUBST_STAGE.prefix=	post-patch
+SUBST_STAGE.prefix=	pre-configure
 SUBST_MESSAGE.prefix=	Fix include path finding Python.h
 SUBST_FILES.prefix=	src/Makefile.in
 SUBST_VARS.prefix=	PREFIX
@@ -44,7 +44,7 @@ SUBST_VARS.prefix=	PREFIX
 # See also
 #  http://savannah.nongnu.org/bugs/?35737
 SUBST_CLASSES+=		compare2
-SUBST_STAGE.compare2=	post-patch
+SUBST_STAGE.compare2=	pre-configure
 SUBST_MESSAGE.compare2=	Convert poisoned SIG_OUTPUT_COMPARE2 to TIMER2_COMP_vect
 SUBST_FILES.compare2=	examples/atmega128_timer/main.c
 SUBST_FILES.compare2+=	examples/python/example.c
@@ -58,14 +58,14 @@ SUBST_SED.compare2=	-e 's/SIG_OUTPUT_COMPARE2/TIMER2_COMP_vect/g'
 # kb.c:39:8: error: attempt to use poisoned "SIG_INTERRUPT0"
 
 SUBST_CLASSES+=		uart0
-SUBST_STAGE.uart0=	post-patch
+SUBST_STAGE.uart0=	pre-configure
 SUBST_MESSAGE.uart0=	Convert poisoned SIG_UART0_RECV to USART0_RX_vect
 SUBST_FILES.uart0=	examples/atmel_key/StdDefs.h
 SUBST_SED.uart0=	-e 's/SIG_UART0_RECV/USART0_RX_vect/g'
 SUBST_SED.uart0+=	-e 's/SIG_UART0_DATA/USART0_UDRE_vect/g'
 
 SUBST_CLASSES+=		intrpt0
-SUBST_STAGE.intrpt0=	post-patch
+SUBST_STAGE.intrpt0=	pre-configure
 SUBST_MESSAGE.intrpt0=	Convert poisoned SIG_INTERRUPT0 to INT0_vect
 SUBST_FILES.intrpt0=	examples/atmel_key/kb.c
 SUBST_FILES.intrpt0+=	examples/python/multicore.c
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index 65d1dd356b8..c746306f453 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/04/16 14:34:26 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/07/04 13:40:17 jperkin Exp $
 #
 
 DISTNAME=	ski-1.3.2
@@ -36,7 +36,7 @@ SUBST_FILES.xski-app=	Makefile.am
 SUBST_SED.xski-app=	-e 's,/etc/X11/app-defaults,${PREFIX}/lib/X11/app-defaults,g'
 
 SUBST_CLASSES+=		ssx-app
-SUBST_STAGE.ssx-app=	post-patch
+SUBST_STAGE.ssx-app=	pre-configure
 SUBST_MESSAGE.ssx-app=	Fixing X11 ssX.c app-default paths.
 SUBST_FILES.ssx-app=	src/ssX.c
 SUBST_SED.ssx-app=	-e 's,XSKI_RESOURCE_FILE,${PREFIX}/lib/X11/app-defaults/XSki,g'
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 400b711c1a1..9f77f9058a3 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2012/10/03 12:55:18 asau Exp $
+# $NetBSD: Makefile,v 1.44 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=	spim-8.0
 PKGREVISION=	1
@@ -19,7 +19,7 @@ USE_TOOLS+=		gzip flex yacc
 INSTALL_TARGET=		install
 
 SUBST_CLASSES+=		cpudir
-SUBST_STAGE.cpudir=	post-patch
+SUBST_STAGE.cpudir=	pre-configure
 SUBST_MESSAGE.cpudir=	rename CPU_DIR
 SUBST_FILES.cpudir=	spim/Makefile xspim/Imakefile
 SUBST_SED.cpudir=	-e s:CPU_DIR:CPUDIR:
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 28f25c448f2..2c16bfc324e 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/07/04 13:40:17 jperkin Exp $
 
 DISTNAME=		tuxnes-0.75
 PKGREVISION=		4
@@ -17,13 +17,13 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path.
 SUBST_FILES.dsp=	consts.h
 SUBST_SED.dsp=		-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
 SUBST_CLASSES.SunOS+=	gld
-SUBST_STAGE.gld=	post-patch
+SUBST_STAGE.gld=	pre-configure
 SUBST_MESSAGE.gld=	Using GNU ld to create table.o
 SUBST_FILES.gld=	Makefile.in
 SUBST_SED.gld=		-e "/ld -r/s/ld/gld/"
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 9d38188a65f..f9d25b74c13 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/03/06 15:50:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/07/04 13:40:18 jperkin Exp $
 
 DISTNAME=	xbeeb-0.4.1
 PKGREVISION=	3
@@ -31,13 +31,13 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .if ${OSS_TYPE} != "none"
 
 SUBST_CLASSES+=		dsp
-SUBST_STAGE.dsp=	post-patch
+SUBST_STAGE.dsp=	pre-configure
 SUBST_MESSAGE.dsp=	Adjusting sound device path
 SUBST_FILES.dsp=	src/SoundOSS.c
 SUBST_SED.dsp=		-e "s|\"/dev/dsp\"|\"${DEVOSSAUDIO}\"|"
 
 SUBST_CLASSES+=		osslib
-SUBST_STAGE.osslib=	post-patch
+SUBST_STAGE.osslib=	pre-configure
 SUBST_MESSAGE.osslib=	Linking OSS library
 SUBST_FILES.osslib=	src/Imakefile
 SUBST_SED.osslib=	-e "s|\\(SYS_LIBRARIES[	 ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
@@ -45,7 +45,7 @@ SUBST_SED.osslib=	-e "s|\\(SYS_LIBRARIES[	 ]*=.*\\)|\\1 ${LIBOSSAUDIO}|"
 .else
 
 SUBST_CLASSES+=		nooss
-SUBST_STAGE.nooss=	post-patch
+SUBST_STAGE.nooss=	pre-configure
 SUBST_MESSAGE.nooss=	Disabling sound support: No OSS on this platform
 SUBST_FILES.nooss=	src/Config.h
 SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
@@ -53,7 +53,7 @@ SUBST_SED.nooss=	-e "s|^\#define\\([	 ]*SOUND_OSS.*\\)\$$|\#undef\\1|"
 .endif # OSS_TYPE
 
 SUBST_CLASSES+=		beebroot
-SUBST_STAGE.beebroot=	post-patch
+SUBST_STAGE.beebroot=	pre-configure
 SUBST_MESSAGE.beebroot=	Adjusting XBEEBROOT path
 SUBST_FILES.beebroot=	src/Config.h
 SUBST_SED.beebroot=	-e "s|^\\(\#define[	 ]*XBEEBROOT[	 ]*\\)[^	 ].*\$$|\\1\"${PREFIX}/${XBEEBROOT}/\"|"
diff --git a/emulators/xbeeb/options.mk b/emulators/xbeeb/options.mk
index d621dee2826..45fe8f5b1cc 100644
--- a/emulators/xbeeb/options.mk
+++ b/emulators/xbeeb/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2018/07/04 13:40:18 jperkin Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=
 # Unfortunately it doesn't support both at once.
 .if empty(PKG_OPTIONS:Mmitshm)
 SUBST_CLASSES+=		nomitshm
-SUBST_STAGE.nomitshm=	post-patch
+SUBST_STAGE.nomitshm=	pre-configure
 SUBST_MESSAGE.nomitshm=	Disabling MIT-SHM
 SUBST_FILES.nomitshm=	src/Config.h
 SUBST_SED.nomitshm=	-e "s|\#define	*MITSHM|\#undef MITSHM|"
-- 
cgit v1.2.3