Fix the build for systems without /dev/dsp. Update the master site, and

md5 checksum (version bump? no, just a file change! grr!).

Submitted by:	Dan Nelson <dnelson@emsphone.com>

4 files changed, 152 insertions, 4 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 2747739b0263..a6da6f55f75e 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -3,18 +3,19 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp $
+# $Id: Makefile,v 1.10 1999/07/18 04:33:20 green Exp $
 #
 
 DISTNAME=	sox-12.16
 CATEGORIES=	audio
-MASTER_SITES=	http://home.sprynet.com/~cbagwell/
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	apps/sound/convert
 
 MAINTAINER=	dnelson@emsphone.com
 
 MAN1=		sox.1 play.1
 MLINKS=		play.1 rec.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw
+CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw --with-oss-dsp
 
 .include <bsd.port.mk>
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index 9675ab315ab5..8fe4fc54d72a 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1 +1 @@
-MD5 (sox-12.16.tar.gz) = c42277b664f46514f2fb35221795dcfa
+MD5 (sox-12.16.tar.gz) = 704e897a71213565c3c46cc17176b247
diff --git a/audio/sox/files/patch-aa b/audio/sox/files/patch-aa
new file mode 100644
index 000000000000..c3b6dc1d6e12
--- /dev/null
+++ b/audio/sox/files/patch-aa
@@ -0,0 +1,24 @@
+make --with-oss-dsp still check to see that the header files exist.
+
+--- configure.in.old	Sun Jul 18 13:57:27 1999
++++ configure.in	Sat Jul 24 22:08:09 1999
+@@ -194,13 +194,13 @@
+ 			ac_cv_dev_oss_dsp=no,
+ 			ac_cv_dev_oss_dsp=no)
+ 		)
+-	if test "$ac_cv_dev_oss_dsp" = yes
++fi
++if test "$ac_cv_dev_oss_dsp" = yes -o "$oss_dsp" = yes
++then
++	AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, oss_dsp=yes, oss_dsp=no)
++	if test "$oss_dsp" = no
+ 	then
+-		AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, oss_dsp=yes)
+-		if test "$oss_dsp" = auto
+-		then
+-			AC_WARN([No soundcard.h to compile with OSS /dev/dsp])
+-		fi
++		AC_WARN([No soundcard.h to compile with OSS /dev/dsp])
+ 	fi
+ fi
+ if test "$oss_dsp" = yes
diff --git a/audio/sox/files/patch-ab b/audio/sox/files/patch-ab
new file mode 100644
index 000000000000..6051714d573c
--- /dev/null
+++ b/audio/sox/files/patch-ab
@@ -0,0 +1,123 @@
+autoconf'ed version of patch-aa (make --with-oss-dsp still check to see
+that the header files exist).
+
+--- configure.old	Sat Jul 24 22:15:19 1999
++++ configure	Sat Jul 24 22:15:23 1999
+@@ -1549,23 +1549,24 @@
+ fi
+ 
+ echo "$ac_t""$ac_cv_dev_oss_dsp" 1>&6
+-	if test "$ac_cv_dev_oss_dsp" = yes
+-	then
+-		for ac_hdr in sys/soundcard.h machine/soundcard.h
++fi
++if test "$ac_cv_dev_oss_dsp" = yes -o "$oss_dsp" = yes
++then
++	for ac_hdr in sys/soundcard.h machine/soundcard.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:1559: checking for $ac_hdr" >&5
++echo "configure:1560: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1564 "configure"
++#line 1565 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1588,13 +1589,13 @@
+  oss_dsp=yes
+ else
+   echo "$ac_t""no" 1>&6
++oss_dsp=no
+ fi
+ done
+ 
+-		if test "$oss_dsp" = auto
+-		then
+-			echo "configure: warning: No soundcard.h to compile with OSS /dev/dsp" 1>&2
+-		fi
++	if test "$oss_dsp" = no
++	then
++		echo "configure: warning: No soundcard.h to compile with OSS /dev/dsp" 1>&2
+ 	fi
+ fi
+ if test "$oss_dsp" = yes
+@@ -1607,7 +1608,7 @@
+ if test "$sun_audio" = auto
+ then
+ 	echo $ac_n "checking whether /dev/audio is functional (SUN style)""... $ac_c" 1>&6
+-echo "configure:1611: checking whether /dev/audio is functional (SUN style)" >&5
++echo "configure:1612: checking whether /dev/audio is functional (SUN style)" >&5
+ if eval "test \"`echo '$''{'ac_cv_dev_sun_audio'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1615,7 +1616,7 @@
+   ac_cv_dev_sun_audio=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1619 "configure"
++#line 1620 "configure"
+ #include "confdefs.h"
+ 
+ 			int
+@@ -1631,7 +1632,7 @@
+ 				}
+ 			
+ EOF
+-if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_dev_sun_audio=yes
+ else
+@@ -1651,17 +1652,17 @@
+ 	then
+ 		ac_safe=`echo "sys/audioio.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sys/audioio.h""... $ac_c" 1>&6
+-echo "configure:1655: checking for sys/audioio.h" >&5
++echo "configure:1656: checking for sys/audioio.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1660 "configure"
++#line 1661 "configure"
+ #include "confdefs.h"
+ #include <sys/audioio.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1684,17 +1685,17 @@
+ 
+ 		ac_safe=`echo "sun/audioio.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for sun/audioio.h""... $ac_c" 1>&6
+-echo "configure:1688: checking for sun/audioio.h" >&5
++echo "configure:1689: checking for sun/audioio.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1693 "configure"
++#line 1694 "configure"
+ #include "confdefs.h"
+ #include <sun/audioio.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*