Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

4 files changed, 24 insertions, 4 deletions

diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index 3619b43a183..99c455fddaf 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/06/20 19:27:54 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/25 18:38:36 jlam Exp $
 #
 
 DISTNAME=	lwp-1.9
@@ -12,12 +12,13 @@ COMMENT=	Light Weight Process style threads
 
 # ${WRKSRC}/src/process.ss needs pmap handling assembly for
 # each arch. Mips has it, but it evidently needs more work.
+#
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-m68k NetBSD-*-sparc* \
 			NetBSD-*-arm32
 
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_BUILDLINK_ONLY=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lwp/PLIST b/devel/lwp/PLIST
index 80f30b61214..fd65b38d6d5 100644
--- a/devel/lwp/PLIST
+++ b/devel/lwp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:27:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:36 jlam Exp $
 include/lwp/lock.h
 include/lwp/lwp.h
 include/lwp/timer.h
diff --git a/devel/lwp/buildlink2.mk b/devel/lwp/buildlink2.mk
new file mode 100644
index 00000000000..8fcf9cd987a
--- /dev/null
+++ b/devel/lwp/buildlink2.mk
@@ -0,0 +1,19 @@
+# $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/distinfo b/devel/lwp/distinfo
index 4407770a073..20154abb188 100644
--- a/devel/lwp/distinfo
+++ b/devel/lwp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/06/20 19:27:55 jlam Exp $
+$NetBSD: distinfo,v 1.5 2002/08/25 18:38:37 jlam Exp $
 
 SHA1 (lwp-1.9.tar.gz) = e5f40cf36ac705ef5d9b0600cb1bab5bf00d817b
 Size (lwp-1.9.tar.gz) = 246491 bytes