Update to 1.0.4. Notable improvements:

- vorbis comment and id3v1/v2 support in the plugins
- bug fixes for 24-bit handling
- x86 encoder and decoder speedups
- reduced memory requirements

14 files changed, 371 insertions, 58 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 4d17c8d..9373a8f 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +17,8 @@ LIB_DEPENDS=	ogg.4:${PORTSDIR}/audio/libogg
 
 .if defined(WITH_XMMS)
 BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/audio/xmms
-LIB_DEPENDS+=	xmms.3:${PORTSDIR}/audio/xmms
+LIB_DEPENDS+=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
+		xmms.3:${PORTSDIR}/audio/xmms
 PLIST_SUB=	XMMS=""
 .else
 CONFIGURE_ENV+=	XMMS_CONFIG=/usr/bin/false	# must be absolute path
@@ -29,11 +29,12 @@ PLIST_SUB=	XMMS="@comment "
 BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-CONFIGURE_ARGS= --with-ogg=${LOCALBASE} \
-		--enable-sse --enable-3dnow
-CONFIGURE_ENV=	CONFIG_SHELL=${SH}
+CONFIGURE_ARGS=	--enable-sse --enable-3dnow
+CONFIGURE_ENV+=	CONFIG_SHELL=${SH} \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(NOPORTDOCS)
 MAKE_ENV=	DOC=""
@@ -44,4 +45,7 @@ MAKE_ENV=	DOC=doc
 INSTALLS_SHLIB=	yes
 MAN1=		flac.1
 
+post-configure:
+	@${RM} -rf ${WRKSRC}/obj	# "obj" is magic to our make(1)
+
 .include <bsd.port.mk>
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index c678fe0..6ea9868 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1 +1 @@
-MD5 (flac-1.0.3.tar.gz) = 419e4e4c3403055af1cd6d4a735a9201
+MD5 (flac-1.0.4.tar.gz) = b1523e6ad8ef85d1df5b18f20a8cfad6
diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
index f8684ba..14d5d91 100644
--- a/audio/flac/files/patch-Makefile.in
+++ b/audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Sat Jul  6 15:54:56 2002
-+++ Makefile.in	Sat Jul  6 15:55:31 2002
-@@ -137,7 +137,7 @@
+--- Makefile.in.orig	Wed Sep 25 06:53:31 2002
++++ Makefile.in	Sat Oct  5 01:29:53 2002
+@@ -144,7 +144,7 @@
  am__quote = @am__quote@
  install_sh = @install_sh@
  
--SUBDIRS = doc include man src test
-+SUBDIRS = $(DOC) include man src test
+-SUBDIRS = doc include man src test build flac.pbproj obj
++SUBDIRS = $(DOC) include man src test build flac.pbproj
  
  DISTCLEANFILES = libtool-disable-static
  
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index b4f13f6..5d034e4 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,9 +1,17 @@
 
 $FreeBSD$
 
---- configure.orig	Sat Jul  6 15:49:41 2002
-+++ configure	Sat Jul  6 15:49:54 2002
-@@ -9995,7 +9995,7 @@
+--- configure.orig	Wed Sep 25 06:53:08 2002
++++ configure	Sat Oct  5 14:48:41 2002
+@@ -7333,6 +7333,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -11113,7 +11114,7 @@
  if test x$debug = xtrue; then
  	OUR_CFLAGS_TAIL="-g -O0 -DDEBUG"
  else
diff --git a/audio/flac/files/patch-doc_Makefile.in b/audio/flac/files/patch-doc_Makefile.in
index ba0631a..496e05d 100644
--- a/audio/flac/files/patch-doc_Makefile.in
+++ b/audio/flac/files/patch-doc_Makefile.in
@@ -1,17 +1,14 @@
 
 $FreeBSD$
 
---- doc/Makefile.in.orig	Wed Jul  3 23:01:49 2002
-+++ doc/Makefile.in	Sat Jul  6 17:10:19 2002
-@@ -126,9 +126,9 @@
+--- doc/Makefile.in.orig	Sat Oct  5 01:22:15 2002
++++ doc/Makefile.in	Sat Oct  5 01:23:02 2002
+@@ -135,7 +135,7 @@
  
- AUTOMAKE_OPTIONS = foreign
- 
--SUBDIRS = . images ru
-+SUBDIRS = . images
+ SUBDIRS = . html
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/$(PACKAGE)
  
  doc_DATA = \
