diff options
| -rw-r--r-- | audio/flac/Makefile | 8 | ||||
| -rw-r--r-- | audio/flac/PLIST | 207 | ||||
| -rw-r--r-- | audio/flac/buildlink3.mk | 4 | ||||
| -rw-r--r-- | audio/flac/distinfo | 18 | ||||
| -rw-r--r-- | audio/flac/patches/patch-aa | 12 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ab | 12 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ac | 12 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ad | 10 | ||||
| -rw-r--r-- | audio/flac/patches/patch-ae | 12 |
9 files changed, 228 insertions, 67 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 61ba3efc90e..a98a64ef28d 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.39 2006/12/15 14:34:19 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2007/01/07 12:25:05 wiz Exp $ -DISTNAME= flac-1.1.2 -PKGREVISION= 1 +DISTNAME= flac-1.1.3 CATEGORIES= audio archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=flac/} @@ -40,8 +39,9 @@ CONFIGURE_ARGS+= --disable-asm-optimizations .include "../../mk/compiler.mk" -# This version of flac doesn't seem to build correctly with -O3 using +# Version 1.1.2 of flac doesn't seem to build correctly with -O3 using # the MIPSpro compiler. +# XXX: retry for 1.1.3 .if !empty(PKGSRC_COMPILER:Mmipspro) BUILDLINK_TRANSFORM+= rm:-O3 .endif diff --git a/audio/flac/PLIST b/audio/flac/PLIST index 2a3748b6e54..37f76343179 100644 --- a/audio/flac/PLIST +++ b/audio/flac/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2005/02/28 14:09:19 wiz Exp $ +@comment $NetBSD: PLIST,v 1.9 2007/01/07 12:25:05 wiz Exp $ bin/flac bin/metaflac include/FLAC++/all.h @@ -10,38 +10,199 @@ 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 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++/export.h -include/OggFLAC/all.h -include/OggFLAC/export.h -include/OggFLAC/file_decoder.h -include/OggFLAC/file_encoder.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 lib/libFLAC.la -lib/libOggFLAC++.la -lib/libOggFLAC.la man/man1/flac.1 man/man1/metaflac.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/+_2all_8h-source.html +share/doc/html/flac/api/+_2export_8h-source.html +share/doc/html/flac/api/+_2metadata_8h-source.html +share/doc/html/flac/api/+_2metadata_8h.html +share/doc/html/flac/api/all_8h-source.html +share/doc/html/flac/api/annotated.html +share/doc/html/flac/api/assert_8h-source.html +share/doc/html/flac/api/callback_8h-source.html +share/doc/html/flac/api/callback_8h.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_1File.png +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_1Decoder_1_1Stream.png +share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html +share/doc/html/flac/api/classFLAC_1_1Decoder_1_1Stream_1_1State.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_1File.png +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_1Encoder_1_1Stream.png +share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html +share/doc/html/flac/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Application.png +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_1Chain_1_1Status-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1CueSheet.png +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.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Padding.png +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Picture.png +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Prototype.png +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SeekTable.png +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_1SimpleIterator_1_1Status-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1StreamInfo.png +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1Unknown.png +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.html +share/doc/html/flac/api/classFLAC_1_1Metadata_1_1VorbisComment.png +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/classes.html +share/doc/html/flac/api/decoder_8h-source.html +share/doc/html/flac/api/decoder_8h.html +share/doc/html/flac/api/dir_000000.html +share/doc/html/flac/api/dir_000001.html +share/doc/html/flac/api/dir_000002.html +share/doc/html/flac/api/dirs.html +share/doc/html/flac/api/doxygen.css +share/doc/html/flac/api/doxygen.png +share/doc/html/flac/api/encoder_8h-source.html +share/doc/html/flac/api/encoder_8h.html +share/doc/html/flac/api/export_8h-source.html +share/doc/html/flac/api/export_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/functions_func.html +share/doc/html/flac/api/functions_vars.html +share/doc/html/flac/api/globals.html +share/doc/html/flac/api/globals_0x66.html +share/doc/html/flac/api/globals_0x67.html +share/doc/html/flac/api/globals_defs.html +share/doc/html/flac/api/globals_enum.html +share/doc/html/flac/api/globals_eval.html +share/doc/html/flac/api/globals_func.html +share/doc/html/flac/api/globals_type.html +share/doc/html/flac/api/globals_vars.html +share/doc/html/flac/api/group__flac.html +share/doc/html/flac/api/group__flac__callbacks.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__export.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__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__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__porting.html +share/doc/html/flac/api/group__porting__1__1__2__to__1__1__3.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/stream__decoder_8h-source.html +share/doc/html/flac/api/stream__decoder_8h.html +share/doc/html/flac/api/stream__encoder_8h-source.html +share/doc/html/flac/api/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____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____IOCallbacks-members.html +share/doc/html/flac/api/structFLAC____IOCallbacks.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__Picture-members.html +share/doc/html/flac/api/structFLAC____StreamMetadata__Picture.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/changelog.html share/doc/html/flac/comparison.html share/doc/html/flac/developers.html @@ -50,6 +211,7 @@ share/doc/html/flac/download.html share/doc/html/flac/faq.html share/doc/html/flac/favicon.ico share/doc/html/flac/features.html +share/doc/html/flac/flac.css share/doc/html/flac/format.html share/doc/html/flac/goals.html share/doc/html/flac/id.html @@ -76,8 +238,7 @@ 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 @dirrm include/FLAC++ @dirrm include/FLAC diff --git a/audio/flac/buildlink3.mk b/audio/flac/buildlink3.mk index 570473a7875..0b872dd1214 100644 --- a/audio/flac/buildlink3.mk +++ b/audio/flac/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:35 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2007/01/07 12:25:05 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ FLAC_BUILDLINK3_MK:= ${FLAC_BUILDLINK3_MK}+ @@ -13,7 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}flac .if !empty(FLAC_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.flac+= flac>=1.1.0nb1 -BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.2nb1 +BUILDLINK_ABI_DEPENDS.flac+= flac>=1.1.3 BUILDLINK_PKGSRCDIR.flac?= ../../audio/flac .endif # FLAC_BUILDLINK3_MK diff --git a/audio/flac/distinfo b/audio/flac/distinfo index bf87a090ef9..49f14fdb8cb 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.13 2006/07/06 12:39:10 markd Exp $ +$NetBSD: distinfo,v 1.14 2007/01/07 12:25:05 wiz Exp $ -SHA1 (flac-1.1.2.tar.gz) = 65501f3547df99b153951edb2ee7bfc13dd56946 -RMD160 (flac-1.1.2.tar.gz) = 58656837b02e211eaed5010d84c4ed59841c82d3 -Size (flac-1.1.2.tar.gz) = 1516235 bytes -SHA1 (patch-aa) = debaf60c08f942682aca8a8461475a743c53034f -SHA1 (patch-ab) = 232db53797c1533bfbe8bb619e713d771ddf27d1 -SHA1 (patch-ac) = 1d305f4a48d96dc3e7cd80fd02f73340a643a982 -SHA1 (patch-ad) = 2f28211919873412f7d10e5a716fa0aa0abf68cf -SHA1 (patch-ae) = 60e14c3d6622d616b5ff2987224f57145c7fb504 +SHA1 (flac-1.1.3.tar.gz) = e19c92bebe536b69dd14d54de76c1f626b83b295 +RMD160 (flac-1.1.3.tar.gz) = 3bb360940775b6b2a5127accfb12d29c04da1132 +Size (flac-1.1.3.tar.gz) = 1592699 bytes +SHA1 (patch-aa) = 2e81bac9dba5b7f66118bbdb3ed77786701072e4 +SHA1 (patch-ab) = d7b48e37ca81450d0ffc4a97914d06c1464daf7b +SHA1 (patch-ac) = 647657a3af2db35dbce6fcef2f238c543b55573e +SHA1 (patch-ad) = 9df5668bb5ffc0850be0a3b34ada825642752874 +SHA1 (patch-ae) = b73e4b160c9435525e96213d6c77e743947746d3 SHA1 (patch-af) = 945fd4fa294f84ebbbeeb561bf7ce0885261539c diff --git a/audio/flac/patches/patch-aa b/audio/flac/patches/patch-aa index 4435ccf7365..b2e0a3d1aef 100644 --- a/audio/flac/patches/patch-aa +++ b/audio/flac/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.4 2005/02/28 14:09:19 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2007/01/07 12:25:05 wiz Exp $ ---- doc/Makefile.in.orig 2005-02-05 03:23:27.000000000 +0100 +--- doc/Makefile.in.orig 2006-11-27 06:40:50.000000000 +0000 +++ doc/Makefile.in -@@ -236,7 +236,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = foreign +@@ -220,7 +220,7 @@ 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 503344cd1b2..37dfa194a47 100644 --- a/audio/flac/patches/patch-ab +++ b/audio/flac/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.4 2005/02/28 14:09:19 wiz Exp $ +$NetBSD: patch-ab,v 1.5 2007/01/07 12:25:05 wiz Exp $ ---- doc/html/images/Makefile.in.orig 2005-02-05 03:23:28.000000000 +0100 +--- doc/html/images/Makefile.in.orig 2006-11-27 06:40:52.000000000 +0000 +++ doc/html/images/Makefile.in -@@ -226,7 +226,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -218,7 +218,7 @@ 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 ac4b4206ea7..ef7cc78afcf 100644 --- a/audio/flac/patches/patch-ac +++ b/audio/flac/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.4 2005/02/28 14:09:19 wiz Exp $ +$NetBSD: patch-ac,v 1.5 2007/01/07 12:25:05 wiz Exp $ ---- doc/html/ru/Makefile.in.orig 2005-02-05 03:23:29.000000000 +0100 +--- doc/html/ru/Makefile.in.orig 2006-11-27 06:40:53.000000000 +0000 +++ doc/html/ru/Makefile.in -@@ -226,7 +226,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -218,7 +218,7 @@ 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 index a552f2975bc..3182f366c9d 100644 --- a/audio/flac/patches/patch-ad +++ b/audio/flac/patches/patch-ad @@ -1,17 +1,17 @@ -$NetBSD: patch-ad,v 1.4 2005/11/08 01:21:11 tv Exp $ +$NetBSD: patch-ad,v 1.5 2007/01/07 12:25:05 wiz Exp $ ---- include/FLAC/ordinals.h.orig 2005-01-24 23:12:17.000000000 -0500 +--- include/FLAC/ordinals.h.orig 2006-11-20 07:05:18.000000000 +0000 +++ include/FLAC/ordinals.h @@ -32,7 +32,7 @@ #ifndef FLAC__ORDINALS_H #define FLAC__ORDINALS_H --#ifndef _MSC_VER -+#if !defined(_MSC_VER) && !defined(__INTERIX) +-#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__)) ++#if !(defined(_MSC_VER) || defined(__BORLANDC__) || defined(__EMX__) || defined(__INTERIX)) #include <inttypes.h> #endif -@@ -52,8 +52,12 @@ typedef int32_t FLAC__int32; +@@ -59,8 +59,12 @@ typedef int32_t FLAC__int32; typedef int64_t FLAC__int64; typedef uint16_t FLAC__uint16; typedef uint32_t FLAC__uint32; diff --git a/audio/flac/patches/patch-ae b/audio/flac/patches/patch-ae index 1c34049cffd..891afcfa091 100644 --- a/audio/flac/patches/patch-ae +++ b/audio/flac/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.3 2005/02/28 14:09:19 wiz Exp $ +$NetBSD: patch-ae,v 1.4 2007/01/07 12:25:05 wiz Exp $ ---- doc/html/Makefile.in.orig 2005-02-05 03:23:28.000000000 +0100 +--- doc/html/Makefile.in.orig 2006-11-27 06:40:51.000000000 +0000 +++ doc/html/Makefile.in -@@ -236,7 +236,7 @@ sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = foreign +@@ -220,7 +220,7 @@ AUTOMAKE_OPTIONS = foreign + SUBDIRS = ru images + -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html +docdir = $(datadir)/doc/html/$(PACKAGE) + doc_DATA = \ changelog.html \ - comparison.html \ |