3 files changed, 20 insertions, 21 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/+$//}