From d534ce0a22fbbafdb9c39e4f31e223d6c989b6f1 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 8 Dec 2003 14:42:44 +0000
Subject: Bump PKGREVISION for libogg update, and fix bl2 file while here.

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

(limited to 'audio/flac')

diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index e85b512e5cd..e055f5aba21 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -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 --git a/audio/flac/buildlink2.mk b/audio/flac/buildlink2.mk
index 8018bac7f54..34083a92528 100644
--- a/audio/flac/buildlink2.mk
+++ b/audio/flac/buildlink2.mk
@@ -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
 
-- 
cgit v1.2.3