Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

4 files changed, 25 insertions, 3 deletions

diff --git a/graphics/gdk-pixbuf-gnome/Makefile b/graphics/gdk-pixbuf-gnome/Makefile
index 7ab250edbb4..ec37562875d 100644
--- a/graphics/gdk-pixbuf-gnome/Makefile
+++ b/graphics/gdk-pixbuf-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/05/11 11:56:58 rh Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/25 19:22:47 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/gdk-pixbuf-/gdk-pixbuf-gnome-/}
 COMMENT=	the GNOME image loading library GNOME canvas support add-on
diff --git a/graphics/gdk-pixbuf-gnome/PLIST b/graphics/gdk-pixbuf-gnome/PLIST
index 3d39e623539..2aed178c0cf 100644
--- a/graphics/gdk-pixbuf-gnome/PLIST
+++ b/graphics/gdk-pixbuf-gnome/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/05/11 11:56:59 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/25 19:22:47 jlam Exp $
 include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
 lib/gnomecanvaspixbufConf.sh
 lib/libgnomecanvaspixbuf.so.1.0
diff --git a/graphics/gdk-pixbuf-gnome/buildlink.mk b/graphics/gdk-pixbuf-gnome/buildlink.mk
index 0c9755f1490..a8180716d05 100644
--- a/graphics/gdk-pixbuf-gnome/buildlink.mk
+++ b/graphics/gdk-pixbuf-gnome/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/05/11 11:56:59 rh Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:47 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf-gnome.
 #
diff --git a/graphics/gdk-pixbuf-gnome/buildlink2.mk b/graphics/gdk-pixbuf-gnome/buildlink2.mk
new file mode 100644
index 00000000000..ca5223c665d
--- /dev/null
+++ b/graphics/gdk-pixbuf-gnome/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:47 jlam Exp $
+
+.if !defined(GDK_PIXBUF_GNOME_BUILDLINK2_MK)
+GDK_PIXBUF_GNOME_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gdk-pixbuf-gnome
+BUILDLINK_DEPENDS.gdk-pixbuf-gnome?=	gdk-pixbuf-gnome>=0.11.0nb1
+BUILDLINK_PKGSRCDIR.gdk-pixbuf-gnome?=	../../graphics/gdk-pixbuf-gnome
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gdk-pixbuf-gnome=gdk-pixbuf-gnome
+BUILDLINK_PREFIX.gdk-pixbuf-gnome_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gdk-pixbuf-gnome=	include/gdk-pixbuf-1.0/gdk-pixbuf/gnome-canvas-pixbuf.h
+BUILDLINK_FILES.gdk-pixbuf-gnome+=	lib/libgnomecanvaspixbuf.*
+
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../x11/gnome-libs/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gdk-pixbuf-gnome-buildlink
+
+gdk-pixbuf-gnome-buildlink: _BUILDLINK_USE
+
+.endif	# GDK_PIXBUF_GNOME_BUILDLINK2_MK