Update to 1.1.2:

Version 1.1.2 (unreleased) [sic]

 * fix a bug with multipage packet assembly after seek

Version 1.1.1 (2004 September 12)

 * various bugfixes
 * important bugfix for 64-bit platforms
 * various portability fixes
 * autotools cleanup from Thomas Vander Stichele
 * Symbian OS build support from Colin Ward at CSIRO
 * new multiplexed Ogg stream documentation

Package change:
Move documentation from share/doc/html to share/doc.

5 files changed, 81 insertions, 109 deletions

diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index 37f0136ca23..863f2580339 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/12 23:02:59 salo Exp $
+# $NetBSD: Makefile,v 1.2 2004/09/24 12:33:16 wiz Exp $
 #
 
-DISTNAME=	libogg-1.1
+DISTNAME=	libogg-1.1.2
 CATEGORIES=	multimedia devel
-MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
+MASTER_SITES=	http://downloads.xiph.org/releases/ogg/
 
 MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/
diff --git a/multimedia/libogg/PLIST b/multimedia/libogg/PLIST
index ff85898d10d..6f053cd7dc6 100644
--- a/multimedia/libogg/PLIST
+++ b/multimedia/libogg/PLIST
@@ -1,82 +1,82 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/24 12:33:16 wiz Exp $
 include/ogg/config_types.h
 include/ogg/ogg.h
 include/ogg/os_types.h
 lib/libogg.la
 lib/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
