Convert to buildlink3.

6 files changed, 43 insertions, 19 deletions

diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 85bf82ea85a..2f11ba9c26b 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/24 13:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/04/18 05:36:52 snj Exp $
 
 DISTNAME=		clanbomber-1.01
 PKGREVISION=		3
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanbomber.de/
 COMMENT=		Bomberman clone using the ClanLib graphics system
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
@@ -25,5 +25,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
 
-.include "../../graphics/clanlib/buildlink2.mk"
+.include "../../graphics/clanlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 88077b56821..afee40d36b2 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.36 2004/04/18 05:33:14 snj Exp $
 
 DISTNAME=		ClanLib-0.4.4
 PKGREVISION=		5
@@ -9,7 +9,7 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.clanlib.org/
 COMMENT=		The ClanLib Game SDK
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11BASE=		yes
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
@@ -39,12 +39,12 @@ MAKE_ENV+=		X11BASE="${X11BASE}"
 post-patch:
 	${CHMOD} +x ${WRKSRC}/configure
 
-.include "../../graphics/hermes/buildlink2.mk"
-.include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/ossaudio.buildlink2.mk"
+.include "../../graphics/hermes/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/graphics/clanlib/buildlink3.mk b/graphics/clanlib/buildlink3.mk
new file mode 100644
index 00000000000..be6c67cb230
--- /dev/null
+++ b/graphics/clanlib/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/18 05:33:14 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+CLANLIB_BUILDLINK3_MK:=	${CLANLIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ClanLib
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NClanLib}
+BUILDLINK_PACKAGES+=	ClanLib
+
+.if !empty(CLANLIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ClanLib+=	ClanLib>=0.4.4nb4
+BUILDLINK_PKGSRCDIR.ClanLib?=	../../graphics/clanlib
+.endif	# CLANLIB_BUILDLINK3_MK
+
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../graphics/hermes/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 6d07fd2a99e..c862003157f 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/04/07 11:52:01 tv Exp $
+# $NetBSD: Makefile,v 1.12 2004/04/18 05:37:27 snj Exp $
 #
 
 DISTNAME=	demime-0.99d.1
@@ -20,7 +20,7 @@ DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 NO_BUILD=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 POD2MAN?=	${BUILDLINK_PREFIX.perl}/bin/pod2man
@@ -43,5 +43,5 @@ do-install:
 	${POD2MAN} ${WRKSRC}/demime > ${WRKSRC}/demime.1
 	${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imapproxy/Makefile b/mail/imapproxy/Makefile
index 64c1cea11bd..359f52280df 100644
--- a/mail/imapproxy/Makefile
+++ b/mail/imapproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:46:18 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/18 05:31:35 snj Exp $
 #
 
 DISTNAME=	imapproxy-1.0
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.kuleuven.net/projects/imapproxy/
 COMMENT=	Simple connection caching IMAP proxy daemon
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 do-install:
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 37323f04c2b..56665d3c298 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/18 05:33:48 snj Exp $
 #
 
 DISTNAME=	isync-0.9.2
@@ -10,7 +10,7 @@ MAINTAINER=	cez+misc.pkgsrc@compsoc.man.ac.uk
 HOMEPAGE=	http://isync.sourceforge.net/
 COMMENT=	Synchronize a maildir with an imap server
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_PREFIX.openssl}
@@ -20,5 +20,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/isync
 	${INSTALL_DATA} ${WRKSRC}/isyncrc.sample ${PREFIX}/share/examples/isync/isyncrc.sample
 
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"