Changes 1.1.1:

* Almost 2x decoding speed-up on Macintosh
* Better Ogg FLAC support
* Several new options to flac and metaflac

8 files changed, 51 insertions, 259 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 490bcbc18ea..d7135a3ecdd 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.24 2004/08/28 06:05:31 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.25 2004/10/01 13:17:50 adam Exp $
 
-DISTNAME=		flac-1.1.0
-PKGREVISION=		1
-CATEGORIES=		audio archivers
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
+DISTNAME=	flac-1.1.1
+CATEGORIES=	audio archivers
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=flac/}
 
-MAINTAINER=		ben@NetBSD.org
-HOMEPAGE=		http://flac.sourceforge.net/
-COMMENT=		Free lossless audio codec
+MAINTAINER=	ben@NetBSD.org
+HOMEPAGE=	http://flac.sourceforge.net/
+COMMENT=	Free lossless audio codec
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 USE_BUILDLINK3=		yes
@@ -29,7 +27,6 @@ NOT_FOR_COMPILER=	sunpro
 
 # This version of flac doesn't seem to build correctly with -O3 using
 # the MIPSpro compiler.
-#
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mmipspro)
 BUILDLINK_TRANSFORM+=	rm:-O3
diff --git a/audio/flac/PLIST b/audio/flac/PLIST
index 3de766e4314..3b231bce535 100644
--- a/audio/flac/PLIST
+++ b/audio/flac/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/10/01 13:17:50 adam Exp $
 bin/flac
 bin/metaflac
 include/FLAC++/all.h
@@ -8,6 +8,7 @@ include/FLAC++/export.h
 include/FLAC++/metadata.h
 include/FLAC/all.h
 include/FLAC/assert.h
+include/FLAC/callback.h
 include/FLAC/export.h
 include/FLAC/file_decoder.h
 include/FLAC/file_encoder.h
@@ -23,7 +24,11 @@ include/OggFLAC++/decoder.h
 include/OggFLAC++/encoder.h
 include/OggFLAC++/export.h
 include/OggFLAC/all.h
+include/OggFLAC/file_decoder.h
+include/OggFLAC/file_encoder.h
 include/OggFLAC/export.h
+include/OggFLAC/seekable_stream_decoder.h
+include/OggFLAC/seekable_stream_encoder.h
 include/OggFLAC/stream_decoder.h
 include/OggFLAC/stream_encoder.h
 lib/libFLAC++.la
@@ -37,220 +42,25 @@ share/aclocal/libFLAC.m4
 share/aclocal/libOggFLAC++.m4
 share/aclocal/libOggFLAC.m4
 share/doc/html/flac/FLAC.tag