- 	comparison.html \
+ 	FLAC.tag
diff --git a/audio/flac/files/patch-doc_html_Makefile.in b/audio/flac/files/patch-doc_html_Makefile.in
new file mode 100644
index 0000000..84ecda3
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/html/Makefile.in.orig	Sat Oct  5 01:22:20 2002
++++ doc/html/Makefile.in	Sat Oct  5 01:23:09 2002
+@@ -135,7 +135,7 @@
+ 
+ SUBDIRS = ru images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
++docdir = $(datadir)/doc/$(PACKAGE)/html
+ 
+ doc_DATA = \
+ 	comparison.html \
diff --git a/audio/flac/files/patch-doc_html_images_Makefile.in b/audio/flac/files/patch-doc_html_images_Makefile.in
new file mode 100644
index 0000000..57589f3
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_images_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/html/images/Makefile.in.orig	Sat Oct  5 01:22:31 2002
++++ doc/html/images/Makefile.in	Sat Oct  5 01:23:21 2002
+@@ -133,7 +133,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
++docdir = $(datadir)/doc/$(PACKAGE)/html/images
+ 
+ doc_DATA = \
+ 	1x1.gif \
diff --git a/audio/flac/files/patch-doc_html_ru_Makefile.in b/audio/flac/files/patch-doc_html_ru_Makefile.in
new file mode 100644
index 0000000..c0ddee3
--- /dev/null
+++ b/audio/flac/files/patch-doc_html_ru_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/html/ru/Makefile.in.orig	Sat Oct  5 01:22:27 2002
++++ doc/html/ru/Makefile.in	Sat Oct  5 01:23:15 2002
+@@ -133,7 +133,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
++docdir = $(datadir)/doc/$(PACKAGE)/html/ru
+ 
+ doc_DATA = \
+ 	authors.html \
diff --git a/audio/flac/files/patch-doc_images_Makefile.in b/audio/flac/files/patch-doc_images_Makefile.in
deleted file mode 100644
index 8da79c0..0000000
--- a/audio/flac/files/patch-doc_images_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/images/Makefile.in.orig	Sat Jul  6 16:42:17 2002
-+++ doc/images/Makefile.in	Sat Jul  6 16:43:26 2002
-@@ -126,7 +126,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- 
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/images
-+docdir = $(datadir)/doc/$(PACKAGE)/images
- 
- doc_DATA = \
- 	1x1.gif \
diff --git a/audio/flac/files/patch-src_Makefile.in b/audio/flac/files/patch-src_Makefile.in
new file mode 100644
index 0000000..01a5b49
--- /dev/null
+++ b/audio/flac/files/patch-src_Makefile.in
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- src/Makefile.in.orig	Sat Oct  5 02:34:48 2002
++++ src/Makefile.in	Sat Oct  5 02:35:21 2002
+@@ -131,7 +131,7 @@
+ am__quote = @am__quote@
+ install_sh = @install_sh@
+ 
+-@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_xmms
++@FLaC__HAS_XMMS_TRUE@XMMS_DIRS = plugin_common plugin_xmms
+ 
+ @FLaC__HAS_OGG_TRUE@OGGFLAC_DIRS = libOggFLAC libOggFLAC++
+ @FLaC__HAS_OGG_TRUE@OGGFLAC_TEST_DIRS = test_libOggFLAC test_libOggFLAC++
+@@ -144,7 +144,6 @@
+ 	flac \
+ 	metaflac \
+ 	monkeys_audio_utilities \
+-	plugin_common \
+ 	$(XMMS_DIRS) \
+ 	plugin_winamp2 \
+ 	plugin_winamp3 \
diff --git a/audio/flac/files/patch-src_flac_Makefile.in b/audio/flac/files/patch-src_flac_Makefile.in
new file mode 100644
index 0000000..acb6c7a
--- /dev/null
+++ b/audio/flac/files/patch-src_flac_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/flac/Makefile.in.orig	Sat Oct  5 01:37:42 2002
++++ src/flac/Makefile.in	Sat Oct  5 01:38:19 2002
+@@ -155,7 +155,7 @@
+ 	vorbiscomment.h
+ 
+ 
+-flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ -lm
++flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm
+ subdir = src/flac
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
diff --git a/audio/flac/files/patch-src_metaflac_Makefile.in b/audio/flac/files/patch-src_metaflac_Makefile.in
new file mode 100644
index 0000000..9f36860
--- /dev/null
+++ b/audio/flac/files/patch-src_metaflac_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/metaflac/Makefile.in.orig	Sat Oct  5 01:37:47 2002
++++ src/metaflac/Makefile.in	Sat Oct  5 01:38:37 2002
+@@ -144,7 +144,7 @@
+ 
+ metaflac_LDFLAGS = 
+ 
+-metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ -lm
++metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
+ subdir = src/metaflac
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_CLEAN_FILES =
diff --git a/audio/flac/files/patch-src_plugin__common_Makefile.in b/audio/flac/files/patch-src_plugin__common_Makefile.in
new file mode 100644
index 0000000..b514d14
--- /dev/null
+++ b/audio/flac/files/patch-src_plugin__common_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/plugin_common/Makefile.in.orig	Sat Oct  5 02:24:40 2002
++++ src/plugin_common/Makefile.in	Sat Oct  5 02:27:47 2002
+@@ -169,7 +169,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/id3v1.Po ./$(DEPDIR)/id3v2.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/vorbiscomment.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIC
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 148e300..d446cb0 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