Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

5 files changed, 44 insertions, 4 deletions

diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index b0dc7525316..a38bb751760 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/07/12 15:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/08/25 19:22:23 jlam Exp $
 #
 
 DISTNAME=		bonobo-activation-1.0.2
diff --git a/devel/bonobo-activation/PLIST b/devel/bonobo-activation/PLIST
index 24c98794b35..f6f0bfe630f 100644
--- a/devel/bonobo-activation/PLIST
+++ b/devel/bonobo-activation/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/12 19:34:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:23 jlam Exp $
 bin/activation-client
 bin/bonobo-activation-empty-server
 bin/bonobo-activation-run-query
diff --git a/devel/bonobo-activation/buildlink.mk b/devel/bonobo-activation/buildlink.mk
index 1efc9bf4a02..98798c4728c 100644
--- a/devel/bonobo-activation/buildlink.mk
+++ b/devel/bonobo-activation/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/07/12 15:59:45 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use bonobo-activation.
 #
diff --git a/devel/bonobo-activation/buildlink2.mk b/devel/bonobo-activation/buildlink2.mk
new file mode 100644
index 00000000000..39a241bc5c7
--- /dev/null
+++ b/devel/bonobo-activation/buildlink2.mk
@@ -0,0 +1,40 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:23 jlam Exp $
+
+.if !defined(BONOBO_ACTIVATION_BUILDLINK2_MK)
+BONOBO_ACTIVATION_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=				bonobo-activation
+BUILDLINK_DEPENDS.bonobo-activation?=		bonobo-activation>=1.0.2
+BUILDLINK_PKGSRCDIR.bonobo-activation?=		../../devel/bonobo-activation
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.bonobo-activation=bonobo-activation
+BUILDLINK_PREFIX.bonobo-activation_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-base-service.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-id.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
+BUILDLINK_FILES.bonobo-activation+=	include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
+BUILDLINK_FILES.bonobo-activation+=	lib/bonobo/servers/Bonobo_CosNaming_NamingContext.server
+BUILDLINK_FILES.bonobo-activation+=	lib/bonobo/servers/broken.server
+BUILDLINK_FILES.bonobo-activation+=	lib/bonobo/servers/empty.server
+BUILDLINK_FILES.bonobo-activation+=	lib/bonobo/servers/plugin.server
+BUILDLINK_FILES.bonobo-activation+=	lib/libbonobo-activation.*
+BUILDLINK_FILES.bonobo-activation+=	lib/pkgconfig/bonobo-activation-2.0.pc
+
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	bonobo-activation-buildlink
+
+bonobo-activation-buildlink: _BUILDLINK_USE
+
+.endif	# BONOBO_ACTIVATION_BUILDLINK2_MK
diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo
index 04e70417660..103f0ab9876 100644
--- a/devel/bonobo-activation/distinfo
+++ b/devel/bonobo-activation/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/07/12 15:59:45 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/08/25 19:22:23 jlam Exp $
 
 SHA1 (bonobo-activation-1.0.2.tar.bz2) = fe5830eb3e6ca5234541bb20c8f19e5096ee0bbc
 Size (bonobo-activation-1.0.2.tar.bz2) = 425653 bytes