[pkgsrc/trunk]: pkgsrc/net/rdesktop Again... there's no need to use CFLAGS to...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b461b3f2c433
branches:  trunk
changeset: 489056:b461b3f2c433
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Feb 15 20:20:06 2005 +0000

description:
Again... there's no need to use CFLAGS to pass the audio device
in some file, use subst.mk and remove the patch.

diffstat:

 net/rdesktop/Makefile         |   9 +++++++--
 net/rdesktop/distinfo         |   3 +--
 net/rdesktop/patches/patch-ac |  13 -------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diffs (56 lines):

diff -r 5fa498003abf -r b461b3f2c433 net/rdesktop/Makefile
--- a/net/rdesktop/Makefile     Tue Feb 15 20:08:55 2005 +0000
+++ b/net/rdesktop/Makefile     Tue Feb 15 20:20:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:17:58 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/02/15 20:20:06 xtraeme Exp $
 #
 
 DISTNAME=              rdesktop-1.3.1
@@ -21,9 +21,14 @@
 CONFIGURE_ARGS+=       --with-x=${X11BASE}
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 
-CFLAGS+=               -DAUDIO_DEV=\"\\\"${DEVOSSAUDIO}\\\"\"
 LDFLAGS+=              ${LIBOSSAUDIO}
 
+SUBST_CLASSES+=                audio
+SUBST_STAGE.audio=     pre-configure
+SUBST_FILES.audio=     rdpsnd_oss.c
+SUBST_SED.audio=       -e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_MESSAGE.audio=   "Fixing hardcoded audio device."
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5fa498003abf -r b461b3f2c433 net/rdesktop/distinfo
--- a/net/rdesktop/distinfo     Tue Feb 15 20:08:55 2005 +0000
+++ b/net/rdesktop/distinfo     Tue Feb 15 20:20:06 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/09/26 15:05:36 seb Exp $
+$NetBSD: distinfo,v 1.11 2005/02/15 20:20:06 xtraeme Exp $
 
 SHA1 (rdesktop-1.3.1.tar.gz) = d80e7c3afb671c77e4d8a6a74b33c3d6256675ce
 Size (rdesktop-1.3.1.tar.gz) = 139686 bytes
@@ -6,4 +6,3 @@
 Size (rdesktop.patch) = 2348 bytes
 SHA1 (patch-aa) = 1a28125cfc8cb58ba67c2c10209d0eca4681404e
 SHA1 (patch-ab) = 2a86d850d0b3ee5e14ae6818c3ea492af558f22e
-SHA1 (patch-ac) = 2d00269140102a08a355c4890d08e0ec0c761a38
diff -r 5fa498003abf -r b461b3f2c433 net/rdesktop/patches/patch-ac
--- a/net/rdesktop/patches/patch-ac     Tue Feb 15 20:08:55 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/11/22 03:34:51 grant Exp $
-
---- rdpsnd_oss.c.orig  2003-10-30 01:13:59.000000000 +1100
-+++ rdpsnd_oss.c
-@@ -45,7 +45,7 @@ static unsigned int queue_hi, queue_lo;
- BOOL
- wave_out_open(void)
- {
--      char *dsp_dev = "/dev/dsp";
-+      char *dsp_dev = AUDIO_DEV;
- 
-       if ((g_dsp_fd = open(dsp_dev, O_WRONLY | O_NONBLOCK)) == -1)
-       {