Update from 1.0.0.6 (1.0 rc2) to 1.0.0.7 (1.0 rc3).

No real notable changes.

7 files changed, 33 insertions, 26 deletions

diff --git a/audio/libvorbis/DESCR b/audio/libvorbis/DESCR
index 51bff1b5ca6..d248a17fdc9 100644
--- a/audio/libvorbis/DESCR
+++ b/audio/libvorbis/DESCR
@@ -12,3 +12,5 @@ patent concerns.
 This package doesn't install the example executables:
 chaining_example, decoder_example, encoder_example,
 seeking_example, and vorbisfile_example.
+
+This package is libvorbis 1.0 rc3
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 80391850691..464f7d629ca 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/12/30 08:00:46 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2002/01/02 12:39:36 lukem Exp $
 
-DISTNAME=	libvorbis-1.0rc2
-PKGNAME=	libvorbis-1.0.0.6
+DISTNAME=	libvorbis-1.0rc3
+PKGNAME=	libvorbis-1.0.0.7
 CATEGORIES=	devel audio
-MASTER_SITES=	http://www.vorbis.com/files/rc2/unix/
+MASTER_SITES=	http://www.vorbis.com/files/rc3/unix/
 
 MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 9b113bc28f8..99a1c732705 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,22 +1,22 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:11 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/02 12:39:36 lukem Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
 lib/libvorbis.a
 lib/libvorbis.la
 lib/libvorbis.so
-lib/libvorbis.so.0
-lib/libvorbis.so.0.1
+lib/libvorbis.so.1
+lib/libvorbis.so.1.0
 lib/libvorbisenc.a
 lib/libvorbisenc.la
 lib/libvorbisenc.so
-lib/libvorbisenc.so.0
-lib/libvorbisenc.so.0.1
+lib/libvorbisenc.so.1
+lib/libvorbisenc.so.1.0
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.1
-lib/libvorbisfile.so.1.0
+lib/libvorbisfile.so.2
+lib/libvorbisfile.so.2.0
 share/aclocal/vorbis.m4
 share/doc/html/${DISTNAME}/programming.html
 share/doc/html/${DISTNAME}/v-comment.html
@@ -29,6 +29,7 @@ share/doc/html/${DISTNAME}/vorbisenc/reference.html
 share/doc/html/${DISTNAME}/vorbisenc/style.css
 share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_ctl.html
 share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_init.html
+share/doc/html/${DISTNAME}/vorbisenc/vorbis_encode_init_vbr.html
 share/doc/html/${DISTNAME}/vorbisenc/vorbis_info.html
 share/doc/html/${DISTNAME}/vorbisfile/OggVorbis_File.html
 share/doc/html/${DISTNAME}/vorbisfile/chaining_example_c.html
@@ -55,9 +56,13 @@ share/doc/html/${DISTNAME}/vorbisfile/ov_raw_seek.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_raw_tell.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_raw_total.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_read.html
+share/doc/html/${DISTNAME}/vorbisfile/ov_read_float.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_seekable.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_serialnumber.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_streams.html
+share/doc/html/${DISTNAME}/vorbisfile/ov_test.html
+share/doc/html/${DISTNAME}/vorbisfile/ov_test_callbacks.html
+share/doc/html/${DISTNAME}/vorbisfile/ov_test_open.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_time_seek.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_time_tell.html
 share/doc/html/${DISTNAME}/vorbisfile/ov_time_total.html
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index 26b10d7c23a..25ecfcc614f 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/08/14 14:53:20 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.8 2002/01/02 12:39:36 lukem Exp $
 #
 # This Makefile fragment is included by packages that use libvorbis.
 #
@@ -17,7 +17,7 @@ LIBVORBIS_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.6
+BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.7
 DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libvorbis=libvorbis
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index e47016b968c..693d4cb02a5 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2001/08/14 14:53:20 lukem Exp $
+$NetBSD: distinfo,v 1.6 2002/01/02 12:39:37 lukem Exp $
 
