Update to 1.1:

    * Big endian bitpacker added for Theora and future Ogg codec
      support.
    * Minor documentation fixes.

6 files changed, 36 insertions, 23 deletions

diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile
index 6b524b17f33..c3b1ff091fc 100644
--- a/audio/libogg/Makefile
+++ b/audio/libogg/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2003/09/25 13:00:53 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/12/08 14:36:51 wiz Exp $
 
-DISTNAME=	libogg-1.0
-PKGNAME=	libogg-1.0.0.8
+DISTNAME=	libogg-1.1
 CATEGORIES=	devel audio
-MASTER_SITES=	http://www.vorbis.com/files/1.0/unix/
+MASTER_SITES=	http://www.vorbis.com/files/1.0.1/unix/
 
 MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/ogg/
@@ -18,4 +17,7 @@ GCC_REQD=		2.95.3
 
 PLIST_SUBST+=		DISTNAME=${DISTNAME}
 
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/ogg.pc.in
+
+.include "../../devel/pkgconfig/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libogg/PLIST b/audio/libogg/PLIST
index 72948a44997..67d88b8dc21 100644
--- a/audio/libogg/PLIST
+++ b/audio/libogg/PLIST
@@ -1,12 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 18:38:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/12/08 14:36:51 wiz Exp $
 include/ogg/config_types.h
 include/ogg/ogg.h
 include/ogg/os_types.h
 lib/libogg.a
 lib/libogg.la
 lib/libogg.so
-lib/libogg.so.4
-lib/libogg.so.4.0
+lib/libogg.so.5
+lib/libogg.so.5.0
+lib/pkgconfig/ogg.pc
 share/aclocal/ogg.m4
 share/doc/html/${DISTNAME}/framing.html
 share/doc/html/${DISTNAME}/index.html
@@ -72,6 +73,14 @@ 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}
 @dirrm include/ogg
diff --git a/audio/libogg/buildlink2.mk b/audio/libogg/buildlink2.mk
index 1fcecd4af72..876f5b9b722 100644
--- a/audio/libogg/buildlink2.mk
+++ b/audio/libogg/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:14 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/12/08 14:36:51 wiz Exp $
 
 .if !defined(LIBOGG_BUILDLINK2_MK)
 LIBOGG_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libogg
-BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.0.8
+BUILDLINK_DEPENDS.libogg?=	libogg>=1.0.1
 BUILDLINK_PKGSRCDIR.libogg?=	../../audio/libogg
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libogg=libogg
@@ -14,6 +14,8 @@ BUILDLINK_FILES.libogg+=	include/ogg/ogg.h
 BUILDLINK_FILES.libogg+=	include/ogg/os_types.h
 BUILDLINK_FILES.libogg+=	lib/libogg.*
 
+.include "../../devel/pkgconfig/buildlink2.mk"
+
 BUILDLINK_TARGETS+=		libogg-buildlink
 
 libogg-buildlink: _BUILDLINK_USE
diff --git a/audio/libogg/distinfo b/audio/libogg/distinfo
index 8c8b9f12a0c..a2909fdeb35 100644
--- a/audio/libogg/distinfo
+++ b/audio/libogg/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/08/25 18:38:15 jlam Exp $
+$NetBSD: distinfo,v 1.9 2003/12/08 14:36:51 wiz Exp $
 
-SHA1 (libogg-1.0.tar.gz) = 2929e8867e566e9f7029cfacf0b4ccbe2f1f6cec
-Size (libogg-1.0.tar.gz) = 222625 bytes
-SHA1 (patch-aa) = d18123af363f7bbdbf21af7ab72df2a15964438a
-SHA1 (patch-ab) = a52d221f926c4ce3d2a6f808dc08416c179b3a81
+SHA1 (libogg-1.1.tar.gz) = 1021761d10de079ac86c2dc110fbaf83f60f2fca
+Size (libogg-1.1.tar.gz) = 282691 bytes
+SHA1 (patch-aa) = 1daa4d3021250d12fe371d0d73b656be393b5e7e
+SHA1 (patch-ab) = fda4456291c362297d7d993b7d1afd8f63c73059
diff --git a/audio/libogg/patches/patch-aa b/audio/libogg/patches/patch-aa
index 1e32bb4e3eb..5ef22d871cc 100644
--- a/audio/libogg/patches/patch-aa
+++ b/audio/libogg/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2001/05/02 13:59:34 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/08 14:36:51 wiz Exp $
 
---- doc/Makefile.in.orig	Mon Feb 26 11:51:53 2001
+--- doc/Makefile.in.orig	Mon Nov 17 17:33:58 2003
 +++ doc/Makefile.in
-@@ -87,7 +87,7 @@
+@@ -103,7 +103,7 @@ AUTOMAKE_OPTIONS = foreign
  
  SUBDIRS = ogg
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/html/$(PACKAGE)-$(VERSION)
  
- doc_DATA = index.html framing.html oggstream.html white-xifish.png stream.png white-ogg.png
+ 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/audio/libogg/patches/patch-ab b/audio/libogg/patches/patch-ab
index 89482e71c96..d0be5062f19 100644
--- a/audio/libogg/patches/patch-ab
+++ b/audio/libogg/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2002/08/25 18:38:15 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2003/12/08 14:36:51 wiz Exp $
 
---- doc/ogg/Makefile.in.orig	Sat Jul 20 00:13:22 2002
+--- doc/ogg/Makefile.in.orig	Mon Nov 17 17:33:58 2003
 +++ doc/ogg/Makefile.in
-@@ -89,7 +89,7 @@ VERSION = @VERSION@
+@@ -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_page.html 	ogg_page_bos.html ogg_page_continued.html ogg_page_eos.html 	ogg_page_granulepos.html ogg_page_pageno.html ogg_page_serialno.html 	ogg_page_version.html ogg_stream_clear.html ogg_stream_destroy.html 	ogg_page_packets.html ogg_stream_eos.html ogg_stream_flush.html 	ogg_stream_init.html ogg_stream_packetin.html ogg_stream_packetout.html 	ogg_stream_pagein.html ogg_stream_pageout.html ogg_stream_reset.html 	ogg_stream_state.html ogg_sync_buffer.html ogg_sync_clear.html 	ogg_sync_destroy.html ogg_sync_init.html ogg_sync_pageout.html 	ogg_sync_pageseek.html ogg_sync_reset.html ogg_sync_state.html 	ogg_sync_wrote.html oggpack_adv.html oggpack_adv1.html 	oggpack_bits.html oggpack_buffer.html 	oggpack_bytes.html oggpack_get_buffer.html oggpack_look.html 	oggpack_look1.html oggpack_read.html 	oggpack_read1.html oggpack_readinit.html oggpack_reset.html 	oggpack_write.html oggpack_writeclear.html oggpack_writeinit.html 	overview.html reference.html style.css vorbis_comment.html 	vorbis_info.html ogg_packet_clear.html ogg_page_checksum_set.html
- 
+ doc_DATA = bitpacking.html datastructures.html decoding.html encoding.html\
+ 	general.html index.html ogg_packet.html ogg_packet_clear.html\