Update to Ogg Vorbis 1.0.1.

Major user-visible change: vorbis-tools now integrates some support for
flac and speex files.

5 files changed, 33 insertions, 26 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 8aa7fd71be65..6fd9a12933b2 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -6,21 +6,18 @@
 #
 
 PORTNAME=	libvorbis
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 PORTEPOCH=	3
 CATEGORIES=	audio
-MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/ \
-		ftp://ftp.wiles.org/pub/mirrors/Vorbis/unix/ \
-		http://www.casterclub.com/vorbis/unix/ \
-		http://www.math.utoledo.edu/~chaese/Vorbis/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
 
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Audio compression codec library
 
-LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_LIBTOOL=	yes
+USE_GNOME=	gnomehack
 CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 INSTALLS_SHLIB=	yes
 
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 25dda361f5d5..be1eb4ea5347 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1 +1 @@
-MD5 (libvorbis-1.0.tar.gz) = d1ad94fe8e240269c790e18992171e53
+MD5 (libvorbis-1.0.1.tar.gz) = 4d6726fd02ce02f6e24824e594b0949a
diff --git a/audio/libvorbis/files/patch-Makefile.in b/audio/libvorbis/files/patch-Makefile.in
index 34617ba89d39..68c18842b349 100644
--- a/audio/libvorbis/files/patch-Makefile.in
+++ b/audio/libvorbis/files/patch-Makefile.in
@@ -1,12 +1,14 @@
+
 $FreeBSD$
---- Makefile.in.orig	Tue Jul 17 02:38:23 2001
-+++ Makefile.in	Tue Jul 17 02:40:02 2001
-@@ -87,7 +87,7 @@ pthread_lib = @pthread_lib@
+
+--- Makefile.in.orig	Sun Dec  7 04:04:51 2003
++++ Makefile.in	Sun Dec  7 04:08:24 2003
+@@ -106,7 +106,7 @@
  
  AUTOMAKE_OPTIONS = foreign dist-zip
  
 -SUBDIRS = lib include doc examples win32 debian vq
-+SUBDIRS = lib include $(DOC) examples win32 debian vq
++SUBDIRS = lib include $(DOC)
  
- m4datadir = $(datadir)/aclocal
+ m4datadir = $(prefix)/share/aclocal
  m4data_DATA = vorbis.m4
diff --git a/audio/libvorbis/pkg-descr b/audio/libvorbis/pkg-descr
index b19883c60efd..a41d92020e2d 100644
--- a/audio/libvorbis/pkg-descr
+++ b/audio/libvorbis/pkg-descr
@@ -18,4 +18,4 @@ This package contains:
 - libvorbisenc, a BSD-license library that provides a simple,
   programmatic encoding setup interface.
 
-WWW: http://www.xiph.org/ogg/
+WWW: http://www.xiph.org/ogg/vorbis/
diff --git a/audio/libvorbis/pkg-plist b/audio/libvorbis/pkg-plist
index 3eb1d3d537c5..8a5ce5419917 100644
--- a/audio/libvorbis/pkg-plist
+++ b/audio/libvorbis/pkg-plist
@@ -4,16 +4,19 @@ include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.so
-lib/libvorbis.so.2
+lib/libvorbis.so.3
 lib/libvorbisenc.a
 lib/libvorbisenc.so
 lib/libvorbisenc.so.2
 lib/libvorbisfile.a
 lib/libvorbisfile.so
-lib/libvorbisfile.so.3
+lib/libvorbisfile.so.4
+libdata/pkgconfig/vorbis.pc
+libdata/pkgconfig/vorbisenc.pc
+libdata/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/components.png
-%%PORTDOCS%%%%DOCSDIR%%/draft-moffitt-vorbis-rtp-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-kerr-avt-vorbis-rtp-02.txt
 %%PORTDOCS%%%%DOCSDIR%%/eightphase.png
 %%PORTDOCS%%%%DOCSDIR%%/evenlsp.png
 %%PORTDOCS%%%%DOCSDIR%%/floor1-1.png
@@ -41,14 +44,6 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-clip.txt
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-errors.txt
 %%PORTDOCS%%%%DOCSDIR%%/vorbis-fidelity.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-ogg.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-bitpack.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-codebook.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-floor0.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-floor1.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-intro.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-ref.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbis-spec-res.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbis.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/index.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/overview.html
@@ -59,8 +54,10 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_encode_init_vbr.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisenc/vorbis_info.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/OggVorbis_File.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/chaining_example_c.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/chainingexample.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/crosslap.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/datastructures.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/decoding.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/example.html
@@ -73,13 +70,18 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_clear.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_comment.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_crosslap.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_info.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_open.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_open_callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_seek_lap.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_seek_page.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_seek_page_lap.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_tell.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_pcm_total.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_seek_lap.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_tell.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_raw_total.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_read.html
@@ -91,15 +93,21 @@ share/aclocal/vorbis.m4
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_test_callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_test_open.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_seek.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_seek_lap.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_seek_page.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_seek_page_lap.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_tell.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/ov_time_total.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/overview.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/return.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seekexample.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seeking.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seeking_example_c.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seeking_test_c.html
-%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/seekingexample.html
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/style.css
+%%PORTDOCS%%%%DOCSDIR%%/vorbisfile/threads.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbis_comment.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbis_info.html
 %%PORTDOCS%%%%DOCSDIR%%/vorbisfile/vorbisfile_example_c.html