Welcome to the long-awaited release of Ogg Vorbis 1.0!

16 files changed, 102 insertions, 122 deletions

diff --git a/audio/libao/Makefile b/audio/libao/Makefile
index 37aa309d81d1..993954d24786 100644
--- a/audio/libao/Makefile
+++ b/audio/libao/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	libao
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/ \
-		http://www.vorbis.com/files/rc3/unix/ \
-		http://www.oddsock.org/vorbisrc3/files/rc3/unix/
+MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
+		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
+		http://xiph.stratius.com/vorbis/unix/ \
+		http://www.oddsock.org/vorbis/unix/ \
+		http://www.casterclub.com/vorbis/unix/ \
+		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 
diff --git a/audio/libao/distinfo b/audio/libao/distinfo
index af5e64ea9611..344b89b8b6d3 100644
--- a/audio/libao/distinfo
+++ b/audio/libao/distinfo
@@ -1 +1 @@
-MD5 (libao-0.8.2.tar.gz) = 98b4eca7851a6650e639b9858db89e6e
+MD5 (libao-0.8.3.tar.gz) = b1422a6ff7f58131921b9f2fabe2295c
diff --git a/audio/libao/files/patch-src::plugins::oss::ao_oss.c b/audio/libao/files/patch-src::plugins::oss::ao_oss.c
deleted file mode 100644
index 3e4fdec63068..000000000000
--- a/audio/libao/files/patch-src::plugins::oss::ao_oss.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/plugins/oss/ao_oss.c.orig	Wed Apr 10 21:56:57 2002
-+++ src/plugins/oss/ao_oss.c	Wed Apr 10 21:57:11 2002
-@@ -32,8 +32,6 @@
- #include <math.h>
- #if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <soundcard.h>
--#elif defined(__FreeBSD__)
--#include <machine/soundcard.h>
- #else
- #include <sys/soundcard.h>
- #endif
diff --git a/audio/libao/files/patch-src_Makefile.in b/audio/libao/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..bd07eed3849c
--- /dev/null
+++ b/audio/libao/files/patch-src_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Sat Jul 20 15:27:46 2002
++++ src/Makefile.in	Sat Jul 20 15:27:54 2002
+@@ -99,7 +99,7 @@
+ lib_LTLIBRARIES = libao.la
+ 
+ libao_la_SOURCES = audio_out.c config.c ao_null.c ao_wav.c ao_au.c ao_raw.c ao_private.h
+-libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@ -ldl
++libao_la_LDFLAGS = -version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES = 
+ LTLIBRARIES =  $(lib_LTLIBRARIES)
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 238b33740858..755f51442c99 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	libogg
-PORTVERSION=	1.0.r3
-PORTREVISION=	1
-PORTEPOCH=	2
+PORTVERSION=	1.0
+PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/ \
-		http://www.vorbis.com/files/rc3/unix/ \
-		http://www.oddsock.org/vorbisrc3/files/rc3/unix/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
+		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
+		http://xiph.stratius.com/vorbis/unix/ \
+		http://www.oddsock.org/vorbis/unix/ \
+		http://www.casterclub.com/vorbis/unix/ \
+		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index d09db05683fc..bc078b4c0c81 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1 +1 @@
-MD5 (libogg-1.0rc3.tar.gz) = 6425cd5659aa7595b30f2c024d1b8eab
+MD5 (libogg-1.0.tar.gz) = 382a7089f42e6f82e7d658c1cb8ee236
diff --git a/audio/libogg/pkg-plist b/audio/libogg/pkg-plist
index 7d7ea1a7e035..4d846316fd8b 100644
--- a/audio/libogg/pkg-plist
+++ b/audio/libogg/pkg-plist
@@ -5,7 +5,7 @@ include/ogg/os_types.h
 lib/libogg.a
 lib/libogg.la
 lib/libogg.so
-lib/libogg.so.3
+lib/libogg.so.4
 share/aclocal/ogg.m4
 %%PORTDOCS%%share/doc/libogg/framing.html
 %%PORTDOCS%%share/doc/libogg/index.html
@@ -49,14 +49,12 @@ share/aclocal/ogg.m4
 %%PORTDOCS%%share/doc/libogg/ogg/ogg_sync_wrote.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_adv.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_adv1.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_adv_huff.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_bits.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_buffer.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_bytes.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_get_buffer.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_look.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_look1.html
