Update to flac 1.0.4. Notable changes:

flac:
- AIFF input support
- vorbis tag addition whilst encoding (-T)
- various speedups, reductions in memory use, and minor fixes

libraries:
- OggFLAC & OggFLAC++ libraries
- various speedups, reductions in memory use, and minor fixes

(see doc/html/news.html for more info)

8 files changed, 250 insertions, 31 deletions

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 9bc0da8f288..53f9e450d70 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/09/04 19:31:44 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2002/11/10 23:55:13 lukem Exp $
 #
 
-DISTNAME=		flac-1.0.3
+DISTNAME=		flac-1.0.4
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		audio archivers
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=flac/}
diff --git a/audio/flac/PLIST b/audio/flac/PLIST
index 3442ad4b380..e285834229a 100644
--- a/audio/flac/PLIST
+++ b/audio/flac/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/09/04 19:31:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/10 23:55:14 lukem Exp $
 bin/flac
 bin/metaflac
 include/FLAC++/all.h
@@ -8,25 +8,227 @@ 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.1.1
+lib/libFLAC++.so.2
+lib/libFLAC++.so.2.1
 lib/libFLAC.a
 lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.3
-lib/libFLAC.so.3.1
+lib/libFLAC.so.4
+lib/libFLAC.so.4.1
+lib/libOggFLAC++.a
+lib/libOggFLAC++.la
+lib/libOggFLAC++.so
+lib/libOggFLAC++.so.0
+lib/libOggFLAC++.so.0.1
+lib/libOggFLAC.a
+lib/libOggFLAC.la
+lib/libOggFLAC.so
+lib/libOggFLAC.so.0
+lib/libOggFLAC.so.0.1
 man/man1/flac.1
 share/aclocal/libFLAC++.m4
 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_2all_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_2all_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_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_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__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__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/comparison.html
 share/doc/html/flac/developers.html
 share/doc/html/flac/documentation.html
@@ -54,6 +256,9 @@ 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/FLAC
+@dirrm include/OggFLAC++
+@dirrm include/OggFLAC
 @dirrm include/FLAC++
+@dirrm include/FLAC
diff --git a/audio/flac/buildlink2.mk b/audio/flac/buildlink2.mk
index b3f7aa86f00..ca0a7197305 100644
--- a/audio/flac/buildlink2.mk
+++ b/audio/flac/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/09/04 19:35:10 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2002/11/10 23:55:14 lukem Exp $
 
 .if !defined(FLAC_BUILDLINK2_MK)
 FLAC_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		flac
-BUILDLINK_DEPENDS.flac?=	flac>=1.0.3
+BUILDLINK_DEPENDS.flac?=	flac>=1.0.4
 BUILDLINK_PKGSRCDIR.flac?=	../../audio/flac
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.flac=flac
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
index 491859db3fc..ca32daa2da1 100644
--- a/audio/flac/distinfo
+++ b/audio/flac/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2002/09/04 19:31:44 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/11/10 23:55:14 lukem Exp $
 
-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 (flac-1.0.4.tar.gz) = d16beeb8b1f37044d59ba7f2b80a2c3c8db3e7e3
+Size (flac-1.0.4.tar.gz) = 1011175 bytes
+SHA1 (patch-aa) = b4eff7abd3fdd327cdb6bc7cf3ca827ef4cc748a
+SHA1 (patch-ab) = c2f9d4ad2dbe3879f8c2e83e55bc0e03829ec163
+SHA1 (patch-ac) = 1e850825745c452bceb9412dc7c0f14d3c5d12c1
 SHA1 (patch-ad) = cfdc250fa293d22d587eb04a2b967d067e059d92
+SHA1 (patch-ae) = 2eaa8afcb460761c08af2623fbc149634c1815c5
diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa
index 9ef19c89f21..3074ab670b0 100644
--- a/audio/flac/patches/patch-aa
+++ b/audio/flac/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2002/09/04 19:31:44 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/11/10 23:55:14 lukem Exp $
 
---- doc/Makefile.in.orig	Wed Sep  4 01:49:17 2002
+--- doc/Makefile.in.orig	Wed Sep 25 14:53:32 2002
 +++ doc/Makefile.in
-@@ -128,7 +128,7 @@ AUTOMAKE_OPTIONS = foreign
+@@ -135,7 +135,7 @@ AUTOMAKE_OPTIONS = foreign
  
- SUBDIRS = . images ru
+ SUBDIRS = . html
  
 -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 +docdir = $(datadir)/doc/html/$(PACKAGE)
  
  doc_DATA = \
- 	comparison.html \
+ 	FLAC.tag
diff --git a/audio/flac/patches/patch-ab b/audio/flac/patches/patch-ab
index a9416ac2be6..f70a6124b1d 100644
--- a/audio/flac/patches/patch-ab
+++ b/audio/flac/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2002/09/04 19:31:44 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2002/11/10 23:55:14 lukem 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@
+--- doc/html/images/Makefile.in.orig	Wed Sep 25 14:53:33 2002
++++ doc/html/images/Makefile.in
+@@ -133,7 +133,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = foreign
  
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/images
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
 +docdir = $(datadir)/doc/html/$(PACKAGE)/images
  
  doc_DATA = \
diff --git a/audio/flac/patches/patch-ac b/audio/flac/patches/patch-ac
index bcc5ce5f882..f2105be0543 100644
--- a/audio/flac/patches/patch-ac
+++ b/audio/flac/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1 2002/09/04 19:31:45 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2002/11/10 23:55:14 lukem 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@
+--- doc/html/ru/Makefile.in.orig	Wed Sep 25 14:53:33 2002
++++ doc/html/ru/Makefile.in
+@@ -133,7 +133,7 @@ install_sh = @install_sh@
  
  AUTOMAKE_OPTIONS = foreign
  
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ru
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
 +docdir = $(datadir)/doc/html/$(PACKAGE)/ru
  
  doc_DATA = \
diff --git a/audio/flac/patches/patch-ae b/audio/flac/patches/patch-ae
new file mode 100644
index 00000000000..a550978c861
--- /dev/null
+++ b/audio/flac/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2002/11/10 23:55:14 lukem Exp $
+
+--- doc/html/Makefile.in.orig	Wed Sep 25 14:53:33 2002
++++ doc/html/Makefile.in
+@@ -135,7 +135,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = ru images
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
++docdir = $(datadir)/doc/html/$(PACKAGE)
+ 
+ doc_DATA = \
+ 	comparison.html \