Upgrade to Ogg Vorbis RC3.

PR:	33727, 33728, 33729, 33731

5 files changed, 82 insertions, 11 deletions

diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 41bb8b8d2c04..9d5985ae77b5 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.0.r2
+PORTVERSION=	1.0.r3
 PORTEPOCH=	2
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/rc2/unix/
+MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/ \
+		http://www.vorbis.com/files/rc2/unix/ \
+		http://www.oddsock.org/vorbisrc3/files/rc3/unix/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	naddy@FreeBSD.org
 
-LIB_DEPENDS=	ao.2:${PORTSDIR}/audio/libao \
-		ogg.2:${PORTSDIR}/audio/libogg \
-		vorbis.0:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
+		ogg.3:${PORTSDIR}/audio/libogg \
+		vorbis.1:${PORTSDIR}/audio/libvorbis \
+		curl.2:${PORTSDIR}/ftp/curl
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-ao-prefix=${LOCALBASE} \
-		--with-ogg-prefix=${LOCALBASE} \
-		--with-vorbis-prefix=${LOCALBASE}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-ao=${LOCALBASE} \
+		--with-ogg=${LOCALBASE} \
+		--with-vorbis=${LOCALBASE} \
+		--with-curl=${LOCALBASE}
 
-MAN1=		ogg123.1 oggenc.1 ogginfo.1
+MAN1=		ogg123.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
 
 .include <bsd.port.mk>
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index 7d0701833aa7..3cdf621e7eaf 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1 +1 @@
-MD5 (vorbis-tools-1.0rc2.tar.gz) = 2c8acbc323c701bed290293cf7928554
+MD5 (vorbis-tools-1.0rc3.tar.gz) = c28c6b28cddb1d7027afd9a47a0d7b9c
diff --git a/audio/vorbis-tools/files/patch-configure b/audio/vorbis-tools/files/patch-configure
new file mode 100644
index 000000000000..4c28d162f384
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-configure
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Jan  2 01:35:43 2002
++++ configure	Wed Jan  2 01:35:59 2002
+@@ -5342,7 +5342,7 @@
+                 ;;
+         *)
+                 DEBUG="-g"
+-                CFLAGS="-O"
++                CFLAGS=""
+                 PROFILE="-g -p"
+                 ;;
+         esac
+@@ -5365,8 +5365,8 @@
+                 ;;
+         *)
+                 DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O20 -fsigned-char"
+-                PROFILE="-O20 -g -pg -fsigned-char"
++                CFLAGS="-fsigned-char"
++                PROFILE="-g -pg -fsigned-char"
+                 ;;
+         esac
+ fi
diff --git a/audio/vorbis-tools/files/patch-ogg123::buffer.c b/audio/vorbis-tools/files/patch-ogg123::buffer.c
new file mode 100644
index 000000000000..f7523092ac85
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-ogg123::buffer.c
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- ogg123/buffer.c.orig	Thu Dec 20 01:24:53 2001
++++ ogg123/buffer.c	Wed Jan 16 03:26:15 2002
+@@ -88,9 +88,11 @@
+ 
+   /* Cleanup thread data structures */
+   pthread_mutex_unlock(&buf->mutex);
++#if 0	/* KLUDGE: disabling this keeps ogg123 from crashing */
+   pthread_mutex_destroy(&buf->mutex);
+   pthread_cond_destroy(&buf->playback_cond);
+   pthread_cond_destroy(&buf->write_cond);
++#endif
+ }
+ 
+ 
diff --git a/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1 b/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1
new file mode 100644
index 000000000000..77a71037c4fb
--- /dev/null
+++ b/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- oggenc/man/oggenc.1.orig	Wed Dec 19 07:46:57 2001
++++ oggenc/man/oggenc.1	Wed Jan 16 03:27:33 2002
+@@ -1,7 +1,7 @@
+ .\" Process this file with
+ .\" groff -man -Tascii oggenc.1
+ .\"
+-.TH oggenc 1 "2001 August 13" "" "Vorbis Tools release candidate 2"
++.TH oggenc 1 "2001 August 13" "" "Vorbis Tools"
+ 
+ .SH NAME
+ oggenc \- encode audio into the Ogg Vorbis format
+@@ -231,10 +231,6 @@
+ Manpage Author:
+ .br
+ Stan Seibert <indigo@aztec.asu.edu>
+-
+-.SH BUGS
+-Options -m, -M, and -q for for flexible bitrate/quality selection exist, but are not
+-implemented in the vorbis encoder, and so are not documented here yet.
+ 
+ .SH SEE ALSO
+