-share/doc/html/${DISTNAME}/framing.html
-share/doc/html/${DISTNAME}/index.html
-share/doc/html/${DISTNAME}/ogg/bitpacking.html
-share/doc/html/${DISTNAME}/ogg/datastructures.html
-share/doc/html/${DISTNAME}/ogg/decoding.html
-share/doc/html/${DISTNAME}/ogg/encoding.html
-share/doc/html/${DISTNAME}/ogg/general.html
-share/doc/html/${DISTNAME}/ogg/index.html
-share/doc/html/${DISTNAME}/ogg/ogg_packet.html
-share/doc/html/${DISTNAME}/ogg/ogg_packet_clear.html
-share/doc/html/${DISTNAME}/ogg/ogg_page.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_bos.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_checksum_set.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_continued.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_eos.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_granulepos.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_packets.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_pageno.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_serialno.html
-share/doc/html/${DISTNAME}/ogg/ogg_page_version.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_clear.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_destroy.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_eos.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_flush.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_init.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_packetin.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_packetout.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_pagein.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_pageout.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_reset.html
-share/doc/html/${DISTNAME}/ogg/ogg_stream_state.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_buffer.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_clear.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_destroy.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_init.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_pageout.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_pageseek.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_reset.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_state.html
-share/doc/html/${DISTNAME}/ogg/ogg_sync_wrote.html
-share/doc/html/${DISTNAME}/ogg/oggpack_adv.html
-share/doc/html/${DISTNAME}/ogg/oggpack_adv1.html
-share/doc/html/${DISTNAME}/ogg/oggpack_bits.html
-share/doc/html/${DISTNAME}/ogg/oggpack_buffer.html
-share/doc/html/${DISTNAME}/ogg/oggpack_bytes.html
-share/doc/html/${DISTNAME}/ogg/oggpack_get_buffer.html
-share/doc/html/${DISTNAME}/ogg/oggpack_look.html
-share/doc/html/${DISTNAME}/ogg/oggpack_look1.html
-share/doc/html/${DISTNAME}/ogg/oggpack_read.html
-share/doc/html/${DISTNAME}/ogg/oggpack_read1.html
-share/doc/html/${DISTNAME}/ogg/oggpack_readinit.html
-share/doc/html/${DISTNAME}/ogg/oggpack_reset.html
-share/doc/html/${DISTNAME}/ogg/oggpack_write.html
-share/doc/html/${DISTNAME}/ogg/oggpack_writeclear.html
-share/doc/html/${DISTNAME}/ogg/oggpack_writeinit.html
-share/doc/html/${DISTNAME}/ogg/overview.html
-share/doc/html/${DISTNAME}/ogg/reference.html
-share/doc/html/${DISTNAME}/ogg/style.css
-share/doc/html/${DISTNAME}/ogg/vorbis_comment.html
-share/doc/html/${DISTNAME}/ogg/vorbis_info.html
-share/doc/html/${DISTNAME}/oggstream.html
-share/doc/html/${DISTNAME}/stream.png
-share/doc/html/${DISTNAME}/white-ogg.png
-share/doc/html/${DISTNAME}/white-xifish.png
-share/doc/html/${PKGNAME}/ogg/ogg_stream_packetpeek.html
-share/doc/html/${PKGNAME}/ogg/ogg_stream_reset_serialno.html
-share/doc/html/${PKGNAME}/ogg/oggpack_writealign.html
-share/doc/html/${PKGNAME}/ogg/oggpack_writecopy.html
-share/doc/html/${PKGNAME}/ogg/oggpack_writetrunc.html
-share/doc/html/${PKGNAME}/rfc3533.txt
-share/doc/html/${PKGNAME}/rfc3534.txt
-share/doc/html/${PKGNAME}/vorbisword2.png
-@dirrm share/doc/html/${DISTNAME}/ogg
-@dirrm share/doc/html/${DISTNAME}
+share/doc/${DISTNAME}/framing.html
+share/doc/${DISTNAME}/index.html
+share/doc/${DISTNAME}/ogg/bitpacking.html
+share/doc/${DISTNAME}/ogg/datastructures.html
+share/doc/${DISTNAME}/ogg/decoding.html
+share/doc/${DISTNAME}/ogg/encoding.html
+share/doc/${DISTNAME}/ogg/general.html
+share/doc/${DISTNAME}/ogg/index.html
+share/doc/${DISTNAME}/ogg/ogg_packet.html
+share/doc/${DISTNAME}/ogg/ogg_packet_clear.html
+share/doc/${DISTNAME}/ogg/ogg_page.html
+share/doc/${DISTNAME}/ogg/ogg_page_bos.html
+share/doc/${DISTNAME}/ogg/ogg_page_checksum_set.html
+share/doc/${DISTNAME}/ogg/ogg_page_continued.html
+share/doc/${DISTNAME}/ogg/ogg_page_eos.html
+share/doc/${DISTNAME}/ogg/ogg_page_granulepos.html
+share/doc/${DISTNAME}/ogg/ogg_page_packets.html
+share/doc/${DISTNAME}/ogg/ogg_page_pageno.html
+share/doc/${DISTNAME}/ogg/ogg_page_serialno.html
+share/doc/${DISTNAME}/ogg/ogg_page_version.html
+share/doc/${DISTNAME}/ogg/ogg_stream_clear.html
+share/doc/${DISTNAME}/ogg/ogg_stream_destroy.html
+share/doc/${DISTNAME}/ogg/ogg_stream_eos.html
+share/doc/${DISTNAME}/ogg/ogg_stream_flush.html
+share/doc/${DISTNAME}/ogg/ogg_stream_init.html
+share/doc/${DISTNAME}/ogg/ogg_stream_packetin.html
+share/doc/${DISTNAME}/ogg/ogg_stream_packetout.html
+share/doc/${DISTNAME}/ogg/ogg_stream_pagein.html
+share/doc/${DISTNAME}/ogg/ogg_stream_pageout.html
+share/doc/${DISTNAME}/ogg/ogg_stream_reset.html
+share/doc/${DISTNAME}/ogg/ogg_stream_state.html
+share/doc/${DISTNAME}/ogg/ogg_sync_buffer.html
+share/doc/${DISTNAME}/ogg/ogg_sync_clear.html
+share/doc/${DISTNAME}/ogg/ogg_sync_destroy.html
+share/doc/${DISTNAME}/ogg/ogg_sync_init.html
+share/doc/${DISTNAME}/ogg/ogg_sync_pageout.html
+share/doc/${DISTNAME}/ogg/ogg_sync_pageseek.html
+share/doc/${DISTNAME}/ogg/ogg_sync_reset.html
+share/doc/${DISTNAME}/ogg/ogg_sync_state.html
+share/doc/${DISTNAME}/ogg/ogg_sync_wrote.html
+share/doc/${DISTNAME}/ogg/oggpack_adv.html
+share/doc/${DISTNAME}/ogg/oggpack_adv1.html
+share/doc/${DISTNAME}/ogg/oggpack_bits.html
+share/doc/${DISTNAME}/ogg/oggpack_buffer.html
+share/doc/${DISTNAME}/ogg/oggpack_bytes.html
+share/doc/${DISTNAME}/ogg/oggpack_get_buffer.html
+share/doc/${DISTNAME}/ogg/oggpack_look.html
+share/doc/${DISTNAME}/ogg/oggpack_look1.html
+share/doc/${DISTNAME}/ogg/oggpack_read.html
+share/doc/${DISTNAME}/ogg/oggpack_read1.html
+share/doc/${DISTNAME}/ogg/oggpack_readinit.html
+share/doc/${DISTNAME}/ogg/oggpack_reset.html
+share/doc/${DISTNAME}/ogg/oggpack_write.html
+share/doc/${DISTNAME}/ogg/oggpack_writeclear.html
+share/doc/${DISTNAME}/ogg/oggpack_writeinit.html
+share/doc/${DISTNAME}/ogg/overview.html
+share/doc/${DISTNAME}/ogg/reference.html
+share/doc/${DISTNAME}/ogg/style.css
+share/doc/${DISTNAME}/ogg/vorbis_comment.html
+share/doc/${DISTNAME}/ogg/vorbis_info.html
+share/doc/${DISTNAME}/oggstream.html
+share/doc/${DISTNAME}/stream.png
+share/doc/${DISTNAME}/white-ogg.png
+share/doc/${DISTNAME}/white-xifish.png
+share/doc/${PKGNAME}/ogg/ogg_stream_packetpeek.html
+share/doc/${PKGNAME}/ogg/ogg_stream_reset_serialno.html
+share/doc/${PKGNAME}/ogg/oggpack_writealign.html
+share/doc/${PKGNAME}/ogg/oggpack_writecopy.html
+share/doc/${PKGNAME}/ogg/oggpack_writetrunc.html
+share/doc/${PKGNAME}/rfc3533.txt
+share/doc/${PKGNAME}/rfc3534.txt
+share/doc/${PKGNAME}/vorbisword2.png
+@dirrm share/doc/${DISTNAME}/ogg
+@dirrm share/doc/${DISTNAME}
 @dirrm include/ogg
