Update to libvorbis 1.0.

6 files changed, 59 insertions, 24 deletions

diff --git a/audio/libvorbis/DESCR b/audio/libvorbis/DESCR
index d248a17fdc9..c8986ec26bd 100644
--- a/audio/libvorbis/DESCR
+++ b/audio/libvorbis/DESCR
@@ -13,4 +13,4 @@ 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
+This package is libvorbis 1.0
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 5beabe25240..b90d51aec9e 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2002/03/05 17:45:03 skrll Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/05 13:11:22 lukem Exp $
 
-DISTNAME=	libvorbis-1.0rc3
-PKGNAME=	libvorbis-1.0.0.7
+DISTNAME=	libvorbis-1.0
+PKGNAME=	libvorbis-1.0.0.8
 CATEGORIES=	devel audio
-MASTER_SITES=	http://www.vorbis.com/files/rc3/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
 
 MAINTAINER=	lukem@netbsd.org
 HOMEPAGE=	http://www.xiph.org/ogg/vorbis/
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-ogg-prefix=${BUILDLINK_DIR}
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 PLIST_SUBST+=		DISTNAME=${DISTNAME}
 
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 99a1c732705..59722451714 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,27 +1,60 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/02 12:39:36 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/05 13:11:22 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.1
-lib/libvorbis.so.1.0
+lib/libvorbis.so.2
+lib/libvorbis.so.2.0
 lib/libvorbisenc.a
 lib/libvorbisenc.la
 lib/libvorbisenc.so
-lib/libvorbisenc.so.1
-lib/libvorbisenc.so.1.0
+lib/libvorbisenc.so.2
+lib/libvorbisenc.so.2.0
 lib/libvorbisfile.a
 lib/libvorbisfile.la
 lib/libvorbisfile.so
-lib/libvorbisfile.so.2
-lib/libvorbisfile.so.2.0
+lib/libvorbisfile.so.3
+lib/libvorbisfile.so.3.0
 share/aclocal/vorbis.m4
+share/doc/html/${DISTNAME}/components.png
+share/doc/html/${DISTNAME}/draft-moffitt-vorbis-rtp-00.txt
+share/doc/html/${DISTNAME}/eightphase.png
+share/doc/html/${DISTNAME}/evenlsp.png
+share/doc/html/${DISTNAME}/floor1-1.png
+share/doc/html/${DISTNAME}/floor1-2.png
+share/doc/html/${DISTNAME}/floor1-3.png
+share/doc/html/${DISTNAME}/floor1-4.png
+share/doc/html/${DISTNAME}/floor1_inverse_dB_table.html
+share/doc/html/${DISTNAME}/floorval.png
+share/doc/html/${DISTNAME}/fourphase.png
+share/doc/html/${DISTNAME}/framing.html
+share/doc/html/${DISTNAME}/helper.html
+share/doc/html/${DISTNAME}/hufftree-under.png
+share/doc/html/${DISTNAME}/hufftree.png
+share/doc/html/${DISTNAME}/index.html
+share/doc/html/${DISTNAME}/lspmap.png
+share/doc/html/${DISTNAME}/oddlsp.png
+share/doc/html/${DISTNAME}/oggstream.html
 share/doc/html/${DISTNAME}/programming.html
+share/doc/html/${DISTNAME}/residue-pack.png
+share/doc/html/${DISTNAME}/residue2.png
+share/doc/html/${DISTNAME}/squarepolar.png
+share/doc/html/${DISTNAME}/stereo.html
+share/doc/html/${DISTNAME}/stream.png
 share/doc/html/${DISTNAME}/v-comment.html
 share/doc/html/${DISTNAME}/vorbis-clip.txt
 share/doc/html/${DISTNAME}/vorbis-errors.txt
+share/doc/html/${DISTNAME}/vorbis-fidelity.html
+share/doc/html/${DISTNAME}/vorbis-ogg.html
+share/doc/html/${DISTNAME}/vorbis-spec-bitpack.html
+share/doc/html/${DISTNAME}/vorbis-spec-codebook.html
+share/doc/html/${DISTNAME}/vorbis-spec-floor0.html
+share/doc/html/${DISTNAME}/vorbis-spec-floor1.html
+share/doc/html/${DISTNAME}/vorbis-spec-intro.html
+share/doc/html/${DISTNAME}/vorbis-spec-ref.html
+share/doc/html/${DISTNAME}/vorbis-spec-res.html
 share/doc/html/${DISTNAME}/vorbis.html
 share/doc/html/${DISTNAME}/vorbisenc/index.html
 share/doc/html/${DISTNAME}/vorbisenc/overview.html
