[pkgsrc/trunk]: pkgsrc/net/rdesktop fix sound support on NetBSD by picking up...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e1cb18e047d
branches:  trunk
changeset: 463641:6e1cb18e047d
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Nov 22 03:34:51 2003 +0000

description:
fix sound support on NetBSD by picking up ${DEVOSSAUDIO} from
ossaudio.buildlink2.mk and using it.

reorder WRKSRC to appease pkglint.

bump PKGREVISION.

diffstat:

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

diffs (52 lines):

diff -r ea56a9476b06 -r 6e1cb18e047d net/rdesktop/Makefile
--- a/net/rdesktop/Makefile     Fri Nov 21 23:08:21 2003 +0000
+++ b/net/rdesktop/Makefile     Sat Nov 22 03:34:51 2003 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/11/20 04:46:08 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/11/22 03:34:51 grant Exp $
 #
 
 DISTNAME=              rdesktop-1.3.0
+PKGREVISION=           1
+WRKSRC=                        ${WRKDIR}/rdesktop
 CATEGORIES=            net
-WRKSRC=                        ${WRKDIR}/rdesktop
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
 MAINTAINER=            grant%NetBSD.org@localhost
@@ -17,6 +18,7 @@
 CONFIGURE_ARGS+=       --with-x=${X11BASE}
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 
+CFLAGS+=               -DAUDIO_DEV='\"${DEVOSSAUDIO}\"'
 LDFLAGS+=              ${LIBOSSAUDIO}
 
 .include "../../security/openssl/buildlink2.mk"
diff -r ea56a9476b06 -r 6e1cb18e047d net/rdesktop/distinfo
--- a/net/rdesktop/distinfo     Fri Nov 21 23:08:21 2003 +0000
+++ b/net/rdesktop/distinfo     Sat Nov 22 03:34:51 2003 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2003/11/20 04:46:08 grant Exp $
+$NetBSD: distinfo,v 1.8 2003/11/22 03:34:51 grant Exp $
 
 SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
 Size (rdesktop-1.3.0.tar.gz) = 136704 bytes
 SHA1 (patch-ab) = ebe5bdaeb0ce8187e5a7d537450dfbb4de6b1389
+SHA1 (patch-ac) = 2d00269140102a08a355c4890d08e0ec0c761a38
diff -r ea56a9476b06 -r 6e1cb18e047d net/rdesktop/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/rdesktop/patches/patch-ac     Sat Nov 22 03:34:51 2003 +0000
@@ -0,0 +1,13 @@
+$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)
+       {