-SHA1 (libvorbis-1.0rc2.tar.gz) = 6ac247880e9f4f51045c1f0eba6b7bf08ee25b73
-Size (libvorbis-1.0rc2.tar.gz) = 599017 bytes
+SHA1 (libvorbis-1.0rc3.tar.gz) = 4addbca3427daa1fd600ac9b0b5c407c2b87a04d
+Size (libvorbis-1.0rc3.tar.gz) = 563834 bytes
 SHA1 (patch-ae) = de04ccf4a3f22cef52a9d9f5cddb9b045c5ff0f6
-SHA1 (patch-af) = 0cf2573621f6e0e481dbdd1885a7edfdfe5f74a3
-SHA1 (patch-ag) = 772aa8e32352385de6b7f82e557aab66e5199b66
+SHA1 (patch-af) = 3218bb39d12d542f5ccfe9d4e23ec6f0e627c1d4
+SHA1 (patch-ag) = e2aedef7eba5f7d8146dcaa0bbe0c8ce50cd09f7
diff --git a/audio/libvorbis/patches/patch-af b/audio/libvorbis/patches/patch-af
index 892a5352cd7..88544cd9471 100644
--- a/audio/libvorbis/patches/patch-af
+++ b/audio/libvorbis/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.1 2001/05/02 14:01:44 wiz Exp $
+$NetBSD: patch-af,v 1.2 2002/01/02 12:39:37 lukem Exp $
 
---- doc/vorbisenc/Makefile.in.orig	Mon Apr 30 10:35:49 2001
+--- doc/vorbisenc/Makefile.in.orig	Tue Jan  1 12:53:49 2002
 +++ doc/vorbisenc/Makefile.in
-@@ -87,7 +87,7 @@
+@@ -92,7 +92,7 @@
  
  AUTOMAKE_OPTIONS = foreign
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisenc
 +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)/vorbisenc
  
- doc_DATA = index.html overview.html reference.html style.css 	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html
+ doc_DATA = index.html overview.html reference.html style.css 	 vorbis_encode_ctl.html vorbis_encode_init.html vorbis_info.html 	vorbis_encode_init_vbr.html
  
diff --git a/audio/libvorbis/patches/patch-ag b/audio/libvorbis/patches/patch-ag
index 0717e14301f..2e008e60aec 100644
--- a/audio/libvorbis/patches/patch-ag
+++ b/audio/libvorbis/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2001/05/02 14:01:44 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2002/01/02 12:39:37 lukem Exp $
 
---- doc/vorbisfile/Makefile.in.orig	Mon Apr 30 10:35:48 2001
+--- doc/vorbisfile/Makefile.in.orig	Tue Jan  1 12:53:48 2002
 +++ doc/vorbisfile/Makefile.in
-@@ -87,7 +87,7 @@
+@@ -92,7 +92,7 @@
  
  AUTOMAKE_OPTIONS = foreign
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
 +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)/vorbisfile
  
- doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html 	datastructures.html decoding.html example.html exampleindex.html 	fileinfo.html index.html initialization.html ov_bitrate.html 	ov_bitrate_instant.html ov_callbacks.html ov_clear.html 	ov_comment.html ov_info.html ov_open.html ov_open_callbacks.html 	ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html 	ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html 	ov_serialnumber.html ov_streams.html ov_time_seek.html 	ov_time_tell.html ov_time_total.html overview.html reference.html 	seekexample.html seeking.html seeking_test_c.html seekingexample.html 	style.css vorbis_comment.html vorbis_info.html vorbisfile_example_c.html
+ doc_DATA = OggVorbis_File.html chaining_example_c.html chainingexample.html 	datastructures.html decoding.html example.html exampleindex.html 	fileinfo.html index.html initialization.html ov_bitrate.html 	ov_bitrate_instant.html ov_callbacks.html ov_clear.html 	ov_comment.html ov_info.html ov_open.html ov_open_callbacks.html 	ov_pcm_seek.html ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html 	ov_raw_tell.html ov_raw_total.html ov_read.html ov_seekable.html 	ov_serialnumber.html ov_streams.html ov_time_seek.html 	ov_time_tell.html ov_time_total.html overview.html reference.html 	seekexample.html seeking.html seeking_test_c.html seekingexample.html 	style.css vorbis_comment.html vorbis_info.html 	vorbisfile_example_c.html ov_read_float.html ov_test.html 	ov_test_open.html ov_test_callbacks.html