bl3ify

6 files changed, 38 insertions, 19 deletions

diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index 30d47c7730b..7867e7c669d 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:50:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/29 08:00:38 xtraeme Exp $
 
 DISTNAME=	gtkyahoo-0.18.2
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	GTK+ client for Yahoo! Messenger
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
@@ -20,8 +20,8 @@ CONFIGURE_ARGS+=	--with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
 pre-configure:
 	${RM} -rf ${WRKSRC}/libyahoo
 
-.include "../../chat/libyahoo/buildlink2.mk"
-.include "../../lang/perl5/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../chat/libyahoo/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/libyahoo/Makefile b/chat/libyahoo/Makefile
index b9aa90e5ef2..588aceae858 100644
--- a/chat/libyahoo/Makefile
+++ b/chat/libyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/29 08:00:04 xtraeme Exp $
 
 DISTNAME=	libyahoo-0.18.4
 CATEGORIES=	chat
@@ -8,9 +8,9 @@ MAINTAINER=	ken@246gt.com
 HOMEPAGE=	http://sourceforge.net/projects/libyahoo/
 COMMENT=	Yahoo! Messenger client library
 
-USE_BUILDLINK2=		# defined
-GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
+USE_BUILDLINK3=	yes
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libyahoo-authors.h ${PREFIX}/include/libyahoo
diff --git a/chat/libyahoo/buildlink3.mk b/chat/libyahoo/buildlink3.mk
new file mode 100644
index 00000000000..8defc83e125
--- /dev/null
+++ b/chat/libyahoo/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/29 08:00:04 xtraeme Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBYAHOO_BUILDLINK3_MK:=	${LIBYAHOO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libyahoo
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibyahoo}
+BUILDLINK_PACKAGES+=	libyahoo
+
+.if !empty(LIBYAHOO_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libyahoo+=	libyahoo>=0.18.4
+BUILDLINK_PKGSRCDIR.libyahoo?=	../../chat/libyahoo
+BUILDLINK_INCDIRS.libyahoo+=	include/libyahoo
+.endif	# LIBYAHOO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/chat/scrollz/Makefile b/chat/scrollz/Makefile
index c614afb37ad..dd8af1f7e5b 100644
--- a/chat/scrollz/Makefile
+++ b/chat/scrollz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/28 20:05:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/29 08:05:07 xtraeme Exp $
 #
 
 DISTNAME=	ScrollZ-1.9
@@ -12,12 +12,12 @@ COMMENT=        Advanced IRC client based on ircII client
 
 BUILD_DEFS+=	USE_INET6
 
-GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+GNU_CONFIGURE=	yes
+USE_BUILDLINK3=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile
index bdd8b50f975..b221d72f4a9 100644
--- a/chat/xaric/Makefile
+++ b/chat/xaric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/22 07:49:21 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/03/29 08:05:50 xtraeme Exp $
 #
 
 DISTNAME=	xaric-0.12.1
@@ -10,8 +10,8 @@ MAINTAINER=	xtraeme@NetBSD.org
 HOMEPAGE=	http://www.xaric.org/
 COMMENT=	IRC client similar to BitchX and ircII
 
-USE_BUILDLINK2=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	yes
+GNU_CONFIGURE=	yes
 USE_GNU_TOOLS+=	make
 
 CONFIGURE_ARGS+=	--enable-optimize
diff --git a/chat/ysm/Makefile b/chat/ysm/Makefile
index 85e45d2cc49..cc47eddd57b 100644
--- a/chat/ysm/Makefile
+++ b/chat/ysm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/12 10:38:22 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/29 08:06:18 xtraeme Exp $
 
 DISTNAME=	ysmv7_2_8_1
 PKGNAME=	ysm-2.8.1
@@ -12,7 +12,7 @@ HOMEPAGE=	http://ysmv7.sourceforge.net/
 COMMENT=	The 'You Sick Me' terminal based ICQ client
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"