-share/doc/html/flac/api/+_2metadata_8h-source.html
-share/doc/html/flac/api/+_2metadata_8h.html
-share/doc/html/flac/api/FLAC++_2all_8h-source.html
-share/doc/html/flac/api/FLAC++_2decoder_8h-source.html
-share/doc/html/flac/api/FLAC++_2decoder_8h.html
-share/doc/html/flac/api/FLAC++_2encoder_8h-source.html
-share/doc/html/flac/api/FLAC++_2encoder_8h.html
-share/doc/html/flac/api/FLAC++_2export_8h-source.html
-share/doc/html/flac/api/FLAC_2all_8h-source.html
-share/doc/html/flac/api/FLAC_2export_8h-source.html
-share/doc/html/flac/api/FLAC_2stream__decoder_8h-source.html
-share/doc/html/flac/api/FLAC_2stream__decoder_8h.html
-share/doc/html/flac/api/FLAC_2stream__encoder_8h-source.html
-share/doc/html/flac/api/FLAC_2stream__encoder_8h.html
-share/doc/html/flac/api/OggFLAC++_2all_8h-source.html
-share/doc/html/flac/api/OggFLAC++_2decoder_8h-source.html
-share/doc/html/flac/api/OggFLAC++_2decoder_8h.html
-share/doc/html/flac/api/OggFLAC++_2encoder_8h-source.html
-share/doc/html/flac/api/OggFLAC++_2encoder_8h.html
-share/doc/html/flac/api/OggFLAC++_2export_8h-source.html
-share/doc/html/flac/api/OggFLAC_2all_8h-source.html
-share/doc/html/flac/api/OggFLAC_2export_8h-source.html
-share/doc/html/flac/api/OggFLAC_2stream__decoder_8h-source.html
-share/doc/html/flac/api/OggFLAC_2stream__decoder_8h.html
-share/doc/html/flac/api/OggFLAC_2stream__encoder_8h-source.html
-share/doc/html/flac/api/OggFLAC_2stream__encoder_8h.html
-share/doc/html/flac/api/annotated.html
-share/doc/html/flac/api/assert_8h-source.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1File-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1File.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1SeekableStream.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream-members.html
-share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1File-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1File.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1SeekableStream.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream-members.html
-share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Iterator.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-share/doc/html/flac/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
-share/doc/html/flac/api/classOggFLAC_1_1Decoder_1_1Stream.html
-share/doc/html/flac/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
-share/doc/html/flac/api/classOggFLAC_1_1Encoder_1_1Stream.html
-share/doc/html/flac/api/classes.html
-share/doc/html/flac/api/doxygen.css
-share/doc/html/flac/api/doxygen.gif
-share/doc/html/flac/api/file__decoder_8h-source.html
-share/doc/html/flac/api/file__decoder_8h.html
-share/doc/html/flac/api/file__encoder_8h-source.html
-share/doc/html/flac/api/file__encoder_8h.html
-share/doc/html/flac/api/files.html
-share/doc/html/flac/api/format_8h-source.html
-share/doc/html/flac/api/format_8h.html
-share/doc/html/flac/api/functions.html
-share/doc/html/flac/api/globals.html
-share/doc/html/flac/api/group__flac.html
-share/doc/html/flac/api/group__flac__decoder.html
-share/doc/html/flac/api/group__flac__encoder.html
-share/doc/html/flac/api/group__flac__file__decoder.html
-share/doc/html/flac/api/group__flac__file__encoder.html
-share/doc/html/flac/api/group__flac__format.html
-share/doc/html/flac/api/group__flac__metadata.html
-share/doc/html/flac/api/group__flac__metadata__level0.html
-share/doc/html/flac/api/group__flac__metadata__level1.html
-share/doc/html/flac/api/group__flac__metadata__level2.html
-share/doc/html/flac/api/group__flac__metadata__object.html
-share/doc/html/flac/api/group__flac__seekable__stream__decoder.html
-share/doc/html/flac/api/group__flac__seekable__stream__encoder.html
-share/doc/html/flac/api/group__flac__stream__decoder.html
-share/doc/html/flac/api/group__flac__stream__encoder.html
-share/doc/html/flac/api/group__flacpp.html
-share/doc/html/flac/api/group__flacpp__decoder.html
-share/doc/html/flac/api/group__flacpp__encoder.html
-share/doc/html/flac/api/group__flacpp__file__decoder.html
-share/doc/html/flac/api/group__flacpp__file__encoder.html
-share/doc/html/flac/api/group__flacpp__metadata.html
-share/doc/html/flac/api/group__flacpp__metadata__level0.html
-share/doc/html/flac/api/group__flacpp__metadata__level1.html
-share/doc/html/flac/api/group__flacpp__metadata__level2.html
-share/doc/html/flac/api/group__flacpp__metadata__object.html
-share/doc/html/flac/api/group__flacpp__seekable__stream__decoder.html
-share/doc/html/flac/api/group__flacpp__seekable__stream__encoder.html
-share/doc/html/flac/api/group__flacpp__stream__decoder.html
-share/doc/html/flac/api/group__flacpp__stream__encoder.html
-share/doc/html/flac/api/group__oggflac.html
-share/doc/html/flac/api/group__oggflac__decoder.html
-share/doc/html/flac/api/group__oggflac__encoder.html
-share/doc/html/flac/api/group__oggflac__stream__decoder.html
-share/doc/html/flac/api/group__oggflac__stream__encoder.html
-share/doc/html/flac/api/group__oggflacpp.html
-share/doc/html/flac/api/group__oggflacpp__decoder.html
-share/doc/html/flac/api/group__oggflacpp__encoder.html
-share/doc/html/flac/api/group__oggflacpp__stream__decoder.html
-share/doc/html/flac/api/group__oggflacpp__stream__encoder.html
-share/doc/html/flac/api/hierarchy.html
-share/doc/html/flac/api/index.html
-share/doc/html/flac/api/metadata_8h-source.html
-share/doc/html/flac/api/metadata_8h.html
-share/doc/html/flac/api/modules.html
-share/doc/html/flac/api/ordinals_8h-source.html
-share/doc/html/flac/api/seekable__stream__decoder_8h-source.html
-share/doc/html/flac/api/seekable__stream__decoder_8h.html
-share/doc/html/flac/api/seekable__stream__encoder_8h-source.html
-share/doc/html/flac/api/seekable__stream__encoder_8h.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-share/doc/html/flac/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-share/doc/html/flac/api/structFLAC____FileDecoder-members.html
-share/doc/html/flac/api/structFLAC____FileDecoder.html
-share/doc/html/flac/api/structFLAC____FileEncoder-members.html
-share/doc/html/flac/api/structFLAC____FileEncoder.html
-share/doc/html/flac/api/structFLAC____Frame-members.html
-share/doc/html/flac/api/structFLAC____Frame.html
-share/doc/html/flac/api/structFLAC____FrameFooter-members.html
-share/doc/html/flac/api/structFLAC____FrameFooter.html
-share/doc/html/flac/api/structFLAC____FrameHeader-members.html
-share/doc/html/flac/api/structFLAC____FrameHeader.html
-share/doc/html/flac/api/structFLAC____SeekableStreamDecoder-members.html
-share/doc/html/flac/api/structFLAC____SeekableStreamDecoder.html
-share/doc/html/flac/api/structFLAC____SeekableStreamEncoder-members.html
-share/doc/html/flac/api/structFLAC____SeekableStreamEncoder.html
-share/doc/html/flac/api/structFLAC____StreamDecoder-members.html
-share/doc/html/flac/api/structFLAC____StreamDecoder.html
-share/doc/html/flac/api/structFLAC____StreamEncoder-members.html
-share/doc/html/flac/api/structFLAC____StreamEncoder.html
-share/doc/html/flac/api/structFLAC____StreamMetadata-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Application-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Application.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Index.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__CueSheet__Track.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Padding-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Padding.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekPoint-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekPoint.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekTable-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__SeekTable.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__StreamInfo-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__StreamInfo.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Unknown-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__Unknown.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-share/doc/html/flac/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-share/doc/html/flac/api/structFLAC____Subframe-members.html
-share/doc/html/flac/api/structFLAC____Subframe.html
-share/doc/html/flac/api/structFLAC____Subframe__Constant-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Constant.html
-share/doc/html/flac/api/structFLAC____Subframe__Fixed-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Fixed.html
-share/doc/html/flac/api/structFLAC____Subframe__LPC-members.html
-share/doc/html/flac/api/structFLAC____Subframe__LPC.html
-share/doc/html/flac/api/structFLAC____Subframe__Verbatim-members.html
-share/doc/html/flac/api/structFLAC____Subframe__Verbatim.html
-share/doc/html/flac/api/structOggFLAC____StreamDecoder-members.html
-share/doc/html/flac/api/structOggFLAC____StreamDecoder.html
-share/doc/html/flac/api/structOggFLAC____StreamEncoder-members.html
-share/doc/html/flac/api/structOggFLAC____StreamEncoder.html
+share/doc/html/flac/changelog.html
 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/faq.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/images/logo100.gif
