1 files changed, 232 insertions, 20 deletions

diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 148e30089220..d446cb0999b1 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -8,39 +8,251 @@ include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
 include/FLAC/file_decoder.h
+include/FLAC/file_encoder.h
 include/FLAC/format.h
 include/FLAC/metadata.h
 include/FLAC/ordinals.h
 include/FLAC/seekable_stream_decoder.h
+include/FLAC/seekable_stream_encoder.h
 include/FLAC/stream_decoder.h
 include/FLAC/stream_encoder.h
+include/OggFLAC++/all.h
+include/OggFLAC++/decoder.h
+include/OggFLAC++/encoder.h
+include/OggFLAC/all.h
+include/OggFLAC/stream_decoder.h
+include/OggFLAC/stream_encoder.h
 lib/libFLAC++.a
-lib/libFLAC++.la
 lib/libFLAC++.so
-lib/libFLAC++.so.1
+lib/libFLAC++.so.2
 lib/libFLAC.a
-lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.3
+lib/libFLAC.so.4
+lib/libOggFLAC++.a
+lib/libOggFLAC++.so
+lib/libOggFLAC++.so.0
+lib/libOggFLAC.a
+lib/libOggFLAC.so
+lib/libOggFLAC.so.0
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
-@unexec /bin/rmdir %D/share/aclocal 2>/dev/null || true
-%%PORTDOCS%%share/doc/flac/comparison.html
-%%PORTDOCS%%share/doc/flac/developers.html
-%%PORTDOCS%%share/doc/flac/documentation.html
-%%PORTDOCS%%share/doc/flac/download.html
-%%PORTDOCS%%share/doc/flac/features.html
-%%PORTDOCS%%share/doc/flac/format.html
-%%PORTDOCS%%share/doc/flac/goals.html
-%%PORTDOCS%%share/doc/flac/id.html
-%%PORTDOCS%%share/doc/flac/images/1x1.gif
-%%PORTDOCS%%share/doc/flac/images/cafebug.gif
-%%PORTDOCS%%share/doc/flac/images/logo.jpg
-%%PORTDOCS%%share/doc/flac/index.html
-%%PORTDOCS%%share/doc/flac/news.html
+share/aclocal/libOggFLAC++.m4
+share/aclocal/libOggFLAC.m4
+%%PORTDOCS%%share/doc/flac/FLAC.tag
+%%PORTDOCS%%share/doc/flac/html/api/+_2metadata_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/+_2metadata_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC++_2encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/FLAC_2stream__encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC++_2encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2all_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/OggFLAC_2stream__encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/annotated.html
+%%PORTDOCS%%share/doc/flac/html/api/assert_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1File.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1File-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1File.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Encoder_1_1Stream.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Application.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Chain.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Iterator.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Padding.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1Prototype.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
+%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
+%%PORTDOCS%%share/doc/flac/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
+%%PORTDOCS%%share/doc/flac/html/api/classes.html
+%%PORTDOCS%%share/doc/flac/html/api/doxygen.css
+%%PORTDOCS%%share/doc/flac/html/api/doxygen.gif
+%%PORTDOCS%%share/doc/flac/html/api/file__decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/file__decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/file__encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/file__encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/files.html
+%%PORTDOCS%%share/doc/flac/html/api/format_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/format_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/functions.html
+%%PORTDOCS%%share/doc/flac/html/api/globals.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__file__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__file__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__format.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level0.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level1.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__level2.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__metadata__object.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__seekable__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__seekable__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flac__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__file__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__file__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level0.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level1.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__level2.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__metadata__object.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__seekable__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__seekable__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__flacpp__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflac.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflac__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__stream__decoder.html
+%%PORTDOCS%%share/doc/flac/html/api/group__oggflacpp__stream__encoder.html
+%%PORTDOCS%%share/doc/flac/html/api/hierarchy.html
+%%PORTDOCS%%share/doc/flac/html/api/index.html
+%%PORTDOCS%%share/doc/flac/html/api/metadata_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/metadata_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/modules.html
+%%PORTDOCS%%share/doc/flac/html/api/ordinals_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__decoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__decoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__encoder_8h-source.html
+%%PORTDOCS%%share/doc/flac/html/api/seekable__stream__encoder_8h.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileDecoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileDecoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileEncoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FileEncoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Frame-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Frame.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameFooter-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameFooter.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameHeader-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____FrameHeader.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamDecoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamDecoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamEncoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____SeekableStreamEncoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamDecoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamDecoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamEncoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamEncoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Application.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__Padding.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekPoint.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__SeekTable.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__StreamInfo.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Constant-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Constant.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Fixed-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Fixed.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__LPC-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__LPC.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Verbatim-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structFLAC____Subframe__Verbatim.html
+%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamDecoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamDecoder.html
+%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamEncoder-members.html
+%%PORTDOCS%%share/doc/flac/html/api/structOggFLAC____StreamEncoder.html
+%%PORTDOCS%%share/doc/flac/html/comparison.html
+%%PORTDOCS%%share/doc/flac/html/developers.html
+%%PORTDOCS%%share/doc/flac/html/documentation.html
+%%PORTDOCS%%share/doc/flac/html/download.html
+%%PORTDOCS%%share/doc/flac/html/features.html
+%%PORTDOCS%%share/doc/flac/html/format.html
+%%PORTDOCS%%share/doc/flac/html/goals.html
+%%PORTDOCS%%share/doc/flac/html/id.html
+%%PORTDOCS%%share/doc/flac/html/images/1x1.gif
+%%PORTDOCS%%share/doc/flac/html/images/cafebug.gif
+%%PORTDOCS%%share/doc/flac/html/images/logo.jpg
+%%PORTDOCS%%share/doc/flac/html/index.html
+%%PORTDOCS%%share/doc/flac/html/news.html
+%%PORTDOCS%%share/doc/flac/html/ru/authors.html
+%%PORTDOCS%%share/doc/flac/html/ru/comparison.html
+%%PORTDOCS%%share/doc/flac/html/ru/developers.html
+%%PORTDOCS%%share/doc/flac/html/ru/documentation.html
+%%PORTDOCS%%share/doc/flac/html/ru/download.html
+%%PORTDOCS%%share/doc/flac/html/ru/features.html
+%%PORTDOCS%%share/doc/flac/html/ru/format.html
+%%PORTDOCS%%share/doc/flac/html/ru/goals.html
+%%PORTDOCS%%share/doc/flac/html/ru/id.html
+%%PORTDOCS%%share/doc/flac/html/ru/index.html
+%%PORTDOCS%%share/doc/flac/html/ru/links.html
+%%PORTDOCS%%share/doc/flac/html/ru/news.html
+%%PORTDOCS%%@dirrm share/doc/flac/html/ru
+%%PORTDOCS%%@dirrm share/doc/flac/html/images
+%%PORTDOCS%%@dirrm share/doc/flac/html/api
+%%PORTDOCS%%@dirrm share/doc/flac/html
+%%PORTDOCS%%@dirrm share/doc/flac
+@dirrm include/OggFLAC++
+@dirrm include/OggFLAC
 @dirrm include/FLAC++
 @dirrm include/FLAC
-%%PORTDOCS%%@dirrm share/doc/flac/images
-%%PORTDOCS%%@dirrm share/doc/flac
 %%XMMS%%@cwd %%X11BASE%%
 %%XMMS%%lib/xmms/Input/libxmms-flac.so