diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
| commit | 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch) | |
| tree | 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6 /emulators/xbeeb | |
| parent | 063580a062ba10ffba035c8d96b541b5ce7a426d (diff) | |
| download | pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz | |
*: 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.
Diffstat (limited to 'emulators/xbeeb')
| -rw-r--r-- | emulators/xbeeb/Makefile | 10 | ||||
| -rw-r--r-- | emulators/xbeeb/options.mk | 4 |
2 files changed, 7 insertions, 7 deletions
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|" |