Update to 1.1.0:

libvorbis 1.1.0 (2004-09-22) -- "Xiph.Org libVorbis I 20040629"

* merges tuning improvements from Aoyumi's aoTuV with fixups
* new managed bitrate (CBR) mode support
* new vorbis_encoder_ctl() interface
* extensive documentation updates
* application/ogg mimetype is now official
* autotools cleanup from Thomas Vander Stichele
* SymbianOS build support from Colin Ward at CSIRO
* various bugfixes
* various packaging improvements

Package change:
install documentation in share/doc instead of share/doc/html.

6 files changed, 112 insertions, 154 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 88165e4bcbb..297ab22b4f3 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/05/31 16:47:47 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2004/09/24 13:04:40 wiz Exp $
 
-DISTNAME=	libvorbis-1.0.1
+DISTNAME=	libvorbis-1.1.0
 CATEGORIES=	devel audio
-MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
+MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
 MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 80aef3898f3..f0f2f41b117 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/24 13:04:40 wiz Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
@@ -9,109 +9,109 @@ lib/pkgconfig/vorbis.pc
 lib/pkgconfig/vorbisenc.pc
 lib/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
-share/doc/html/${PKGNAME}/components.png
-share/doc/html/${PKGNAME}/draft-kerr-avt-vorbis-rtp-02.txt
-share/doc/html/${PKGNAME}/eightphase.png
-share/doc/html/${PKGNAME}/evenlsp.png
-share/doc/html/${PKGNAME}/floor1-1.png
-share/doc/html/${PKGNAME}/floor1-2.png
-share/doc/html/${PKGNAME}/floor1-3.png
-share/doc/html/${PKGNAME}/floor1-4.png
-share/doc/html/${PKGNAME}/floor1_inverse_dB_table.html
-share/doc/html/${PKGNAME}/floorval.png
-share/doc/html/${PKGNAME}/fourphase.png
-share/doc/html/${PKGNAME}/framing.html
-share/doc/html/${PKGNAME}/helper.html
-share/doc/html/${PKGNAME}/hufftree-under.png
-share/doc/html/${PKGNAME}/hufftree.png
-share/doc/html/${PKGNAME}/index.html
-share/doc/html/${PKGNAME}/lspmap.png
-share/doc/html/${PKGNAME}/oddlsp.png
-share/doc/html/${PKGNAME}/oggstream.html
-share/doc/html/${PKGNAME}/programming.html
-share/doc/html/${PKGNAME}/residue-pack.png
-share/doc/html/${PKGNAME}/residue2.png
-share/doc/html/${PKGNAME}/squarepolar.png
-share/doc/html/${PKGNAME}/stereo.html
-share/doc/html/${PKGNAME}/stream.png
-share/doc/html/${PKGNAME}/v-comment.html
-share/doc/html/${PKGNAME}/vorbis-clip.txt
-share/doc/html/${PKGNAME}/vorbis-errors.txt
-share/doc/html/${PKGNAME}/vorbis-fidelity.html
-share/doc/html/${PKGNAME}/vorbis.html
-share/doc/html/${PKGNAME}/vorbisenc/index.html
-share/doc/html/${PKGNAME}/vorbisenc/overview.html
-share/doc/html/${PKGNAME}/vorbisenc/reference.html
-share/doc/html/${PKGNAME}/vorbisenc/style.css
-share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_ctl.html
-share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_init.html
-share/doc/html/${PKGNAME}/vorbisenc/vorbis_encode_init_vbr.html
-share/doc/html/${PKGNAME}/vorbisenc/vorbis_info.html
-share/doc/html/${PKGNAME}/vorbisfile/OggVorbis_File.html
-share/doc/html/${PKGNAME}/vorbisfile/callbacks.html
-share/doc/html/${PKGNAME}/vorbisfile/chaining_example_c.html
-share/doc/html/${PKGNAME}/vorbisfile/chainingexample.html
-share/doc/html/${PKGNAME}/vorbisfile/crosslap.html
-share/doc/html/${PKGNAME}/vorbisfile/datastructures.html
-share/doc/html/${PKGNAME}/vorbisfile/decoding.html
-share/doc/html/${PKGNAME}/vorbisfile/example.html
-share/doc/html/${PKGNAME}/vorbisfile/exampleindex.html
-share/doc/html/${PKGNAME}/vorbisfile/fileinfo.html
-share/doc/html/${PKGNAME}/vorbisfile/index.html
-share/doc/html/${PKGNAME}/vorbisfile/initialization.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_bitrate.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_bitrate_instant.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_callbacks.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_clear.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_comment.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_crosslap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_info.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_open.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_open_callbacks.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_lap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_page.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_seek_page_lap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_tell.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_pcm_total.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_raw_seek.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_raw_seek_lap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_raw_tell.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_raw_total.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_read.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_read_float.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_seekable.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_serialnumber.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_streams.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_test.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_test_callbacks.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_test_open.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_lap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_page.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_seek_page_lap.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_tell.html
-share/doc/html/${PKGNAME}/vorbisfile/ov_time_total.html
-share/doc/html/${PKGNAME}/vorbisfile/overview.html
-share/doc/html/${PKGNAME}/vorbisfile/reference.html
-share/doc/html/${PKGNAME}/vorbisfile/return.html
-share/doc/html/${PKGNAME}/vorbisfile/seekexample.html
-share/doc/html/${PKGNAME}/vorbisfile/seeking.html
-share/doc/html/${PKGNAME}/vorbisfile/seeking_example_c.html
-share/doc/html/${PKGNAME}/vorbisfile/seeking_test_c.html
-share/doc/html/${PKGNAME}/vorbisfile/seekingexample.html
-share/doc/html/${PKGNAME}/vorbisfile/style.css
-share/doc/html/${PKGNAME}/vorbisfile/threads.html
-share/doc/html/${PKGNAME}/vorbisfile/vorbis_comment.html
-share/doc/html/${PKGNAME}/vorbisfile/vorbis_info.html
-share/doc/html/${PKGNAME}/vorbisfile/vorbisfile_example_c.html
-share/doc/html/${PKGNAME}/vorbisword2.png
-share/doc/html/${PKGNAME}/wait.png
-share/doc/html/${PKGNAME}/white-ogg.png
-share/doc/html/${PKGNAME}/white-xifish.png
-share/doc/html/${PKGNAME}/window1.png
-share/doc/html/${PKGNAME}/window2.png
-@dirrm share/doc/html/${PKGNAME}/vorbisfile
-@dirrm share/doc/html/${PKGNAME}/vorbisenc
-@dirrm share/doc/html/${PKGNAME}
+share/doc/${PKGNAME}/components.png
+share/doc/${PKGNAME}/draft-kerr-avt-vorbis-rtp-03.txt
+share/doc/${PKGNAME}/eightphase.png
+share/doc/${PKGNAME}/evenlsp.png
+share/doc/${PKGNAME}/floor1-1.png
+share/doc/${PKGNAME}/floor1-2.png
+share/doc/${PKGNAME}/floor1-3.png
+share/doc/${PKGNAME}/floor1-4.png
+share/doc/${PKGNAME}/floor1_inverse_dB_table.html
+share/doc/${PKGNAME}/floorval.png
+share/doc/${PKGNAME}/fourphase.png
+share/doc/${PKGNAME}/framing.html
+share/doc/${PKGNAME}/helper.html
+share/doc/${PKGNAME}/hufftree-under.png
+share/doc/${PKGNAME}/hufftree.png
+share/doc/${PKGNAME}/index.html
+share/doc/${PKGNAME}/lspmap.png
+share/doc/${PKGNAME}/oddlsp.png
+share/doc/${PKGNAME}/oggstream.html
+share/doc/${PKGNAME}/programming.html
+share/doc/${PKGNAME}/residue-pack.png
+share/doc/${PKGNAME}/residue2.png
+share/doc/${PKGNAME}/squarepolar.png
+share/doc/${PKGNAME}/stereo.html
+share/doc/${PKGNAME}/stream.png
+share/doc/${PKGNAME}/v-comment.html
+share/doc/${PKGNAME}/vorbis-clip.txt
+share/doc/${PKGNAME}/vorbis-errors.txt
+share/doc/${PKGNAME}/vorbis-fidelity.html
+share/doc/${PKGNAME}/vorbis.html
+share/doc/${PKGNAME}/vorbisenc/index.html
+share/doc/${PKGNAME}/vorbisenc/overview.html
+share/doc/${PKGNAME}/vorbisenc/reference.html
+share/doc/${PKGNAME}/vorbisenc/style.css
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_ctl.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init_vbr.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_info.html
+share/doc/${PKGNAME}/vorbisfile/OggVorbis_File.html
+share/doc/${PKGNAME}/vorbisfile/callbacks.html
+share/doc/${PKGNAME}/vorbisfile/chaining_example_c.html
+share/doc/${PKGNAME}/vorbisfile/chainingexample.html
+share/doc/${PKGNAME}/vorbisfile/crosslap.html
+share/doc/${PKGNAME}/vorbisfile/datastructures.html
+share/doc/${PKGNAME}/vorbisfile/decoding.html
+share/doc/${PKGNAME}/vorbisfile/example.html
+share/doc/${PKGNAME}/vorbisfile/exampleindex.html
+share/doc/${PKGNAME}/vorbisfile/fileinfo.html
+share/doc/${PKGNAME}/vorbisfile/index.html
+share/doc/${PKGNAME}/vorbisfile/initialization.html
+share/doc/${PKGNAME}/vorbisfile/ov_bitrate.html
+share/doc/${PKGNAME}/vorbisfile/ov_bitrate_instant.html
+share/doc/${PKGNAME}/vorbisfile/ov_callbacks.html
+share/doc/${PKGNAME}/vorbisfile/ov_clear.html
+share/doc/${PKGNAME}/vorbisfile/ov_comment.html
+share/doc/${PKGNAME}/vorbisfile/ov_crosslap.html
+share/doc/${PKGNAME}/vorbisfile/ov_info.html
+share/doc/${PKGNAME}/vorbisfile/ov_open.html
+share/doc/${PKGNAME}/vorbisfile/ov_open_callbacks.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_lap.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_page.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_seek_page_lap.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_tell.html
+share/doc/${PKGNAME}/vorbisfile/ov_pcm_total.html
+share/doc/${PKGNAME}/vorbisfile/ov_raw_seek.html
+share/doc/${PKGNAME}/vorbisfile/ov_raw_seek_lap.html
+share/doc/${PKGNAME}/vorbisfile/ov_raw_tell.html
+share/doc/${PKGNAME}/vorbisfile/ov_raw_total.html
+share/doc/${PKGNAME}/vorbisfile/ov_read.html
+share/doc/${PKGNAME}/vorbisfile/ov_read_float.html
+share/doc/${PKGNAME}/vorbisfile/ov_seekable.html
+share/doc/${PKGNAME}/vorbisfile/ov_serialnumber.html
+share/doc/${PKGNAME}/vorbisfile/ov_streams.html
+share/doc/${PKGNAME}/vorbisfile/ov_test.html
+share/doc/${PKGNAME}/vorbisfile/ov_test_callbacks.html
+share/doc/${PKGNAME}/vorbisfile/ov_test_open.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_seek.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_seek_lap.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_seek_page.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_seek_page_lap.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_tell.html
+share/doc/${PKGNAME}/vorbisfile/ov_time_total.html
+share/doc/${PKGNAME}/vorbisfile/overview.html
+share/doc/${PKGNAME}/vorbisfile/reference.html
+share/doc/${PKGNAME}/vorbisfile/return.html
+share/doc/${PKGNAME}/vorbisfile/seekexample.html
+share/doc/${PKGNAME}/vorbisfile/seeking.html
+share/doc/${PKGNAME}/vorbisfile/seeking_example_c.html
+share/doc/${PKGNAME}/vorbisfile/seeking_test_c.html
+share/doc/${PKGNAME}/vorbisfile/seekingexample.html
+share/doc/${PKGNAME}/vorbisfile/style.css
+share/doc/${PKGNAME}/vorbisfile/threads.html
+share/doc/${PKGNAME}/vorbisfile/vorbis_comment.html
+share/doc/${PKGNAME}/vorbisfile/vorbis_info.html
+share/doc/${PKGNAME}/vorbisfile/vorbisfile_example_c.html
+share/doc/${PKGNAME}/vorbisword2.png
+share/doc/${PKGNAME}/wait.png
+share/doc/${PKGNAME}/white-ogg.png
+share/doc/${PKGNAME}/white-xifish.png
+share/doc/${PKGNAME}/window1.png
+share/doc/${PKGNAME}/window2.png
+@dirrm share/doc/${PKGNAME}/vorbisfile
+@dirrm share/doc/${PKGNAME}/vorbisenc
+@dirrm share/doc/${PKGNAME}
 @dirrm include/vorbis
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 9d6ba8df95f..f51dd04cdd9 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,7 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/12/08 14:39:40 wiz Exp $
+$NetBSD: distinfo,v 1.10 2004/09/24 13:04:41 wiz Exp $
 
