summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorxtraeme <xtraeme>2005-02-15 20:20:06 +0000
committerxtraeme <xtraeme>2005-02-15 20:20:06 +0000
commit9402979608aba4a39401865fe381653c866d80c4 (patch)
tree2281d7fd3d7ce590179a70c65873008a9a75a2b5 /net
parentcf6ca080970d6a0bbd290b2840cd0f60c628b48a (diff)
downloadpkgsrc-9402979608aba4a39401865fe381653c866d80c4.tar.gz
Again... there's no need to use CFLAGS to pass the audio device
in some file, use subst.mk and remove the patch.
Diffstat (limited to 'net')
-rw-r--r--net/rdesktop/Makefile9
-rw-r--r--net/rdesktop/distinfo3
-rw-r--r--net/rdesktop/patches/patch-ac13
3 files changed, 8 insertions, 17 deletions
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index c0cee3288d8..b559e755412 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -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= --prefix=${PREFIX}
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 --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index db0e92fc498..157745cd998 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -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 @@ SHA1 (rdesktop.patch) = 2ac6ed5c855f010d40daf46a18020a65ea6373d1
Size (rdesktop.patch) = 2348 bytes
SHA1 (patch-aa) = 1a28125cfc8cb58ba67c2c10209d0eca4681404e
SHA1 (patch-ab) = 2a86d850d0b3ee5e14ae6818c3ea492af558f22e
-SHA1 (patch-ac) = 2d00269140102a08a355c4890d08e0ec0c761a38
diff --git a/net/rdesktop/patches/patch-ac b/net/rdesktop/patches/patch-ac
deleted file mode 100644
index f965cb05e61..00000000000
--- a/net/rdesktop/patches/patch-ac
+++ /dev/null
@@ -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)
- {