-%%PORTDOCS%%share/doc/libogg/ogg/oggpack_look_huff.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_read.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_read1.html
 %%PORTDOCS%%share/doc/libogg/ogg/oggpack_readinit.html
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index ec127a2fe312..48c7345e8b9a 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.0.r3
-PORTREVISION=	1
-PORTEPOCH=	2
+PORTVERSION=	1.0
+PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/ \
-		http://www.vorbis.com/files/rc3/unix/ \
-		http://www.oddsock.org/vorbisrc3/files/rc3/unix/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
+		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
+		http://xiph.stratius.com/vorbis/unix/ \
+		http://www.oddsock.org/vorbis/unix/ \
+		http://www.casterclub.com/vorbis/unix/ \
+		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 
-LIB_DEPENDS=	ogg.3:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index ccb1989817b8..25dda361f5d5 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1 +1 @@
-MD5 (libvorbis-1.0rc3.tar.gz) = e3a0ce7718f698326504c76562315df2
+MD5 (libvorbis-1.0.tar.gz) = d1ad94fe8e240269c790e18992171e53
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 598d3a004e93..062fb396c971 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -5,20 +5,53 @@ include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.la
 lib/libvorbis.so
-lib/libvorbis.so.1
+lib/libvorbis.so.2
 lib/libvorbisenc.a
 lib/libvorbisenc.la
 lib/libvorbisenc.so
-lib/libvorbisenc.so.1
+lib/libvorbisenc.so.2
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.2
+lib/libvorbisfile.so.3
 share/aclocal/vorbis.m4
+%%PORTDOCS%%share/doc/libvorbis/components.png
+%%PORTDOCS%%share/doc/libvorbis/draft-moffitt-vorbis-rtp-00.txt
+%%PORTDOCS%%share/doc/libvorbis/eightphase.png
+%%PORTDOCS%%share/doc/libvorbis/evenlsp.png
+%%PORTDOCS%%share/doc/libvorbis/floor1-1.png
+%%PORTDOCS%%share/doc/libvorbis/floor1-2.png
+%%PORTDOCS%%share/doc/libvorbis/floor1-3.png
+%%PORTDOCS%%share/doc/libvorbis/floor1-4.png
+%%PORTDOCS%%share/doc/libvorbis/floor1_inverse_dB_table.html
+%%PORTDOCS%%share/doc/libvorbis/floorval.png
+%%PORTDOCS%%share/doc/libvorbis/fourphase.png
+%%PORTDOCS%%share/doc/libvorbis/framing.html
+%%PORTDOCS%%share/doc/libvorbis/helper.html
+%%PORTDOCS%%share/doc/libvorbis/hufftree-under.png
+%%PORTDOCS%%share/doc/libvorbis/hufftree.png
+%%PORTDOCS%%share/doc/libvorbis/index.html
+%%PORTDOCS%%share/doc/libvorbis/lspmap.png
+%%PORTDOCS%%share/doc/libvorbis/oddlsp.png
+%%PORTDOCS%%share/doc/libvorbis/oggstream.html
 %%PORTDOCS%%share/doc/libvorbis/programming.html
+%%PORTDOCS%%share/doc/libvorbis/residue-pack.png
+%%PORTDOCS%%share/doc/libvorbis/residue2.png
+%%PORTDOCS%%share/doc/libvorbis/squarepolar.png
+%%PORTDOCS%%share/doc/libvorbis/stereo.html
+%%PORTDOCS%%share/doc/libvorbis/stream.png
 %%PORTDOCS%%share/doc/libvorbis/v-comment.html
 %%PORTDOCS%%share/doc/libvorbis/vorbis-clip.txt
 %%PORTDOCS%%share/doc/libvorbis/vorbis-errors.txt
+%%PORTDOCS%%share/doc/libvorbis/vorbis-fidelity.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-ogg.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-bitpack.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-codebook.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-floor0.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-floor1.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-intro.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-ref.html
+%%PORTDOCS%%share/doc/libvorbis/vorbis-spec-res.html
 %%PORTDOCS%%share/doc/libvorbis/vorbis.html
 %%PORTDOCS%%share/doc/libvorbis/vorbisenc/index.html
 %%PORTDOCS%%share/doc/libvorbis/vorbisenc/overview.html
@@ -77,6 +110,8 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%share/doc/libvorbis/wait.png
 %%PORTDOCS%%share/doc/libvorbis/white-ogg.png
 %%PORTDOCS%%share/doc/libvorbis/white-xifish.png
+%%PORTDOCS%%share/doc/libvorbis/window1.png
+%%PORTDOCS%%share/doc/libvorbis/window2.png
 @dirrm include/vorbis
 %%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisenc
 %%PORTDOCS%%@dirrm share/doc/libvorbis/vorbisfile
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 5abdb96c68bd..f6f17057fedc 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -6,26 +6,32 @@
 #
 
 PORTNAME=	vorbis-tools
