6 files changed, 43 insertions, 49 deletions
diff --git a/devel/buddy/buildlink2.mk b/devel/buddy/buildlink2.mk
deleted file mode 100644
index b295e67a999..00000000000
--- a/devel/buddy/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/31 00:04:19 kristerw Exp $
-
-.if !defined(BUDDY_BUILDLINK2_MK)
-BUDDY_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		buddy
-BUILDLINK_DEPENDS.buddy?=	buddy>=2.2
-BUILDLINK_PKGSRCDIR.buddy?=	../../devel/buddy
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.buddy=buddy
-BUILDLINK_PREFIX.buddy_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.buddy=		include/bdd.h
-BUILDLINK_FILES.buddy+=		include/bvec.h
-BUILDLINK_FILES.buddy+=		include/fdd.h
-BUILDLINK_FILES.buddy+=		lib/libbdd.*
-
-BUILDLINK_TARGETS+=	buddy-buildlink
-
-buddy-buildlink: _BUILDLINK_USE
-
-.endif	# BUDDY_BUILDLINK2_MK
diff --git a/devel/buddy/buildlink3.mk b/devel/buddy/buildlink3.mk
new file mode 100644
index 00000000000..07f100f967a
--- /dev/null
+++ b/devel/buddy/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/02 23:02:06 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+BUDDY_BUILDLINK3_MK:=	${BUDDY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	buddy
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbuddy}
+BUILDLINK_PACKAGES+=	buddy
+
+.if !empty(BUDDY_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.buddy+=	buddy>=2.2
+BUILDLINK_PKGSRCDIR.buddy?=	../../devel/buddy
+.endif	# BUDDY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index 0950dfa0ace..8032b93e158 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/02 23:02:06 snj Exp $
 #
 
 DISTNAME=	libtecla-1.5.0
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.astro.caltech.edu/~mcs/tecla/
 COMMENT=	Interactive command line editing facilities
 
 WRKSRC=		${WRKDIR}/${PKGBASE}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 ALL_TARGET=	default
diff --git a/devel/libtecla/buildlink2.mk b/devel/libtecla/buildlink2.mk
deleted file mode 100644
index 38c52459f65..00000000000
--- a/devel/libtecla/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/12/31 00:05:20 kristerw Exp $
-
-.if !defined(LIBTECLA_BUILDLINK2_MK)
-LIBTECLA_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		libtecla
-BUILDLINK_DEPENDS.libtecla?=	libtecla>=1.5.0
-BUILDLINK_PKGSRCDIR.libtecla?=	../../devel/libtecla
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.libtecla=libtecla
-BUILDLINK_PREFIX.libtecla_DEFAULT=	${LOCALBASE}
-
-BUILDLINK_FILES.libtecla+=	include/libtecla.h
-BUILDLINK_FILES.libtecla+=	lib/libtecla.*
-
-BUILDLINK_TARGETS+=	libtecla-buildlink
-
-libtecla-buildlink: _BUILDLINK_USE
-
-.endif	# LIBTECLA_BUILDLINK2_MK
diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk
new file mode 100644
index 00000000000..e4a4968bf26
--- /dev/null
+++ b/devel/libtecla/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/02 23:02:06 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBTECLA_BUILDLINK3_MK:=	${LIBTECLA_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libtecla
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibtecla}
+BUILDLINK_PACKAGES+=	libtecla
+
+.if !empty(LIBTECLA_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libtecla+=	libtecla>=1.5.0
+BUILDLINK_PKGSRCDIR.libtecla?=	../../devel/libtecla
+.endif	# LIBTECLA_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/lang/maude/Makefile b/lang/maude/Makefile
index 88f4ed5b929..b13d96e6ec8 100644
--- a/lang/maude/Makefile
+++ b/lang/maude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/02 23:02:06 snj Exp $
 #
 
 DISTNAME=	maude-src
@@ -21,13 +21,13 @@ BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/Maude-${PKGVERSION}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/maude
 
 post-install:
 	${INSTALL_DATA} ${DISTDIR}/fm.maude ${PREFIX}/share/maude
-.include "../../devel/buddy/buildlink2.mk"
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/libtecla/buildlink2.mk"
+.include "../../devel/buddy/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/libtecla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"