diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-04-17 10:36:05 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-04-17 10:36:05 +0000 |
| commit | 3a627c9ccd338ab9c465b4286dee696f157a101c (patch) | |
| tree | 146bd6dafd541a3dfe57fef16529823ffa7ed4fc /games | |
| parent | 757fee7ad75463f17a59dcd11ae797e8c86bcc45 (diff) | |
| download | pkgsrc-3a627c9ccd338ab9c465b4286dee696f157a101c.tar.gz | |
Use subst.mk instead of patching the file and use CPPFLAGS.
Diffstat (limited to 'games')
| -rw-r--r-- | games/quake2forge/Makefile | 12 | ||||
| -rw-r--r-- | games/quake2forge/distinfo | 3 | ||||
| -rw-r--r-- | games/quake2forge/patches/patch-ab | 13 |
3 files changed, 9 insertions, 19 deletions
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index 90e9337ee1c..97dfe87b5e3 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/04/16 15:17:21 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2004/04/17 10:36:05 xtraeme Exp $ # DISTNAME= quake2-0.2.1 @@ -17,8 +17,6 @@ USE_LIBTOOL= yes USE_X11= yes GNU_CONFIGURE= yes -CFLAGS+= -DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\" - BUILDLINK_TRANSFORM+= S:-Werror: CONFIGURE_ARGS+= --program-transform-name='s/^quake2$$/quake2forge/' @@ -26,7 +24,13 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/quake2forge ${INSTALL_DATA} ${WRKSRC}/docs/README* ${PREFIX}/share/doc/quake2forge ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/quake2forge - + +SUBST_CLASSES= snd +SUBST_STAGE.snd= post-patch +SUBST_FILES.snd= src/snd.c +SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g" +SUBST_MESSAGE.snd= "Fixing harcoded audio device." + .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/games/quake2forge/distinfo b/games/quake2forge/distinfo index a0b51d9713e..f9f9bcd2944 100644 --- a/games/quake2forge/distinfo +++ b/games/quake2forge/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2004/04/16 15:17:21 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2004/04/17 10:36:05 xtraeme Exp $ SHA1 (quake2-0.2.1.tar.bz2) = 258a391f54dd58e59924f78c074e614b228ff773 Size (quake2-0.2.1.tar.bz2) = 1286703 bytes SHA1 (patch-aa) = 380078cc177fcc8b7d7c5bf2fd59620d67349d55 -SHA1 (patch-ab) = 5a6e0cef1736fa78cbf6a27d8efa31a6c107f97f diff --git a/games/quake2forge/patches/patch-ab b/games/quake2forge/patches/patch-ab deleted file mode 100644 index 2ffcb08746e..00000000000 --- a/games/quake2forge/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2004/04/16 15:17:21 xtraeme Exp $ - ---- src/snd.c.orig 2004-04-16 17:11:10.000000000 +0200 -+++ src/snd.c 2004-04-16 17:11:30.000000000 +0200 -@@ -211,7 +211,7 @@ - sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE); - sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE); - sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE); -- snddevice = Cvar_Get("snddevice", "/dev/dsp", CVAR_ARCHIVE); -+ snddevice = Cvar_Get("snddevice", DEVOSSAUDIO, CVAR_ARCHIVE); - } - - // open /dev/dsp, check capability to mmap, and get size of dma buffer |