Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

6 files changed, 39 insertions, 5 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 3a776808468..5fb8ce7422e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2002/07/18 02:19:39 rh Exp $
+# $NetBSD: Makefile,v 1.27 2002/08/25 19:22:24 jlam Exp $
 #
 
 DISTNAME=		bonobo-1.0.18
diff --git a/devel/bonobo/PLIST b/devel/bonobo/PLIST
index 7aa1fe02b30..94226d9229b 100644
--- a/devel/bonobo/PLIST
+++ b/devel/bonobo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/07/12 19:34:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 19:22:24 jlam Exp $
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
diff --git a/devel/bonobo/buildlink.mk b/devel/bonobo/buildlink.mk
index 45adcab2c3c..1793a5c9cda 100644
--- a/devel/bonobo/buildlink.mk
+++ b/devel/bonobo/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/07/14 00:58:27 rh Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:24 jlam Exp $
 #
 # This Makefile fragment is included by packages that use bonobo.
 #
diff --git a/devel/bonobo/buildlink2.mk b/devel/bonobo/buildlink2.mk
new file mode 100644
index 00000000000..7ccda482999
--- /dev/null
+++ b/devel/bonobo/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:25 jlam Exp $
+
+.if !defined(BONOBO_BUILDLINK2_MK)
+BONOBO_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		bonobo
+BUILDLINK_DEPENDS.bonobo?=	bonobo>=1.0.18nb1
+BUILDLINK_PKGSRCDIR.bonobo?=	../../devel/bonobo
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.bonobo=bonobo
+BUILDLINK_PREFIX.bonobo_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.bonobo+=	include/efs*
+BUILDLINK_FILES.bonobo+=	include/gnome-1.0/bonobo.h
+BUILDLINK_FILES.bonobo+=	include/gnome-1.0/bonobo/*
+BUILDLINK_FILES.bonobo+=	lib/bonobo/*/*
+BUILDLINK_FILES.bonobo+=	lib/libbonobo.*
+BUILDLINK_FILES.bonobo+=	lib/libbonobox.*
+BUILDLINK_FILES.bonobo+=	lib/libbonobo-print.*
+BUILDLINK_FILES.bonobo+=	lib/libefs.*
+BUILDLINK_FILES.bonobo+=	share/idl/Bonobo*.idl
+
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.bonobo}/include/gnome-1.0
+
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	bonobo-buildlink
+
+bonobo-buildlink: _BUILDLINK_USE
+
+.endif	# BONOBO_BUILDLINK2_MK
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index c45928810c7..87da2f18704 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/07/18 02:19:39 rh Exp $
+$NetBSD: distinfo,v 1.11 2002/08/25 19:22:25 jlam Exp $
 
 SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
 Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
diff --git a/devel/bonobo/patches/patch-ac b/devel/bonobo/patches/patch-ac
index 4d7b9e7017b..ce7b652a534 100644
--- a/devel/bonobo/patches/patch-ac
+++ b/devel/bonobo/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/07/18 02:19:40 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:25 jlam Exp $
 
 --- libefs/libefs.pc.in.orig	Tue Oct 10 18:02:25 2000
 +++ libefs/libefs.pc.in