bl3ify

4 files changed, 29 insertions, 11 deletions

diff --git a/audio/normalize/Makefile b/audio/normalize/Makefile
index fc4259bb3a7..b17de7fba83 100644
--- a/audio/normalize/Makefile
+++ b/audio/normalize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:33 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/11 17:41:31 xtraeme Exp $
 #
 
 DISTNAME=	normalize-0.7.6
@@ -10,7 +10,7 @@ MAINTAINER=	lukem@NetBSD.org
 HOMEPAGE=	http://www.cs.columbia.edu/~cvaill/normalize/
 COMMENT=	Wave (.wav) file volume normalizer
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -18,8 +18,8 @@ GNU_CONFIGURE=		YES
 #CONFIGURE_ARGS+=	--with-audiofile
 CONFIGURE_ARGS+=	--with-mad
 
-#.include "../../audio/libaudiofile/buildlink2.mk"
-.include "../../audio/libmad/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
+#.include "../../audio/libaudiofile/buildlink3.mk"
+.include "../../audio/libmad/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 2c81b91371f..d18c8865e6e 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/22 07:15:00 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/11 17:43:31 xtraeme Exp $
 #
 
 DISTNAME=	openal-20030724
@@ -13,7 +13,7 @@ COMMENT=	3D positional spatialized sound library
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/linux
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 USE_MAKEINFO=	YES
@@ -22,5 +22,5 @@ INFO_FILES=	openal.info
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/openal.info ${PREFIX}/info
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/openal/buildlink3.mk b/audio/openal/buildlink3.mk
new file mode 100644
index 00000000000..42205b46185
--- /dev/null
+++ b/audio/openal/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/11 17:43:31 xtraeme Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OPENAL_BUILDLINK3_MK:=	${OPENAL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	openal
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenal}
+BUILDLINK_PACKAGES+=	openal
+
+.if !empty(OPENAL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.openal+=	openal>=20030125nb1
+BUILDLINK_PKGSRCDIR.openal?=	../../audio/openal
+.endif	# OPENAL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/p5-Audio-CD/Makefile b/audio/p5-Audio-CD/Makefile
index 93b8cd3ab62..f52285bfcbe 100644
--- a/audio/p5-Audio-CD/Makefile
+++ b/audio/p5-Audio-CD/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:23:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/11 17:44:58 xtraeme Exp $
 #
 
 DISTNAME=	Audio-CD-0.05
@@ -11,9 +11,9 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://home.wanadoo.nl/~jano/disc-cover.html
 COMMENT=	Audio-CD perl module for use with disc-cover
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Audio/CD/.packlist
 
-.include "../../audio/libcdaudio/buildlink2.mk"
+.include "../../audio/libcdaudio/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"