Make this packages OSS-aware.

5 files changed, 34 insertions, 14 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 095bc368380..b70bd758fb5 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2002/08/28 06:16:07 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2002/10/18 14:02:12 jlam Exp $
 # FreeBSD ID: Makefile,v 1.8 1997/01/06 12:04:12 jkh Exp
 #
 
@@ -17,8 +17,19 @@ USE_BUILDLINK2=		# defined
 USE_IMAKE=		# defined
 USE_X11BASE=		# defined
 
+pre-configure:
+	cd ${WRKSRC}; for file in					\
+		server/nasd.conf.eg					\
+		server/dda/voxware/auvoxware.c;				\
+	do								\
+		${SED}	-e "s|@DEVOSSAUDIO@|${DEVOSSAUDIO}|g"		\
+			$${file} >> $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
 PLIST_SRC=	${PKGDIR}/PLIST.clients
 .if ${MACHINE_ARCH} == "i386"
+.  include "../../mk/ossaudio.buildlink2.mk"
 PLIST_SRC+=	${PKGDIR}/PLIST.voxware
 .endif
 
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index c28afb35faa..da13d321536 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/07/14 13:35:12 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/10/18 14:02:12 jlam Exp $
 
 SHA1 (nas-1.4.2.src.tar.gz) = 39634818e5719a850eecf751bbccd98758721e4b
 Size (nas-1.4.2.src.tar.gz) = 816938 bytes
 SHA1 (patch-aa) = 344776f3bd3e24664c5cb675aea047b7de645f00
-SHA1 (patch-ab) = b6ab1bc67bb46e5ef483a3da6010097b6349745b
-SHA1 (patch-ac) = 5fe9a1fa688d95a3b201c50e1b309224a8429797
-SHA1 (patch-ad) = b0d5bfac931ce859734006ce9642cd251af6ba88
+SHA1 (patch-ab) = e749e6d8517b91a1b362ec50566edfb7c07ea24c
+SHA1 (patch-ac) = 77e8b791a63240e59cbc73c9e20b5874e4acea5c
+SHA1 (patch-ad) = 56c089c327066eec55655974bac8b56442fa7fcb
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index aed63af1657..75f27446e92 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.6 2001/07/14 13:35:13 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2002/10/18 14:02:12 jlam Exp $
 
---- server/Imakefile.orig	Tue Dec 12 23:45:48 2000
+--- server/Imakefile.orig	Tue Dec 12 20:45:48 2000
 +++ server/Imakefile
-@@ -217,10 +217,11 @@
+@@ -38,7 +38,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
+      EXTENSIONS = 
+          XAULIB = 
+        XDMCPLIB = 
+-             OS = os/libos.a $(XAULIB) $(XDMCPLIB)
++             OS = os/libos.a $(XAULIB) $(XDMCPLIB) $(LIBOSSAUDIO)
+         BSDEMUL = $(LIBSRC)/Berk/Berklib.o
+             MFB =
+             CFB =
+@@ -217,10 +217,11 @@ clean::
  	$(RM) $(ALL)
  
   ETCDIR = NasConfigSearchPath
diff --git a/audio/nas/patches/patch-ac b/audio/nas/patches/patch-ac
index 43373a48730..dd9ca28758e 100644
--- a/audio/nas/patches/patch-ac
+++ b/audio/nas/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2002/10/18 14:02:13 jlam Exp $
 
 --- server/nasd.conf.eg.orig	Sat Jan  1 22:03:50 2000
 +++ server/nasd.conf.eg	Thu Aug  3 21:11:29 2000
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
  inputsection
  
 -	device		"/dev/dsp1"		# the SB emulation on my PAS16
-+	device		"/dev/audio"
++	device		"@DEVOSSAUDIO@"
  	maxrate		11025
  	minrate		4000			# Kind of redundant
  	maxfrags	3			# We want really low latency
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.4 2000/08/04 01:31:56 jlam Exp $
  # These are used by voxware only for now.
  outputsection
 -	device		"/dev/dsp"		# the full 16 bit interface!
-+	device		"/dev/audio"
++	device		"@DEVOSSAUDIO@"
  	maxrate		33000			# is flakey on my OPTi mb at 44
  	minrate		5000			# Redundant again
  	maxfrags	3			# Low latency (for doom!)
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
index 8a4c04d71a3..e42348fe305 100644
--- a/audio/nas/patches/patch-ad
+++ b/audio/nas/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $
+$NetBSD: patch-ad,v 1.8 2002/10/18 14:02:13 jlam Exp $
 
 --- server/dda/voxware/auvoxware.c.orig	Thu Oct  5 20:39:16 2000
 +++ server/dda/voxware/auvoxware.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $
  	3,			/* minFrags */
  	32,			/* maxFrags */
 +#if defined(__NetBSD__)
-+	"/dev/audio",		/* device */
++	"@DEVOSSAUDIO@",		/* device */
 +#else
  	"/dev/dsp1",		/* device */
 +#endif
@@ -19,7 +19,7 @@ $NetBSD: patch-ad,v 1.7 2001/07/14 13:35:13 jlam Exp $
  	3,			/* minFrags */
  	32,			/* maxFrags */
 +#if defined(__NetBSD__)
-+	"/dev/audio",		/* device */
++	"@DEVOSSAUDIO@",		/* device */
 +#else
  	"/dev/dsp",		/* device */
 +#endif