-SHA1 (libvorbis-1.0.1.tar.gz) = 49fcf94c51ee2652d19a03377918196bb7e1ce5f
-Size (libvorbis-1.0.1.tar.gz) = 1218076 bytes
-SHA1 (patch-ae) = fef2e93ca3a72101f04a74a1ec9707466c1f208d
-SHA1 (patch-af) = 466332dc09f496909faf719f76ac46236d5c32ce
-SHA1 (patch-ag) = 1a3ba0fdfe9e92e838d221f4d88160f6c31bd09e
+SHA1 (libvorbis-1.1.0.tar.gz) = 52fd3cb3e3876cb890bd8d8867db52663a847418
+Size (libvorbis-1.1.0.tar.gz) = 1312404 bytes
diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae
deleted file mode 100644
index 7e322ec63af..00000000000
--- a/audio/libvorbis/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2003/12/08 14:39:40 wiz Exp $
-
---- doc/Makefile.in.orig	Mon Nov 17 19:44:21 2003
-+++ doc/Makefile.in
-@@ -108,7 +108,7 @@ AUTOMAKE_OPTIONS = foreign
- 
- SUBDIRS = vorbisfile vorbisenc
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)
- 
- static_docs = components.png 	draft-kerr-avt-vorbis-rtp-02.txt 	eightphase.png 	evenlsp.png 	floor1-1.png 	floor1-2.png 	floor1-3.png 	floor1-4.png 	floor1_inverse_dB_table.html 	floorval.png 	fourphase.png 	framing.html 	helper.html 	hufftree-under.png 	hufftree.png 	index.html 	lspmap.png 	oddlsp.png 	oggstream.html 	programming.html 	residue-pack.png 	residue2.png 	squarepolar.png 	stereo.html 	stream.png 	v-comment.html 	vorbis-clip.txt 	vorbis-errors.txt 	vorbis-fidelity.html 	vorbis.html 	vorbisword2.png 	wait.png 	white-ogg.png 	white-xifish.png 	window1.png 	window2.png
- 
diff --git a/audio/libvorbis/patches/patch-af b/audio/libvorbis/patches/patch-af
deleted file mode 100644
index b4a3a258a68..00000000000
--- a/audio/libvorbis/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2003/12/08 14:39:40 wiz Exp $
-
---- doc/vorbisenc/Makefile.in.orig	Mon Nov 17 19:44:22 2003
-+++ doc/vorbisenc/Makefile.in
-@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@
- 
- 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 	vorbis_encode_init_vbr.html
- 
diff --git a/audio/libvorbis/patches/patch-ag b/audio/libvorbis/patches/patch-ag
deleted file mode 100644
index c83a5657282..00000000000
--- a/audio/libvorbis/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/12/08 14:39:40 wiz Exp $
-
---- doc/vorbisfile/Makefile.in.orig	Mon Nov 17 19:44:21 2003
-+++ doc/vorbisfile/Makefile.in
-@@ -106,7 +106,7 @@ pthread_lib = @pthread_lib@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/vorbisfile
-+docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)/vorbisfile
- 
- doc_DATA = OggVorbis_File.html callbacks.html chaining_example_c.html 	chainingexample.html crosslap.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_crosslap.html 	ov_info.html ov_open.html ov_open_callbacks.html ov_pcm_seek.html 	ov_pcm_seek_lap.html ov_pcm_seek_page.html ov_pcm_seek_page_lap.html 	ov_pcm_tell.html ov_pcm_total.html ov_raw_seek.html 	ov_raw_seek_lap.html ov_raw_tell.html ov_raw_total.html ov_read.html 	ov_read_float.html ov_seekable.html ov_serialnumber.html 	ov_streams.html ov_test.html ov_test_callbacks.html ov_test_open.html 	ov_time_seek.html ov_time_seek_lap.html ov_time_seek_page.html 	ov_time_seek_page_lap.html ov_time_tell.html ov_time_total.html 	overview.html reference.html return.html seekexample.html seeking.html 	seeking_example_c.html seeking_test_c.html seekingexample.html 	style.css threads.html vorbis_comment.html vorbis_info.html 	vorbisfile_example_c.html
-