Fix PR 8678 by Thomas Klausner <wiz@danbala.ifoer.tuwien.ac.at>:

 - Prevent configure from picking up any stray /dev/dsp's and believing
   it should use OSS
 - In the play script, add proper arguments if ran on NetBSD
 - Fix the $PATH setting in the play script

4 files changed, 41 insertions, 4 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 18e7ecc21bb..e42a3a282e3 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/09/29 23:48:14 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 1999/10/26 01:31:01 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp 
 #
 
@@ -12,6 +12,14 @@ HOMEPAGE=	http://home.sprynet.com/~cbagwell/sox.html
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-fast-ulaw \
 		--enable-fast-alaw \
-		--with-sun-audio
+		--with-sun-audio \
+		--without-oss-dsp
+
+pre-build:
+		cd ${WRKSRC} ; \
+		[ -f play.BAK ] || ${MV} play play.BAK ; \
+		${SED} \
+			-e 's|@PREFIX@|${PREFIX}|g' \
+			< play.BAK >play
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/files/patch-sum b/audio/sox/files/patch-sum
index 85434a2703b..b5e176bd965 100644
--- a/audio/sox/files/patch-sum
+++ b/audio/sox/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/09/29 23:48:15 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 1999/10/26 01:31:03 hubertf Exp $
 
-MD5 (patch-aa) = e2aa8254aa54ecb572e2e25b2e5d061b
+MD5 (patch-aa) = cd51cb79c99a7e3c42242ef2b25435e7
+MD5 (patch-ab) = 6af49267e1bc93ee3c94133be56db1f5
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
index 2cc1e1b3ea6..2a8bf43f1d8 100644
--- a/audio/sox/patches/patch-aa
+++ b/audio/sox/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.5 1999/10/26 01:31:04 hubertf Exp $
+
 --- sunaudio.c.orig	Sun Jul 18 20:57:36 1999
 +++ sunaudio.c	Thu Sep 30 01:43:33 1999
 @@ -17,7 +17,10 @@
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
new file mode 100644
index 00000000000..2cf331986bc
--- /dev/null
+++ b/audio/sox/patches/patch-ab
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.5 1999/10/26 01:31:07 hubertf Exp $
+
+--- play.orig	Tue Oct 26 03:16:27 1999
++++ play	Tue Oct 26 03:19:33 1999
+@@ -14,7 +14,7 @@
+ 
+ # Set up path so that it can find Sox if user's path doesn't already
+ # include it.
+-PATH=$PATH:/usr/local/bin
++PATH=$PATH:@PREFIX@/bin
+ program_name=`basename $0`
+ program_version="2.0"
+ 
+@@ -171,6 +171,12 @@
+     esac
+     if [ -z "$device" ]; then
+ 	device="/dev/audio"
++    fi
++    ;;
++  NetBSD)
++    arch_defines="-t sunau"
++    if [ -z "$device" ]; then
++        device="/dev/audio"
+     fi
+     ;;
+   Linux|FreeBSD)