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.

5 files changed, 35 insertions, 10 deletions

diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 8b81cf548c4..0554710c361 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/07/24 19:45:23 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:47 jlam Exp $
 #
 
 DISTNAME=	rpc2-1.13
@@ -10,15 +10,17 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	CMU (Coda) remote procedure call package
 
+USE_BUILDLINK2=		YES
+USE_GMAKE=		YES
+
 GNU_CONFIGURE=		YES
+CONFIGURE_ENV+=		PERL=${PERL5}
+
 USE_PERL5=		build
 USE_LIBTOOL=		YES
-USE_GMAKE=		YES
-USE_BUILDLINK_ONLY=	YES
-
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-CONFIGURE_ENV+=		PERL=${PERL5}
 
-.include "../../devel/lwp/buildlink.mk"
-.include "../../devel/readline/buildlink.mk"
+.include "../../devel/lwp/buildlink2.mk"
+.include "../../devel/readline/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/rpc2/PLIST b/devel/rpc2/PLIST
index 979c06809fb..1b9998f77ae 100644
--- a/devel/rpc2/PLIST
+++ b/devel/rpc2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/06/20 19:28:01 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 18:38:47 jlam Exp $
 bin/filcon
 bin/rp2gen
 include/rpc2/errors.h
diff --git a/devel/rpc2/buildlink2.mk b/devel/rpc2/buildlink2.mk
new file mode 100644
index 00000000000..130807e07f6
--- /dev/null
+++ b/devel/rpc2/buildlink2.mk
@@ -0,0 +1,23 @@
+# $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/distinfo b/devel/rpc2/distinfo
index 778164eac79..6416af60f52 100644
--- a/devel/rpc2/distinfo
+++ b/devel/rpc2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/06/20 19:28:01 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/08/25 18:38:48 jlam Exp $
 
 SHA1 (rpc2-1.13.tar.gz) = b4f13fe3f878c632b66a6a1ac19883c735eeef4d
 Size (rpc2-1.13.tar.gz) = 447572 bytes
diff --git a/devel/rpc2/patches/patch-aa b/devel/rpc2/patches/patch-aa
index 1be9f5607b3..d43b390354d 100644
--- a/devel/rpc2/patches/patch-aa
+++ b/devel/rpc2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2002/06/20 19:28:01 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/25 18:38:49 jlam Exp $
 
 --- fail/parser.c.orig	Tue May 22 12:31:45 2001
 +++ fail/parser.c