[pkgsrc/trunk]: pkgsrc/games/quake2forge Use subst.mk instead of patching the...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b984d08a724
branches:  trunk
changeset: 473184:1b984d08a724
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Apr 17 10:36:05 2004 +0000

description:
Use subst.mk instead of patching the file and use CPPFLAGS.

diffstat:

 games/quake2forge/Makefile         |  12 ++++++++----
 games/quake2forge/distinfo         |   3 +--
 games/quake2forge/patches/patch-ab |  13 -------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diffs (61 lines):

diff -r 4dc7d52ada1a -r 1b984d08a724 games/quake2forge/Makefile
--- a/games/quake2forge/Makefile        Sat Apr 17 05:50:50 2004 +0000
+++ b/games/quake2forge/Makefile        Sat Apr 17 10:36:05 2004 +0000
@@ -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_X11=       yes
 GNU_CONFIGURE= yes
 
-CFLAGS+=       -DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
-
 BUILDLINK_TRANSFORM+=  S:-Werror:
 CONFIGURE_ARGS+=       --program-transform-name='s/^quake2$$/quake2forge/'
 
@@ -26,7 +24,13 @@
        ${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 -r 4dc7d52ada1a -r 1b984d08a724 games/quake2forge/distinfo
--- a/games/quake2forge/distinfo        Sat Apr 17 05:50:50 2004 +0000
+++ b/games/quake2forge/distinfo        Sat Apr 17 10:36:05 2004 +0000
@@ -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 -r 4dc7d52ada1a -r 1b984d08a724 games/quake2forge/patches/patch-ab
--- a/games/quake2forge/patches/patch-ab        Sat Apr 17 05:50:50 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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