diff --git a/multimedia/libogg/distinfo b/multimedia/libogg/distinfo
index 0316bbc5564..effbbc7d647 100644
--- a/multimedia/libogg/distinfo
+++ b/multimedia/libogg/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/12 23:03:00 salo Exp $
+$NetBSD: distinfo,v 1.2 2004/09/24 12:33:16 wiz Exp $
 
-SHA1 (libogg-1.1.tar.gz) = 1021761d10de079ac86c2dc110fbaf83f60f2fca
-Size (libogg-1.1.tar.gz) = 282691 bytes
-SHA1 (patch-aa) = 1daa4d3021250d12fe371d0d73b656be393b5e7e
-SHA1 (patch-ab) = fda4456291c362297d7d993b7d1afd8f63c73059
+SHA1 (libogg-1.1.2.tar.gz) = 518569a6be397f3903d86ca8c83b943ec0e4e713
+Size (libogg-1.1.2.tar.gz) = 419959 bytes
diff --git a/multimedia/libogg/patches/patch-aa b/multimedia/libogg/patches/patch-aa
deleted file mode 100644
index 8e4381abd8c..00000000000
--- a/multimedia/libogg/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/12 23:03:03 salo Exp $
-
---- doc/Makefile.in.orig	Mon Nov 17 17:33:58 2003
-+++ doc/Makefile.in
-@@ -103,7 +103,7 @@ AUTOMAKE_OPTIONS = foreign
- 
- SUBDIRS = ogg
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)
- 
- doc_DATA = framing.html index.html oggstream.html rfc3533.txt rfc3534.txt stream.png vorbisword2.png white-ogg.png white-xifish.png
- 
diff --git a/multimedia/libogg/patches/patch-ab b/multimedia/libogg/patches/patch-ab
deleted file mode 100644
index 3b9544ddb22..00000000000
--- a/multimedia/libogg/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/04/12 23:03:03 salo Exp $
-
---- doc/ogg/Makefile.in.orig	Mon Nov 17 17:33:58 2003
-+++ doc/ogg/Makefile.in
-@@ -101,7 +101,7 @@ install_sh = @install_sh@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
-+docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)/ogg
- 
- doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
- 	general.html index.html ogg_packet.html ogg_packet_clear.html\