-PORTVERSION=	1.0.r3
-PORTREVISION=	4
-PORTEPOCH=	2
+PORTVERSION=	1.0
+PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.xiph.org/ogg/vorbis/download/ \
-		http://www.vorbis.com/files/rc3/unix/ \
-		http://www.oddsock.org/vorbisrc3/files/rc3/unix/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
+MASTER_SITES=	ftp://ftp.linuxpowered.com/pub/Vorbis/unix/ \
+		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
+		http://xiph.stratius.com/vorbis/unix/ \
+		http://www.oddsock.org/vorbis/unix/ \
+		http://www.casterclub.com/vorbis/unix/ \
+		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 
 LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
 		curl.2:${PORTSDIR}/ftp/curl \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		vorbis.1:${PORTSDIR}/audio/libvorbis
+		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=		ogg123.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
+MAN1=		ogg123.1 oggdec.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
+
+post-install:
+	${MKDIR} ${PREFIX}/share/examples/vorbis-tools
+	${INSTALL_DATA} ${WRKSRC}/ogg123/ogg123rc-example \
+		${PREFIX}/share/examples/vorbis-tools/ogg123rc
 
 .include <bsd.port.mk>
diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo
index 3cdf621e7eaf..823144c91a14 100644
--- a/audio/vorbis-tools/distinfo
+++ b/audio/vorbis-tools/distinfo
@@ -1 +1 @@
-MD5 (vorbis-tools-1.0rc3.tar.gz) = c28c6b28cddb1d7027afd9a47a0d7b9c
+MD5 (vorbis-tools-1.0.tar.gz) = c0a9fee54835e9c5b32d1f42c02964c9
diff --git a/audio/vorbis-tools/files/patch-ogg123::buffer.c b/audio/vorbis-tools/files/patch-ogg123::buffer.c
deleted file mode 100644
index 409b5ed97505..000000000000
--- a/audio/vorbis-tools/files/patch-ogg123::buffer.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD$
-
---- ogg123/buffer.c.orig	Thu Dec 20 01:24:53 2001
-+++ ogg123/buffer.c	Sat Jan 19 16:24:44 2002
-@@ -85,12 +85,6 @@
-   buf_t *buf = (buf_t *)arg;
- 
-   DEBUG("Enter buffer_thread_cleanup");
--
--  /* Cleanup thread data structures */
--  pthread_mutex_unlock(&buf->mutex);
--  pthread_mutex_destroy(&buf->mutex);
--  pthread_cond_destroy(&buf->playback_cond);
--  pthread_cond_destroy(&buf->write_cond);
- }
- 
- 
-@@ -430,6 +424,12 @@
- void buffer_destroy (buf_t *buf)
- {
-   DEBUG("buffer_destroy");
-+
-+  /* Cleanup pthread variables */
-+  pthread_mutex_destroy(&buf->mutex);
-+  pthread_cond_destroy(&buf->write_cond);
-+  pthread_cond_destroy(&buf->playback_cond);
-+  
-   free(buf);
- }
- 
diff --git a/audio/vorbis-tools/files/patch-oggenc::audio.c b/audio/vorbis-tools/files/patch-oggenc::audio.c
deleted file mode 100644
index 997207d3b7fd..000000000000
--- a/audio/vorbis-tools/files/patch-oggenc::audio.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- oggenc/audio.c.orig	Sat Dec  8 03:23:01 2001
-+++ oggenc/audio.c	Tue Mar 26 03:32:57 2002
-@@ -570,6 +570,7 @@
- 	wav->bigendian =     0;
- 	wav->channels =      format.channels;
- 	wav->samplesize =    opt->samplesize;
-+	wav->totalsamples =  0;
- 
- 	opt->read_samples = wav_read;
- 	opt->readdata = (void *)wav;
diff --git a/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1 b/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1
deleted file mode 100644
index 77a71037c4fb..000000000000
--- a/audio/vorbis-tools/files/patch-oggenc::man::oggenc.1
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$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
- 
diff --git a/audio/vorbis-tools/pkg-plist b/audio/vorbis-tools/pkg-plist
index 213c84b5d8e0..85a5e126d508 100644
--- a/audio/vorbis-tools/pkg-plist
+++ b/audio/vorbis-tools/pkg-plist
@@ -1,6 +1,12 @@
 @comment $FreeBSD$
 bin/ogg123
+bin/oggdec
 bin/oggenc
 bin/ogginfo
 bin/vcut
 bin/vorbiscomment
+share/examples/vorbis-tools/ogg123rc
+share/locale/fr/LC_MESSAGES/vorbis-tools.mo
+share/locale/nl/LC_MESSAGES/vorbis-tools.mo
+share/locale/sv/LC_MESSAGES/vorbis-tools.mo
+@dirrm share/examples/vorbis-tools