Convert to buildlink3.

10 files changed, 73 insertions, 82 deletions

diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 90803bd229b..f26a504974f 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/27 04:29:17 snj Exp $
 #
 
 DISTNAME=	lwp-1.10
@@ -16,7 +16,7 @@ COMMENT=	Light Weight Process style threads
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \
 			NetBSD-*-arm NetBSD-*-arm32
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/devel/lwp/buildlink2.mk b/devel/lwp/buildlink2.mk
deleted file mode 100644
index 8fcf9cd987a..00000000000
--- a/devel/lwp/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:37 jlam Exp $
-
-.if !defined(LWP_BUILDLINK2_MK)
-LWP_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		lwp
-BUILDLINK_DEPENDS.lwp?=		lwp>=1.6
-BUILDLINK_PKGSRCDIR.lwp?=	../../devel/lwp
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.lwp=lwp
-BUILDLINK_PREFIX.lwp_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.lwp=	include/lwp/*
-BUILDLINK_FILES.lwp+=	lib/liblwp.*
-
-BUILDLINK_TARGETS+=	lwp-buildlink
-
-lwp-buildlink: _BUILDLINK_USE
-
-.endif	# LWP_BUILDLINK2_MK
diff --git a/devel/lwp/buildlink3.mk b/devel/lwp/buildlink3.mk
new file mode 100644
index 00000000000..2de64f56988
--- /dev/null
+++ b/devel/lwp/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LWP_BUILDLINK3_MK:=	${LWP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	lwp
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlwp}
+BUILDLINK_PACKAGES+=	lwp
+
+.if !empty(LWP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.lwp+=	lwp>=1.6
+BUILDLINK_PKGSRCDIR.lwp?=	../../devel/lwp
+.endif	# LWP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 4185ac609c1..68f9d5ac592 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/27 04:29:17 snj Exp $
 #
 
 DISTNAME=	rpc2-1.19
@@ -10,7 +10,7 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	CMU (Coda) remote procedure call package
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		YES
@@ -19,7 +19,7 @@ CONFIGURE_ENV+=		PERL=${PERL5}
 USE_PERL5=		build
 USE_LIBTOOL=		YES
 
-.include "../../devel/lwp/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/lwp/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rpc2/buildlink2.mk b/devel/rpc2/buildlink2.mk
deleted file mode 100644
index 130807e07f6..00000000000
--- a/devel/rpc2/buildlink2.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:48 jlam Exp $
-
-.if !defined(RPC2_BUILDLINK2_MK)
-RPC2_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		rpc2
-BUILDLINK_DEPENDS.rpc2?=	rpc2>=1.10
-BUILDLINK_PKGSRCDIR.rpc2?=	../../devel/rpc2
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.rpc2=rpc2
-BUILDLINK_PREFIX.rpc2_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.rpc2=	include/rpc2/*
-BUILDLINK_FILES.rpc2+=	lib/libfail.*
-BUILDLINK_FILES.rpc2+=	lib/librpc2.*
-BUILDLINK_FILES.rpc2+=	lib/libse.*
-
-.include "../../devel/lwp/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	rpc2-buildlink
-
-rpc2-buildlink: _BUILDLINK_USE
-
-.endif	# RPC2_BUILDLINK2_MK
diff --git a/devel/rpc2/buildlink3.mk b/devel/rpc2/buildlink3.mk
new file mode 100644
index 00000000000..70c2b7e9722
--- /dev/null
+++ b/devel/rpc2/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RPC2_BUILDLINK3_MK:=	${RPC2_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	rpc2
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrpc2}
+BUILDLINK_PACKAGES+=	rpc2
+
+.if !empty(RPC2_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.rpc2+=	rpc2>=1.10
+BUILDLINK_PKGSRCDIR.rpc2?=	../../devel/rpc2
+.endif	# RPC2_BUILDLINK3_MK
+
+.include "../../devel/lwp/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 73f687c99a2..5ae9d01ad0f 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/27 04:29:17 snj Exp $
 #
 
 DISTNAME=	rvm-1.8
@@ -10,7 +10,7 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	Recoverable Virtual Memory
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
@@ -23,5 +23,5 @@ pre-build:
 		${LN} -sf $${file} `${BASENAME} $${file} .c`_lwp.c;	\
 	done
 
-.include "../../devel/lwp/buildlink2.mk"
+.include "../../devel/lwp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rvm/buildlink2.mk b/devel/rvm/buildlink2.mk
deleted file mode 100644
index a01204585ff..00000000000
--- a/devel/rvm/buildlink2.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:49 jlam Exp $
-
-.if !defined(RVM_BUILDLINK2_MK)
-RVM_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		rvm
-BUILDLINK_DEPENDS.rvm?=		rvm>=1.3
-BUILDLINK_PKGSRCDIR.rvm?=	../../devel/rvm
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.rvm=rvm
-BUILDLINK_PREFIX.rvm_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.rvm=	include/rvm/*
-BUILDLINK_FILES.rvm+=	lib/librds.*
-BUILDLINK_FILES.rvm+=	lib/librdslwp.*
-BUILDLINK_FILES.rvm+=	lib/librvm.*
-BUILDLINK_FILES.rvm+=	lib/librvmlwp.*
-BUILDLINK_FILES.rvm+=	lib/libseg.*
-
-.include "../../devel/lwp/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	rvm-buildlink
-
-rvm-buildlink: _BUILDLINK_USE
-
-.endif	# RVM_BUILDLINK2_MK
diff --git a/devel/rvm/buildlink3.mk b/devel/rvm/buildlink3.mk
new file mode 100644
index 00000000000..88c9a8aaadf
--- /dev/null
+++ b/devel/rvm/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/27 04:29:17 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RVM_BUILDLINK3_MK:=	${RVM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	rvm
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrvm}
+BUILDLINK_PACKAGES+=	rvm
+
+.if !empty(RVM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.rvm+=	rvm>=1.3
+BUILDLINK_PKGSRCDIR.rvm?=	../../devel/rvm
+.endif	# RVM_BUILDLINK3_MK
+
+.include "../../devel/lwp/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/coda5_server/Makefile.common b/net/coda5_server/Makefile.common
index f002d8cf280..654d774669d 100644
--- a/net/coda5_server/Makefile.common
+++ b/net/coda5_server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile.common,v 1.5 2004/04/27 04:29:17 snj Exp $
 
 DISTNAME?=		coda-${DIST_VERS}
 DIST_VERS?=		5.3.20
@@ -17,7 +17,7 @@ HOMEPAGE?=		http://www.coda.cs.cmu.edu/
 DISTINFO_FILE?=		${.CURDIR}/../../net/coda5_server/distinfo
 PATCHDIR?=		${.CURDIR}/../../net/coda5_server/patches
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PERL5=		yes
 USE_GNU_TOOLS+=		make
 
@@ -33,7 +33,7 @@ pre-install: install-egdir
 install-egdir:
 	${INSTALL_DATA_DIR} ${EGDIR}
 
-.include "../../devel/lwp/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/rpc2/buildlink2.mk"
-.include "../../devel/rvm/buildlink2.mk"
+.include "../../devel/lwp/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/rpc2/buildlink3.mk"
+.include "../../devel/rvm/buildlink3.mk"