+share/doc/html/flac/images/logo130.gif
 share/doc/html/flac/index.html
+share/doc/html/flac/license.html
+share/doc/html/flac/links.html
 share/doc/html/flac/news.html
+share/doc/html/flac/ogg_mapping.html
 share/doc/html/flac/ru/authors.html
 share/doc/html/flac/ru/comparison.html
 share/doc/html/flac/ru/developers.html
@@ -265,7 +75,6 @@ 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/api
 @dirrm share/doc/html/flac
 @dirrm include/OggFLAC++
 @dirrm include/OggFLAC
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 8348e4c31d6..8a757df79b2 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2003/02/14 23:25:33 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/10/01 13:17:50 adam Exp $
 
-SHA1 (flac-1.1.0.tar.gz) = 80334c1ebc693fb92e01f5a55ed332fbe9809592
-Size (flac-1.1.0.tar.gz) = 1201861 bytes
-SHA1 (patch-aa) = b4eff7abd3fdd327cdb6bc7cf3ca827ef4cc748a
-SHA1 (patch-ab) = c2f9d4ad2dbe3879f8c2e83e55bc0e03829ec163
-SHA1 (patch-ac) = 1e850825745c452bceb9412dc7c0f14d3c5d12c1
-SHA1 (patch-ad) = cfdc250fa293d22d587eb04a2b967d067e059d92
-SHA1 (patch-ae) = 2eaa8afcb460761c08af2623fbc149634c1815c5
+SHA1 (flac-1.1.1.tar.gz) = 97832e5acad2f20867aafc30f219e47d26b853ac
+Size (flac-1.1.1.tar.gz) = 1467204 bytes
+SHA1 (patch-aa) = 8389e42e3a90877af795d8e401c438de98ddcc8f
+SHA1 (patch-ab) = abf4df5033956d9c4214064660f82a82619cb3fd
+SHA1 (patch-ac) = 4da64f547cc44cc48a0fb0a761ce7654aa32704a
+SHA1 (patch-ae) = a9ea14a0d0f05c0b49db08e8e62c46589e2b0f2e
diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa
index 3074ab670b0..ec0ea3493e2 100644
--- a/audio/flac/patches/patch-aa
+++ b/audio/flac/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2002/11/10 23:55:14 lukem Exp $
+$NetBSD: patch-aa,v 1.3 2004/10/01 13:17:50 adam Exp $
 
