Convert to bl3.

4 files changed, 32 insertions, 14 deletions

diff --git a/chat/tzc/Makefile b/chat/tzc/Makefile
index b51679cadb6..ae88fe30619 100644
--- a/chat/tzc/Makefile
+++ b/chat/tzc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/09/16 19:51:21 seb Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/25 00:39:04 wiz Exp $
 #
 
 DISTNAME=	tzc-2.6.15
@@ -12,7 +12,7 @@ COMMENT=	Back-end program for zephyr-mode
 CPPFLAGS+=      -I/usr/include/kerberosIV -I/usr/include/krb5
 LDFLAGS+=       -lroken -lcrypto -lcom_err
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../zephyr/buildlink2.mk"
+.include "../zephyr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zephyr/Makefile b/chat/zephyr/Makefile
index 9a7a194176d..4c99b8f5e70 100644
--- a/chat/zephyr/Makefile
+++ b/chat/zephyr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:09:35 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/25 00:38:49 wiz Exp $
 #
 
 DISTNAME=	zephyr-20010518
@@ -11,7 +11,7 @@ HOMEPAGE=	http://web.mit.edu/olh/Zephyr/index.html
 COMMENT=	Project Athena's original Instant Messaging system
 
 WRKSRC=		${WRKDIR}/zephyr
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
@@ -43,7 +43,7 @@ pre-install:
 .endfor
 .undef f
 
-.include "../../devel/readline/buildlink2.mk"
-.include "../../net/hesiod/buildlink2.mk"
-.include "../../net/libares/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../net/hesiod/buildlink3.mk"
+.include "../../net/libares/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zephyr/buildlink3.mk b/chat/zephyr/buildlink3.mk
new file mode 100644
index 00000000000..e84050220f3
--- /dev/null
+++ b/chat/zephyr/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 00:38:49 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+ZEPHYR_BUILDLINK3_MK:=	${ZEPHYR_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	zephyr
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nzephyr}
+BUILDLINK_PACKAGES+=	zephyr
+
+.if !empty(ZEPHYR_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.zephyr+=	zephyr>=20010518nb1
+BUILDLINK_PKGSRCDIR.zephyr?=	../../chat/zephyr
+.endif	# ZEPHYR_BUILDLINK3_MK
+
+.include "../../devel/readline/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index e7a107196a8..0f6f5152644 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/10/31 16:25:56 gavan Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/25 00:36:04 wiz Exp $
 #
 
 DISTNAME=	plptools-0.6
@@ -9,16 +9,14 @@ MASTER_SITES=	ftp://ftp.to.com/pub/psion/tarballs/
 MAINTAINER=	sakamoto@NetBSD.org
 COMMENT=	FTP-like and NFS-like access tools to talk to the PSION
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_READLINE=	# uses rl_filename_quoting_desired flag
-USE_GCC_SHLIB=		YES
-
+USE_LANUGAGES=		c c++
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-serial=${DEFAULT_SERIAL_DEVICE}
 LIBS+=			-ltermcap
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"