update to 12.17.1.

change MASTER_SITES to ${MASTER_SITE_SOURCEFORGE}.

Submitted by: maintainer

4 files changed, 6 insertions, 153 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 986d1f406775..451b39ac31f6 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	sox
-PORTVERSION=	12.16
+PORTVERSION=	12.17.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	apps/sound/convert
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	sox
 
 MAINTAINER=	dnelson@emsphone.com
 
-MAN1=		sox.1 play.1
+MAN1=		sox.1 play.1 soxexam.1
 MLINKS=		play.1 rec.1
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw --with-oss-dsp
+CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw
 
 .if defined(WITH_GSM)
 CONFIGURE_ARGS+= --with-gsmlib=${PREFIX}/lib --with-gsminc=${PREFIX}/include
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index 8fe4fc54d72a..da97ebdcf367 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1 +1 @@
-MD5 (sox-12.16.tar.gz) = 704e897a71213565c3c46cc17176b247
+MD5 (sox-12.17.1.tar.gz) = 9afc59e4c5221462a24fa6092038b6b3
diff --git a/audio/sox/files/patch-aa b/audio/sox/files/patch-aa
deleted file mode 100644
index c3b6dc1d6e12..000000000000
--- a/audio/sox/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6051714d573c..000000000000
--- a/audio/sox/files/patch-ab
+++ /dev/null
@@ -1,123 +0,0 @@
-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*