[pkgsrc/trunk]: pkgsrc/audio/flac Bump PKGREVISION for libogg update, and fix...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5693b2c8926f
branches:  trunk
changeset: 464388:5693b2c8926f
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Dec 08 14:42:44 2003 +0000

description:
Bump PKGREVISION for libogg update, and fix bl2 file while here.

diffstat:

 audio/flac/Makefile      |   3 ++-
 audio/flac/buildlink2.mk |  24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r 60a295698ad8 -r 5693b2c8926f audio/flac/Makefile
--- a/audio/flac/Makefile       Mon Dec 08 14:41:38 2003 +0000
+++ b/audio/flac/Makefile       Mon Dec 08 14:42:44 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/07/22 05:14:44 martti Exp $
+# $NetBSD: Makefile,v 1.12 2003/12/08 14:42:44 wiz Exp $
 #
 
 DISTNAME=              flac-1.1.0
+PKGREVISION=                           1
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 CATEGORIES=            audio archivers
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=flac/}
diff -r 60a295698ad8 -r 5693b2c8926f audio/flac/buildlink2.mk
--- a/audio/flac/buildlink2.mk  Mon Dec 08 14:41:38 2003 +0000
+++ b/audio/flac/buildlink2.mk  Mon Dec 08 14:42:44 2003 +0000
@@ -1,18 +1,24 @@
-# $NetBSD: buildlink2.mk,v 1.6 2003/02/14 23:25:33 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/12/08 14:42:44 wiz Exp $
 
 .if !defined(FLAC_BUILDLINK2_MK)
 FLAC_BUILDLINK2_MK=    # defined
 
-BUILDLINK_PACKAGES+=           flac
-BUILDLINK_DEPENDS.flac?=       flac>=1.1.0
-BUILDLINK_PKGSRCDIR.flac?=     ../../audio/flac
+BUILDLINK_PACKAGES+=                   flac
+BUILDLINK_DEPENDS.flac?=               flac>=1.1.0nb1
+BUILDLINK_PKGSRCDIR.flac?=             ../../audio/flac
 
-EVAL_PREFIX+=                  BUILDLINK_PREFIX.flac=flac
+EVAL_PREFIX+=  BUILDLINK_PREFIX.flac=flac
 BUILDLINK_PREFIX.flac_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.flac=          include/FLAC/*
-BUILDLINK_FILES.flac+=         include/FLAC++/*
-BUILDLINK_FILES.flac+=         lib/libFLAC.*
-BUILDLINK_FILES.flac+=         lib/libFLAC++.*
+BUILDLINK_FILES.flac+= include/FLAC++/*.h
+BUILDLINK_FILES.flac+= include/FLAC/*.h
+BUILDLINK_FILES.flac+= include/OggFLAC++/*.h
+BUILDLINK_FILES.flac+= include/OggFLAC/*.h
+BUILDLINK_FILES.flac+= lib/libFLAC++.*
+BUILDLINK_FILES.flac+= lib/libFLAC.*
+BUILDLINK_FILES.flac+= lib/libOggFLAC++.*
+BUILDLINK_FILES.flac+= lib/libOggFLAC.*
+
+.include "../../audio/libogg/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    flac-buildlink