@@ -80,6 +113,8 @@ share/doc/html/${DISTNAME}/vorbisword2.png
 share/doc/html/${DISTNAME}/wait.png
 share/doc/html/${DISTNAME}/white-ogg.png
 share/doc/html/${DISTNAME}/white-xifish.png
+share/doc/html/${DISTNAME}/window1.png
+share/doc/html/${DISTNAME}/window2.png
 @dirrm share/doc/html/${DISTNAME}/vorbisfile
 @dirrm share/doc/html/${DISTNAME}/vorbisenc
 @dirrm share/doc/html/${DISTNAME}
diff --git a/audio/libvorbis/buildlink.mk b/audio/libvorbis/buildlink.mk
index 25ecfcc614f..abca44beb6c 100644
--- a/audio/libvorbis/buildlink.mk
+++ b/audio/libvorbis/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/01/02 12:39:36 lukem Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/05 13:11:22 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.7
+BUILDLINK_DEPENDS.libvorbis?=	libvorbis>=1.0.0.8
 DEPENDS+=	${BUILDLINK_DEPENDS.libvorbis}:../../audio/libvorbis
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libvorbis=libvorbis
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 693d4cb02a5..be8d2d3d752 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/01/02 12:39:37 lukem Exp $
+$NetBSD: distinfo,v 1.7 2002/08/05 13:11:22 lukem Exp $
 
-SHA1 (libvorbis-1.0rc3.tar.gz) = 4addbca3427daa1fd600ac9b0b5c407c2b87a04d
-Size (libvorbis-1.0rc3.tar.gz) = 563834 bytes
-SHA1 (patch-ae) = de04ccf4a3f22cef52a9d9f5cddb9b045c5ff0f6
+SHA1 (libvorbis-1.0.tar.gz) = 2b414cb4cf7d022d39b7be7049f2c84a287a4fc7
+Size (libvorbis-1.0.tar.gz) = 749064 bytes
+SHA1 (patch-ae) = 84979200c46ab2ca801ee43f1cedf9a76fa08219
 SHA1 (patch-af) = 3218bb39d12d542f5ccfe9d4e23ec6f0e627c1d4
 SHA1 (patch-ag) = e2aedef7eba5f7d8146dcaa0bbe0c8ce50cd09f7
diff --git a/audio/libvorbis/patches/patch-ae b/audio/libvorbis/patches/patch-ae
index 924dce1c639..33298f82349 100644
--- a/audio/libvorbis/patches/patch-ae
+++ b/audio/libvorbis/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2001/05/02 14:01:44 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/05 13:11:23 lukem Exp $
 
---- doc/Makefile.in.orig	Mon Apr 30 10:28:33 2001
-+++ doc/Makefile.in	Mon Apr 30 10:28:37 2001
-@@ -89,7 +89,7 @@
+--- doc/Makefile.in.orig	Sat Jul 20 00:12:33 2002
++++ doc/Makefile.in
+@@ -94,7 +94,7 @@ AUTOMAKE_OPTIONS = foreign
  
  SUBDIRS = vorbisfile vorbisenc
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)
  
- doc_DATA = v-comment.html vorbisword2.png white-ogg.png programming.html 	vorbis.html wait.png white-xifish.png vorbis-clip.txt 	vorbis-errors.txt
+ doc_DATA = components.png 	draft-moffitt-vorbis-rtp-00.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-ogg.html 	vorbis-spec-bitpack.html 	vorbis-spec-codebook.html 	vorbis-spec-floor0.html 	vorbis-spec-floor1.html 	vorbis-spec-intro.html 	vorbis-spec-ref.html 	vorbis-spec-res.html 	vorbis.html 	vorbisword2.png 	wait.png 	white-ogg.png 	white-xifish.png 	window1.png 	window2.png