Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

6 files changed, 35 insertions, 5 deletions

diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 52d0042f73e..7c37c5d0423 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/07/18 02:19:40 rh Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:09 jlam Exp $
 #
 
 DISTNAME=		ORBit2-2.4.0
diff --git a/net/ORBit2/buildlink.mk b/net/ORBit2/buildlink.mk
index 26642c880bb..307772af67c 100644
--- a/net/ORBit2/buildlink.mk
+++ b/net/ORBit2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/07/12 15:33:13 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:23:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use orbit2.
 #
diff --git a/net/ORBit2/buildlink2.mk b/net/ORBit2/buildlink2.mk
new file mode 100644
index 00000000000..615b6f2cf6e
--- /dev/null
+++ b/net/ORBit2/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:10 jlam Exp $
+
+.if !defined(ORBIT2_BUILDLINK2_MK)
+ORBIT2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		ORBit2
+BUILDLINK_DEPENDS.orbit2?=	ORBit2>=2.4.0
+BUILDLINK_PKGSRCDIR.orbit2?=	../../net/ORBit2
+
+EVAL_PREFIX+=				BUILDLINK_PREFIX.orbit2=orbit2
+BUILDLINK_PREFIX.orbit2_DEFAULT=	${LOCALBASE}
+
+BUILDLINK_FILES.orbit2=		include/orbit-2.0/orbit/*/*
+BUILDLINK_FILES.orbit2+=	include/orbit-2.0/orbit/*
+BUILDLINK_FILES.orbit2+=	include/orbit-2.0/ORBitservices/*
+BUILDLINK_FILES.orbit2+=	lib/libORBit-2.*
+BUILDLINK_FILES.orbit2+=	lib/libORBitCosNaming-2.*
+BUILDLINK_FILES.orbit2+=	lib/libname-server-2.*
+BUILDLINK_FILES.orbit2+=	lib/orbit-2.0/*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../net/libIDL/buildlink2.mk"
+.include "../../net/linc/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	orbit2-buildlink
+
+orbit2-buildlink: _BUILDLINK_USE
+
+.endif	# ORBIT2_BUILDLINK2_MK
diff --git a/net/ORBit2/distinfo b/net/ORBit2/distinfo
index b8a3357ed51..0f4ec0f8567 100644
--- a/net/ORBit2/distinfo
+++ b/net/ORBit2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/07/18 02:19:40 rh Exp $
+$NetBSD: distinfo,v 1.7 2002/08/25 19:23:10 jlam Exp $
 
 SHA1 (ORBit2-2.4.0.tar.bz2) = 234b4b8f66744637386ad7f2caf0aeca88afe484
 Size (ORBit2-2.4.0.tar.bz2) = 431841 bytes
diff --git a/net/ORBit2/patches/patch-aa b/net/ORBit2/patches/patch-aa
index 335c1c59a7c..a9b665445bb 100644
--- a/net/ORBit2/patches/patch-aa
+++ b/net/ORBit2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/05/21 12:06:08 rh Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/25 19:23:10 jlam Exp $
 
 --- ORBit-2.0.pc.in.orig	Sat Apr 27 18:24:08 2002
 +++ ORBit-2.0.pc.in
diff --git a/net/ORBit2/patches/patch-ab b/net/ORBit2/patches/patch-ab
index 2095b23870d..e7f70c1e6b5 100644
--- a/net/ORBit2/patches/patch-ab
+++ b/net/ORBit2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:40 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:23:10 jlam Exp $
 
 --- ORBit-CosNaming-2.0.pc.in.orig	Thu Nov  1 11:50:44 2001
 +++ ORBit-CosNaming-2.0.pc.in