Use the audio device pointed to by DEVOSSAUDIO, instead of hardcoding

/dev/audio in patches.  Bump PKGREVISION to 5 to force a rebuild.
Found by veego@.

4 files changed, 14 insertions, 25 deletions

diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index a31ae46d7ac..390134ec5a6 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/22 10:00:31 jmmv Exp $
 
 DISTNAME=	fxtv-1.03
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tgz
@@ -18,6 +18,13 @@ USE_X11BASE=	YES
 USE_GNU_TOOLS+=	make
 XAW_TYPE?=	3d
 
+SUBST_CLASSES+=		ossaudio
+SUBST_MESSAGE.ossaudio=	"Fixing path to audio device."
+SUBST_STAGE.ossaudio=	pre-configure
+SUBST_FILES.ossaudio=	app_rsrc.h
+SUBST_FILES.ossaudio+=	Fxtv
+SUBST_SED.ossaudio=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
+
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_ENV+=	X11PREFIX=${X11PREFIX}
diff --git a/multimedia/fxtv/distinfo b/multimedia/fxtv/distinfo
index 6306fa47116..08d3266b9fe 100644
--- a/multimedia/fxtv/distinfo
+++ b/multimedia/fxtv/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 11:36:35 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/02/22 10:00:31 jmmv Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 Size (fxtv-1.03.tgz) = 198669 bytes
 SHA1 (patch-aa) = cd994d512fe99e962cc9c505285da63d1421f81e
 SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
-SHA1 (patch-ad) = 39eb6a889ef76c27f2dd296385d9247c703db9eb
+SHA1 (patch-ad) = daea79659e2b7af142ca101601887d58239f35d7
 SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
 SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
 SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
 SHA1 (patch-ah) = 896d5164b176154b398f52d5c9887210da3d1e77
 SHA1 (patch-ai) = 85baa4b457dede91bf74ce0d8e4655fae9da2d96
-SHA1 (patch-aj) = 9a9427ba6c9d092e57f652bd6c278c96f9ba6d1c
+SHA1 (patch-aj) = d614a3b8813b07eaf4c17ae20b492b008df1f5d6
 SHA1 (patch-ak) = 87e4f9636aa798f9f0f5a4e27a936f800461667a
 SHA1 (patch-al) = d60ac498f40cd9ec833ca436708cb140856826f1
 SHA1 (patch-ba) = 20efae40631bdb5be57e12445bf2135a47952763
diff --git a/multimedia/fxtv/patches/patch-ad b/multimedia/fxtv/patches/patch-ad
index cf2da943717..222b1314f87 100644
--- a/multimedia/fxtv/patches/patch-ad
+++ b/multimedia/fxtv/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
+$NetBSD: patch-ad,v 1.2 2004/02/22 10:00:31 jmmv Exp $
 
 --- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
 +++ app_rsrc.h
@@ -28,15 +28,6 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/01/26 11:36:38 jmmv Exp $
     { "-noafc"              , RNafc            , XrmoptionNoArg , pFALSE      },
     { "-disableDirectV"     , RNdisableDirectV , XrmoptionNoArg , pTRUE       },
     { "-remoteType"         , RNremoteType     , XrmoptionSepArg, NULL        },
-@@ -389,7 +394,7 @@ static XtResource Resources[] = {
-         (XtPointer) True },
-     { RNdspDevice, RCaudioDevice, XtRString, sizeof(String),
-         XtOffsetOf(AppResources, dsp_device ), XtRImmediate,
--        "/dev/dsp"  },
-+        "/dev/audio"  },
-     { RNmixerDevice, RCaudioDevice, XtRString, sizeof(String),
-         XtOffsetOf(AppResources, mixer_device ), XtRImmediate,
-         "/dev/mixer"  },
 @@ -434,6 +439,10 @@ static XtResource Resources[] = {
          XtOffsetOf(AppResources, Bpp_32bit), XtRString,
          "-1" /*  0 = Guess */ },   
diff --git a/multimedia/fxtv/patches/patch-aj b/multimedia/fxtv/patches/patch-aj
index 77468e22ca0..1eb4a5e69a8 100644
--- a/multimedia/fxtv/patches/patch-aj
+++ b/multimedia/fxtv/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
+$NetBSD: patch-aj,v 1.2 2004/02/22 10:00:31 jmmv Exp $
 
 --- Fxtv.orig	2003-09-28 17:38:29.000000000 +0200
 +++ Fxtv	2003-09-28 17:38:29.000000000 +0200
@@ -11,15 +11,6 @@ $NetBSD: patch-aj,v 1.1.1.1 2004/01/26 11:36:40 jmmv Exp $
  Fxtv*afc:      		False
                                          ! Automatic Frequency Control
  !Fxtv*remoteType:	Hauppauge
-@@ -57,7 +59,7 @@
- 
- ! Method to override audio device
- !Fxtv*doSound:          true
--!Fxtv*dspDevice:        /dev/dsp
-+!Fxtv*dspDevice:        /dev/audio
- !Fxtv*mixerDevice:      /dev/mixer
- !Fxtv*mixerChannel:     line
-                                         ! line, line1/2/3, cd, mic, video
 @@ -320,6 +322,7 @@
  *imageSaveDialog*suffixLabel.label:            Append Img # Suffix
  *imageSaveDialog*formatLabel.label:            Format: