summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2003-12-08 14:42:44 +0000
committerwiz <wiz@pkgsrc.org>2003-12-08 14:42:44 +0000
commitdf3fd7a9c2775fcef9ffb189e5906ae1925b73ad (patch)
tree0ca9410b505b0f880b5aaf3c67299db4d2a6139a
parenta52946841314d63c358636b0022f2cfa41e8136f (diff)
downloadpkgsrc-df3fd7a9c2775fcef9ffb189e5906ae1925b73ad.tar.gz
Bump PKGREVISION for libogg update, and fix bl2 file while here.
-rw-r--r--audio/flac/Makefile3
-rw-r--r--audio/flac/buildlink2.mk24
2 files changed, 17 insertions, 10 deletions
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