7 files changed, 33 insertions, 237 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 6fbb7300cfba..f2a5e1a6621f 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	flac
-PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTVERSION=	1.3.0
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/flac/
 
@@ -12,28 +11,28 @@ COMMENT=	Free lossless audio codec
 
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg
 
+USES=		pathfix
 USE_AUTOTOOLS=	libtool
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sse \
 		--with-ogg="${LOCALBASE}" \
+		--disable-silent-rules \
 		--disable-thorough-tests \
 		--disable-xmms-plugin
-CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS_DEFINE=	ICONV
+OPTIONS_DEFINE=	DOCS ICONV
 OPTIONS_DEFAULT=ICONV
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICONV}
 USES+=		iconv
-CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}"
-.else
-CONFIGURE_ARGS+=--without-libiconv-prefix
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
-MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 .if ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	DOC=doc
 .else
@@ -53,10 +52,6 @@ pre-patch:
 	@${REINPLACE_CMD} 's:^docdir = $$(datadir)/doc/$$(PACKAGE)-$$(VERSION):docdir = $$(datadir)/doc/$$(PACKAGE):' \
 		`find ${WRKSRC}/doc -name Makefile.in`
 
-# "obj" is magic to our make(1)
-post-configure:
-	@${RM} -rf ${WRKSRC}/obj
-
 post-build:
 	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
 
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 72f3a3237456..60d728331dda 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,2 +1,2 @@
-SHA256 (flac-1.2.1.tar.gz) = 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
-SIZE (flac-1.2.1.tar.gz) = 2009217
+SHA256 (flac-1.3.0.tar.xz) = fa2d64aac1f77e31dfbb270aeb08f5b32e27036a52ad15e69a77e309528010dc
+SIZE (flac-1.3.0.tar.xz) = 1084256
diff --git a/audio/flac/files/patch-Makefile.in b/audio/flac/files/patch-Makefile.in
index 14dd79539ad5..7246f1072586 100644
--- a/audio/flac/files/patch-Makefile.in
+++ b/audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- Makefile.in.orig
-+++ Makefile.in
-@@ -234,7 +234,7 @@
- 
- AUTOMAKE_OPTIONS = foreign 1.7
- 
--SUBDIRS = doc include m4 man src examples test build obj
-+SUBDIRS = $(DOC) include m4 man src test build
- 
- DISTCLEANFILES = libtool-disable-static
- 
+--- Makefile.in.orig	2013-05-27 10:11:58.639908000 +0200
++++ Makefile.in	2013-06-09 18:13:05.000000000 +0200
+@@ -323,7 +323,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = doc include m4 man src examples test build objs
++SUBDIRS = $(DOC) include m4 man src examples test build objs
+ EXTRA_DIST = \
+ 	COPYING.FDL \
+ 	COPYING.GPL \
diff --git a/audio/flac/files/patch-configure b/audio/flac/files/patch-configure
index 75fe5afb534a..f4d604e92fac 100644
--- a/audio/flac/files/patch-configure
+++ b/audio/flac/files/patch-configure
@@ -1,14 +1,14 @@
 
 $FreeBSD$
 
---- configure.orig
-+++ configure
-@@ -23490,7 +23490,7 @@
+--- configure.orig	2013-05-27 10:11:54.740045000 +0200
++++ configure	2013-06-09 18:15:53.000000000 +0200
+@@ -19807,7 +19807,7 @@ else
  	CPPFLAGS="-DNDEBUG $CPPFLAGS"
  	if test "x$GCC" = xyes; then
- 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
--		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+		CFLAGS="-Wall -W $CFLAGS"
+ 		if test "x$user_cflags" = x; then
+-			CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
++			CFLAGS="-Wall -W"
+ 		fi
  	fi
  fi
- 
diff --git a/audio/flac/files/patch-man_flac.1 b/audio/flac/files/patch-man_flac.1
index 48102d8cd528..938598f371ed 100644
--- a/audio/flac/files/patch-man_flac.1
+++ b/audio/flac/files/patch-man_flac.1
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- man/flac.1.orig
-+++ man/flac.1
-@@ -325,7 +325,7 @@
+--- man/flac.1.orig	2013-05-26 11:30:33.924201000 +0200
++++ man/flac.1	2013-06-09 18:16:59.000000000 +0200
+@@ -380,7 +380,7 @@ These flags can be used to invert the se
  .PP
  metaflac(1).
  .PP
--The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
+-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
 +The programs are documented fully by HTML format documentation, available in \fI%%PREFIX%%/share/doc/flac/html\fR.
  .SH "AUTHOR"
  .PP
diff --git a/audio/flac/files/patch-src_libFLAC_Makefile.in b/audio/flac/files/patch-src_libFLAC_Makefile.in
deleted file mode 100644
index 83d8e416ea8c..000000000000
--- a/audio/flac/files/patch-src_libFLAC_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/libFLAC/Makefile.in.orig
-+++ src/libFLAC/Makefile.in
-@@ -249,7 +249,6 @@
- @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la
--@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE@LOCAL_EXTRA_LDFLAGS = ""
- 
- libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist
index 60dea510fef6..87a1fba987d9 100644
--- a/audio/flac/pkg-plist
+++ b/audio/flac/pkg-plist
@@ -18,201 +18,16 @@ include/FLAC/stream_encoder.h
 lib/libFLAC++.a
 lib/libFLAC++.la
 lib/libFLAC++.so
-lib/libFLAC++.so.8
+lib/libFLAC++.so.9
 lib/libFLAC.a
 lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.10
+lib/libFLAC.so.11
 libdata/pkgconfig/flac++.pc
 libdata/pkgconfig/flac.pc
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000000.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000001.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000002.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/dirs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__export.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__export.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__2__to__1__1__3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__3__to__1__1__4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__4__to__1__2__0.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Application.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__StreamInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Unknown.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Constant.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Fixed.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
@@ -304,7 +119,6 @@ share/aclocal/libFLAC.m4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/hw
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/FLAC++