Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

6 files changed, 28 insertions, 5 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 4c955d3f468..1d702074fa4 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2002/07/18 02:19:36 rh Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/25 19:22:13 jlam Exp $
 #
 
 DISTNAME=		GConf-1.0.9
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index 2890f3f7985..a9af1c38de7 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2002/07/31 11:38:35 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2002/08/25 19:22:14 jlam Exp $
 bin/gconf-config
 bin/gconf-config-1
 bin/gconf-sanity-check-1
diff --git a/devel/GConf/buildlink.mk b/devel/GConf/buildlink.mk
index 1630fa5fd03..1739752be14 100644
--- a/devel/GConf/buildlink.mk
+++ b/devel/GConf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.8 2002/05/22 16:02:25 agc Exp $
+# $NetBSD: buildlink.mk,v 1.9 2002/08/25 19:22:14 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gconf.
 #
diff --git a/devel/GConf/buildlink2.mk b/devel/GConf/buildlink2.mk
new file mode 100644
index 00000000000..77c91f119fe
--- /dev/null
+++ b/devel/GConf/buildlink2.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:14 jlam Exp $
+
+.if !defined(GCONF_BUILDLINK2_MK)
+GCONF_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gconf
+BUILDLINK_DEPENDS.gconf?=	GConf>=1.0.7nb1
+BUILDLINK_PKGSRCDIR.gconf?=	../../devel/GConf
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.gconf=GConf
+BUILDLINK_PREFIX.gconf_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gconf=		include/gconf/1/gconf/*
+BUILDLINK_FILES.gconf+=		lib/libgconf-*
+
+.include "../../databases/db3/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/oaf/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gconf-buildlink
+
+gconf-buildlink: _BUILDLINK_USE
+
+.endif	# GCONF_BUILDLINK2_MK
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 9a277f8e8c8..0c5e5a354db 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/07/29 01:48:12 rh Exp $
+$NetBSD: distinfo,v 1.9 2002/08/25 19:22:15 jlam Exp $
 
 SHA1 (GConf-1.0.9.tar.bz2) = 91a1172c7855a235bf09e2ab925343a2e5250c13
 Size (GConf-1.0.9.tar.bz2) = 784363 bytes
diff --git a/devel/GConf/patches/patch-ab b/devel/GConf/patches/patch-ab
index b3332ac4bd7..9e109bfdaf7 100644
--- a/devel/GConf/patches/patch-ab
+++ b/devel/GConf/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.4 2002/07/18 02:19:37 rh Exp $
+$NetBSD: patch-ab,v 1.5 2002/08/25 19:22:15 jlam Exp $
 
 --- gconf.pc.in.orig	Sat Mar 24 08:52:30 2001
 +++ gconf.pc.in