Update audio/flac to 1.0.3. Changes from version 1.0.2 include:

- Use buildlink2.
- Fix build with newer libtool with tagged configuration.
- Move HTML documention into the proper location under doc/html.

* Bug fixes.
* 24-bit input support restored in flac.
* Decoder speedup in libFLAC, which is directly passed on to the
  command-line decoder and plugins.
* New -F option to flac to continue decoding in spite of errors.
* New VORBIS_COMMENT metadata block for tagging with Vorbis-style comments.
* Vastly improved metaflac, now with many editing and tagging options.
* Note: new semantics for -P option in flac.
* Note: removed -R option in flac.
* New metadata interface to libFLAC for manipulating metadata in FLAC files.
* New libFLAC++ API, an object wrapper around libFLAC.
* Customizable metadata filtering by type in decoders.
* Stream encoder can take an arbitrary list of metadata blocks, instead
  of just one SEEKTABLE and/or PADDING block.

7 files changed, 112 insertions, 53 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 526559431c1..9bc0da8f288 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2002/04/27 10:07:01 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/04 19:31:44 jlam Exp $
 #
 
-DISTNAME=		flac-1.0.2-src
-PKGNAME=		flac-1.0.2
+DISTNAME=		flac-1.0.3
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		audio archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
@@ -13,24 +12,17 @@ COMMENT=		free lossless audio codec
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_PLATFORM:MNetBSD-*-i386} != ""
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
 BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 .endif
 
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV+=		ac_cv_path_XMMS_CONFIG="no"
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flac
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flac/images
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flac/ru
-	${INSTALL_DATA} ${WRKSRC}/doc/images/*.gif \
-		${WRKSRC}/doc/images/*.jpg \
-		${PREFIX}/share/doc/flac/images
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/flac
-	${INSTALL_DATA} ${WRKSRC}/doc/ru/*.html ${PREFIX}/share/doc/flac/ru
+USE_LIBTOOL=		yes
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../audio/libogg/buildlink.mk"
+.include "../../audio/libogg/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/flac/PLIST b/audio/flac/PLIST
index 62e1fe00347..3442ad4b380 100644
--- a/audio/flac/PLIST
+++ b/audio/flac/PLIST
@@ -1,48 +1,59 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/27 10:07:01 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/04 19:31:44 jlam Exp $
 bin/flac
 bin/metaflac
+include/FLAC++/all.h
+include/FLAC++/decoder.h
+include/FLAC++/encoder.h
+include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
 include/FLAC/file_decoder.h
 include/FLAC/format.h
+include/FLAC/metadata.h
 include/FLAC/ordinals.h
-include/FLAC/seek_table.h
 include/FLAC/seekable_stream_decoder.h
 include/FLAC/stream_decoder.h
 include/FLAC/stream_encoder.h
-include/FLAC/utility.h
+lib/libFLAC++.a
+lib/libFLAC++.la
+lib/libFLAC++.so
+lib/libFLAC++.so.1
+lib/libFLAC++.so.1.1
 lib/libFLAC.a
 lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.2
-lib/libFLAC.so.2.1
+lib/libFLAC.so.3
+lib/libFLAC.so.3.1
 man/man1/flac.1
-share/doc/flac/images/1x1.gif
-share/doc/flac/images/cafebug.gif
-share/doc/flac/images/logo.jpg
-share/doc/flac/comparison.html
-share/doc/flac/developers.html
-share/doc/flac/documentation.html
-share/doc/flac/download.html
-share/doc/flac/features.html
-share/doc/flac/format.html
-share/doc/flac/goals.html
-share/doc/flac/id.html
-share/doc/flac/index.html
-share/doc/flac/news.html
-share/doc/flac/ru/authors.html
-share/doc/flac/ru/comparison.html
-share/doc/flac/ru/developers.html
-share/doc/flac/ru/documentation.html
-share/doc/flac/ru/download.html
-share/doc/flac/ru/features.html
-share/doc/flac/ru/format.html
-share/doc/flac/ru/goals.html
-share/doc/flac/ru/id.html
-share/doc/flac/ru/index.html
-share/doc/flac/ru/links.html
-share/doc/flac/ru/news.html
+share/aclocal/libFLAC++.m4
+share/aclocal/libFLAC.m4
+share/doc/html/flac/comparison.html
+share/doc/html/flac/developers.html
+share/doc/html/flac/documentation.html
+share/doc/html/flac/download.html
+share/doc/html/flac/features.html
+share/doc/html/flac/format.html
+share/doc/html/flac/goals.html
+share/doc/html/flac/id.html
+share/doc/html/flac/images/1x1.gif
+share/doc/html/flac/images/cafebug.gif
+share/doc/html/flac/images/logo.jpg
+share/doc/html/flac/index.html
+share/doc/html/flac/news.html
+share/doc/html/flac/ru/authors.html
+share/doc/html/flac/ru/comparison.html
+share/doc/html/flac/ru/developers.html
+share/doc/html/flac/ru/documentation.html
+share/doc/html/flac/ru/download.html
+share/doc/html/flac/ru/features.html
+share/doc/html/flac/ru/format.html
+share/doc/html/flac/ru/goals.html
+share/doc/html/flac/ru/id.html
+share/doc/html/flac/ru/index.html
+share/doc/html/flac/ru/links.html
+share/doc/html/flac/ru/news.html
+@dirrm share/doc/html/flac/ru
+@dirrm share/doc/html/flac/images
+@dirrm share/doc/html/flac
 @dirrm include/FLAC
-@dirrm share/doc/flac/images
-@dirrm share/doc/flac/ru
-@dirrm share/doc/flac
+@dirrm include/FLAC++
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 7485423a91a..491859db3fc 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.2 2002/04/27 10:07:01 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/09/04 19:31:44 jlam Exp $
 
-SHA1 (flac-1.0.2-src.tar.gz) = b712611a2902a5a165a1ef205a7b3ebe9695b560
-Size (flac-1.0.2-src.tar.gz) = 458799 bytes
+SHA1 (flac-1.0.3.tar.gz) = 72106148c43f938df441d227f4b6198cfcadfdb8
+Size (flac-1.0.3.tar.gz) = 591337 bytes
+SHA1 (patch-aa) = fc5004816d6c5b1ec2a318374ae00f62e9206cf3
+SHA1 (patch-ab) = 24069c67c210d195f10dc9e8b0dab06e8960c974
+SHA1 (patch-ac) = c8a1cf598ccba2d8ba569b784741fd860c841b3d
+SHA1 (patch-ad) = cfdc250fa293d22d587eb04a2b967d067e059d92
diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa
new file mode 100644
index 00000000000..9ef19c89f21
--- /dev/null
+++ b/audio/flac/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/09/04 19:31:44 jlam Exp $
+
+--- doc/Makefile.in.orig	Wed Sep  4 01:49:17 2002
++++ doc/Makefile.in
+@@ -128,7 +128,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = . images ru
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/html/$(PACKAGE)
+ 
+ doc_DATA = \
+ 	comparison.html \
diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab
new file mode 100644
index 00000000000..a9416ac2be6
--- /dev/null
+++ b/audio/flac/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2002/09/04 19:31:44 jlam Exp $
+
+--- doc/images/Makefile.in.orig	Wed Sep  4 01:49:17 2002
++++ doc/images/Makefile.in
+@@ -126,7 +126,7 @@ install_sh = @install_sh@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/images
++docdir = $(datadir)/doc/html/$(PACKAGE)/images
+ 
+ doc_DATA = \
+ 	1x1.gif \
diff --git a/audio/flac/patches/patch-ac b/audio/flac/patches/patch-ac
new file mode 100644
index 00000000000..bcc5ce5f882
--- /dev/null
+++ b/audio/flac/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/09/04 19:31:45 jlam Exp $
+
+--- doc/ru/Makefile.in.orig	Wed Sep  4 01:49:17 2002
++++ doc/ru/Makefile.in
+@@ -126,7 +126,7 @@ install_sh = @install_sh@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ru
++docdir = $(datadir)/doc/html/$(PACKAGE)/ru
+ 
+ doc_DATA = \
+ 	authors.html \
diff --git a/audio/flac/patches/patch-ad b/audio/flac/patches/patch-ad
new file mode 100644
index 00000000000..1905f24cf37
--- /dev/null
+++ b/audio/flac/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2002/09/04 19:31:45 jlam Exp $
+
+--- src/libFLAC/ia32/Makefile.in.orig	Wed Jul  3 14:01:55 2002
++++ src/libFLAC/ia32/Makefile.in
+@@ -343,7 +343,7 @@ uninstall-am: uninstall-info-am
+ 
+ 
+ .nasm.lo:
+-	$(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
++	$(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: