Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

3 files changed, 24 insertions, 2 deletions

diff --git a/devel/atk/buildlink.mk b/devel/atk/buildlink.mk
index 0d02e9a7f48..038ea0b6468 100644
--- a/devel/atk/buildlink.mk
+++ b/devel/atk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2002/06/30 14:04:26 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.3 2002/08/25 19:22:21 jlam Exp $
 #
 # This Makefile fragment is included by packages that use atk.
 #
diff --git a/devel/atk/buildlink2.mk b/devel/atk/buildlink2.mk
new file mode 100644
index 00000000000..edd565b5755
--- /dev/null
+++ b/devel/atk/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:21 jlam Exp $
+
+.if !defined(ATK_BUILDLINK2_MK)
+ATK_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		atk
+BUILDLINK_DEPENDS.atk?=		atk>=1.0.2
+BUILDLINK_PKGSRCDIR.atk?=	../../devel/atk
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.atk=atk
+BUILDLINK_PREFIX.atk_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.atk=	include/atk-1.0/*/*
+BUILDLINK_FILES.atk+=	include/atk-1.0/*
+BUILDLINK_FILES.atk+=	lib/libatk-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	atk-buildlink
+
+atk-buildlink: _BUILDLINK_USE
+
+.endif	# ATK_BUILDLINK2_MK
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
index af19a2679e1..fa01353ae6b 100644
--- a/devel/atk/patches/patch-ab
+++ b/devel/atk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2002/07/18 02:19:26 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/08/25 19:22:22 jlam Exp $
 
 --- atk.pc.in.orig	Wed Mar  6 03:27:29 2002
 +++ atk.pc.in