diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 04a6dfb9823..75f81155234 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.26 2008/05/17 19:58:25 naddy Exp $ +# $OpenBSD: Makefile,v 1.27 2009/02/07 16:07:53 naddy Exp $ COMMENT= audio compression codec library DISTNAME= libvorbis-1.2.0 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= audio HOMEPAGE= http://www.xiph.org/vorbis/ SHARED_LIBS += vorbis 6.0 # .4.0 diff --git a/audio/libvorbis/patches/patch-doc_Makefile_in b/audio/libvorbis/patches/patch-doc_Makefile_in index a77cb598dc9..2f440340d99 100644 --- a/audio/libvorbis/patches/patch-doc_Makefile_in +++ b/audio/libvorbis/patches/patch-doc_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.7 2007/07/30 15:29:36 naddy Exp $ ---- doc/Makefile.in.orig Sun Jul 29 17:14:45 2007 -+++ doc/Makefile.in Sun Jul 29 17:15:06 2007 +$OpenBSD: patch-doc_Makefile_in,v 1.8 2009/02/07 16:07:53 naddy Exp $ +--- doc/Makefile.in.orig Wed Jul 25 18:46:35 2007 ++++ doc/Makefile.in Fri Feb 6 21:13:36 2009 @@ -162,7 +162,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -10,3 +10,12 @@ $OpenBSD: patch-doc_Makefile_in,v 1.7 2007/07/30 15:29:36 naddy Exp $ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ +@@ -249,7 +249,7 @@ SPEC_PDF = xifish.pdf + # FIXME: also needed here + # white-xifish.png + built_docs = Vorbis_I_spec.html Vorbis_I_spec.pdf +-@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) $(SPEC_PNG) ++@BUILD_DOCS_FALSE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs) + + # conditionally make the generated documentation + @BUILD_DOCS_TRUE@doc_DATA = $(static_docs) $(SPEC_PNG) $(built_docs) diff --git a/audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in b/audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in index 99ed2915956..e76e4a20fe1 100644 --- a/audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in +++ b/audio/libvorbis/patches/patch-doc_vorbisenc_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.6 2007/07/30 15:29:36 naddy Exp $ ---- doc/vorbisenc/Makefile.in.orig Sun Jul 29 17:15:16 2007 -+++ doc/vorbisenc/Makefile.in Sun Jul 29 17:15:26 2007 +$OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.7 2009/02/07 16:07:53 naddy Exp $ +--- doc/vorbisenc/Makefile.in.orig Wed Jul 25 18:46:35 2007 ++++ doc/vorbisenc/Makefile.in Fri Feb 6 21:08:32 2009 @@ -150,7 +150,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -10,3 +10,15 @@ $OpenBSD: patch-doc_vorbisenc_Makefile_in,v 1.6 2007/07/30 15:29:36 naddy Exp $ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ +@@ -187,7 +187,10 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + 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 ++ vorbis_encode_init_vbr.html changes.html examples.html\ ++ ov_ectl_ratemanage2_arg.html ov_ectl_ratemanage_arg.html\ ++ vorbis_encode_setup_init.html vorbis_encode_setup_managed.html\ ++ vorbis_encode_setup_vbr.html + + EXTRA_DIST = $(doc_DATA) + all: all-am diff --git a/audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in b/audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in index 0399697ba72..0a25ed575b8 100644 --- a/audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in +++ b/audio/libvorbis/patches/patch-doc_vorbisfile_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.6 2007/07/30 15:29:36 naddy Exp $ ---- doc/vorbisfile/Makefile.in.orig Sun Jul 29 17:15:44 2007 -+++ doc/vorbisfile/Makefile.in Sun Jul 29 17:15:57 2007 +$OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.7 2009/02/07 16:07:53 naddy Exp $ +--- doc/vorbisfile/Makefile.in.orig Wed Jul 25 18:46:35 2007 ++++ doc/vorbisfile/Makefile.in Fri Feb 6 21:08:53 2009 @@ -150,7 +150,7 @@ build_vendor = @build_vendor@ builddir = @builddir@ datadir = @datadir@ @@ -10,3 +10,12 @@ $OpenBSD: patch-doc_vorbisfile_Makefile_in,v 1.6 2007/07/30 15:29:36 naddy Exp $ dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ +@@ -201,7 +201,7 @@ doc_DATA = OggVorbis_File.html callbacks.html chaining + 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 ++ vorbisfile_example_c.html ov_fopen.html + + EXTRA_DIST = $(doc_DATA) + all: all-am diff --git a/audio/libvorbis/pkg/PLIST b/audio/libvorbis/pkg/PLIST index aa94d35dce6..c261cec4514 100644 --- a/audio/libvorbis/pkg/PLIST +++ b/audio/libvorbis/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2007/07/30 15:29:36 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.8 2009/02/07 16:07:53 naddy Exp $ include/vorbis/ include/vorbis/codec.h include/vorbis/vorbisenc.h @@ -16,6 +16,8 @@ lib/pkgconfig/vorbisfile.pc share/aclocal/ share/aclocal/vorbis.m4 share/doc/libvorbis/ +share/doc/libvorbis/Vorbis_I_spec.html +share/doc/libvorbis/Vorbis_I_spec.pdf share/doc/libvorbis/components.png share/doc/libvorbis/draft-ietf-avt-rtp-vorbis-06.txt share/doc/libvorbis/draft-ietf-avt-rtp-vorbis-06.xml @@ -48,13 +50,20 @@ share/doc/libvorbis/vorbis-errors.txt share/doc/libvorbis/vorbis-fidelity.html share/doc/libvorbis/vorbis.html share/doc/libvorbis/vorbisenc/ +share/doc/libvorbis/vorbisenc/changes.html +share/doc/libvorbis/vorbisenc/examples.html share/doc/libvorbis/vorbisenc/index.html +share/doc/libvorbis/vorbisenc/ov_ectl_ratemanage2_arg.html +share/doc/libvorbis/vorbisenc/ov_ectl_ratemanage_arg.html share/doc/libvorbis/vorbisenc/overview.html share/doc/libvorbis/vorbisenc/reference.html share/doc/libvorbis/vorbisenc/style.css share/doc/libvorbis/vorbisenc/vorbis_encode_ctl.html share/doc/libvorbis/vorbisenc/vorbis_encode_init.html share/doc/libvorbis/vorbisenc/vorbis_encode_init_vbr.html +share/doc/libvorbis/vorbisenc/vorbis_encode_setup_init.html +share/doc/libvorbis/vorbisenc/vorbis_encode_setup_managed.html +share/doc/libvorbis/vorbisenc/vorbis_encode_setup_vbr.html share/doc/libvorbis/vorbisenc/vorbis_info.html share/doc/libvorbis/vorbisfile/ share/doc/libvorbis/vorbisfile/OggVorbis_File.html @@ -75,6 +84,7 @@ share/doc/libvorbis/vorbisfile/ov_callbacks.html share/doc/libvorbis/vorbisfile/ov_clear.html share/doc/libvorbis/vorbisfile/ov_comment.html share/doc/libvorbis/vorbisfile/ov_crosslap.html +share/doc/libvorbis/vorbisfile/ov_fopen.html share/doc/libvorbis/vorbisfile/ov_info.html share/doc/libvorbis/vorbisfile/ov_open.html share/doc/libvorbis/vorbisfile/ov_open_callbacks.html