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.

6 files changed, 36 insertions, 10 deletions

diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index a8c93dfd970..da43af32ebc 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/07/03 10:59:47 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2002/08/25 18:38:49 jlam Exp $
 #
 
 DISTNAME=	rvm-1.6
@@ -11,12 +11,13 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	Recoverable Virtual Memory
 
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
 
-CONFIGURE_ARGS+=	--with-lwp-includes=${BUILDLINK_DIR}/include
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--with-lwp-includes=${BUILDLINK_PREFIX.lwp}/include
+
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 pre-build:
@@ -25,5 +26,5 @@ pre-build:
 		${LN} -sf $${file} `${BASENAME} $${file} .c`_lwp.c;	\
 	done
 
-.include "../../devel/lwp/buildlink.mk"
+.include "../../devel/lwp/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rvm/PLIST b/devel/rvm/PLIST
index 8f458615416..575ae88ab61 100644
--- a/devel/rvm/PLIST
+++ b/devel/rvm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:49 jlam Exp $
 include/rvm/rds.h
 include/rvm/rvm.h
 include/rvm/rvm_segment.h
diff --git a/devel/rvm/buildlink2.mk b/devel/rvm/buildlink2.mk
new file mode 100644
index 00000000000..a01204585ff
--- /dev/null
+++ b/devel/rvm/buildlink2.mk
@@ -0,0 +1,25 @@
+# $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/distinfo b/devel/rvm/distinfo
index dbb0e196ebb..13a7e868a61 100644
--- a/devel/rvm/distinfo
+++ b/devel/rvm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/07/03 10:59:47 jdolecek Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 18:38:50 jlam Exp $
 
 SHA1 (rvm-1.6.tar.gz) = d6b27b37601d5d1666f3956feb6582c3cb6b1d99
 Size (rvm-1.6.tar.gz) = 374944 bytes
diff --git a/devel/rvm/patches/patch-aa b/devel/rvm/patches/patch-aa
index a87b914109d..9ffbd1ad29e 100644
--- a/devel/rvm/patches/patch-aa
+++ b/devel/rvm/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/06/20 19:28:15 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 18:38:50 jlam Exp $
 
 --- rvm/Makefile.in.orig	Tue Jun 12 12:24:35 2001
 +++ rvm/Makefile.in
diff --git a/devel/rvm/patches/patch-ab b/devel/rvm/patches/patch-ab
index c23c3cc46db..a37084a2fe1 100644
--- a/devel/rvm/patches/patch-ab
+++ b/devel/rvm/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/03 10:59:48 jdolecek Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 18:38:51 jlam Exp $
 
 --- rvm/rvm_utils.c.orig	Wed Jul  3 12:39:26 2002
 +++ rvm/rvm_utils.c	Wed Jul  3 12:40:30 2002