---- doc/Makefile.in.orig	Wed Sep 25 14:53:32 2002
+--- doc/Makefile.in.orig	2004-09-29 04:18:28.000000000 +0000
 +++ doc/Makefile.in
-@@ -135,7 +135,7 @@ AUTOMAKE_OPTIONS = foreign
- 
+@@ -222,7 +222,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = . html
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/html/$(PACKAGE)
- 
  doc_DATA = \
  	FLAC.tag
+ 
diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab
index f70a6124b1d..882752553ed 100644
--- a/audio/flac/patches/patch-ab
+++ b/audio/flac/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/11/10 23:55:14 lukem Exp $
+$NetBSD: patch-ab,v 1.3 2004/10/01 13:17:50 adam Exp $
 
---- doc/html/images/Makefile.in.orig	Wed Sep 25 14:53:33 2002
+--- doc/html/images/Makefile.in.orig	2004-09-29 04:18:29.000000000 +0000
 +++ doc/html/images/Makefile.in
-@@ -133,7 +133,7 @@ install_sh = @install_sh@
- 
+@@ -212,7 +212,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
 +docdir = $(datadir)/doc/html/$(PACKAGE)/images
- 
  doc_DATA = \
  	1x1.gif \
+ 	cafebug.gif \
diff --git a/audio/flac/patches/patch-ac b/audio/flac/patches/patch-ac
index f2105be0543..2500a968c4a 100644
--- a/audio/flac/patches/patch-ac
+++ b/audio/flac/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2002/11/10 23:55:14 lukem Exp $
+$NetBSD: patch-ac,v 1.3 2004/10/01 13:17:50 adam Exp $
 
---- doc/html/ru/Makefile.in.orig	Wed Sep 25 14:53:33 2002
+--- doc/html/ru/Makefile.in.orig	2004-09-29 04:18:30.000000000 +0000
 +++ doc/html/ru/Makefile.in
-@@ -133,7 +133,7 @@ install_sh = @install_sh@
- 
+@@ -212,7 +212,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  AUTOMAKE_OPTIONS = foreign
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
 +docdir = $(datadir)/doc/html/$(PACKAGE)/ru
- 
  doc_DATA = \
  	authors.html \
+ 	comparison.html \
diff --git a/audio/flac/patches/patch-ad b/audio/flac/patches/patch-ad
deleted file mode 100644
index 1905f24cf37..00000000000
--- a/audio/flac/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$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:
diff --git a/audio/flac/patches/patch-ae b/audio/flac/patches/patch-ae
index a550978c861..c136a9ea951 100644
--- a/audio/flac/patches/patch-ae
+++ b/audio/flac/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2002/11/10 23:55:14 lukem Exp $
+$NetBSD: patch-ae,v 1.2 2004/10/01 13:17:50 adam Exp $
 
---- doc/html/Makefile.in.orig	Wed Sep 25 14:53:33 2002
+--- doc/html/Makefile.in.orig	2004-09-29 04:18:29.000000000 +0000
 +++ doc/html/Makefile.in
-@@ -135,7 +135,7 @@ AUTOMAKE_OPTIONS = foreign
- 
+@@ -222,7 +222,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
  SUBDIRS = ru images
- 
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
 +docdir = $(datadir)/doc/html/$(PACKAGE)
- 
  doc_DATA = \
+ 	changelog.html \
  	comparison.html \