Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

8 files changed, 29 insertions, 7 deletions

diff --git a/devel/pango/PLIST.xf4 b/devel/pango/PLIST.xf4
index 9cab0b8b9d2..26e9b7e55ac 100644
--- a/devel/pango/PLIST.xf4
+++ b/devel/pango/PLIST.xf4
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.xf4,v 1.1 2002/07/03 01:29:39 dmcmahill Exp $
+@comment $NetBSD: PLIST.xf4,v 1.2 2002/08/25 19:22:36 jlam Exp $
 include/pango-1.0/pango/pangoxft.h
 lib/libpangoxft-1.0.a
 lib/libpangoxft-1.0.la
diff --git a/devel/pango/buildlink.mk b/devel/pango/buildlink.mk
index 8c9526f32b5..bf7d48415b5 100644
--- a/devel/pango/buildlink.mk
+++ b/devel/pango/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2002/06/30 01:51:30 jschauma Exp $
+# $NetBSD: buildlink.mk,v 1.4 2002/08/25 19:22:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pango.
 #
diff --git a/devel/pango/buildlink2.mk b/devel/pango/buildlink2.mk
new file mode 100644
index 00000000000..3650d548edc
--- /dev/null
+++ b/devel/pango/buildlink2.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:36 jlam Exp $
+
+.if !defined(PANGO_BUILDLINK2_MK)
+PANGO_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		pango
+BUILDLINK_DEPENDS.pango?=	pango>=1.0.3
+BUILDLINK_PKGSRCDIR.pango?=	../../devel/pango
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.pango=pango
+BUILDLINK_PREFIX.pango_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.pango=	include/pango-1.0/*/*
+BUILDLINK_FILES.pango+=	include/pango-1.0/*
+BUILDLINK_FILES.pango+=	lib/libpango*-1.0.*
+
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	pango-buildlink
+
+pango-buildlink: _BUILDLINK_USE
+
+.endif	# PANGO_BUILDLINK2_MK
diff --git a/devel/pango/patches/patch-aa b/devel/pango/patches/patch-aa
index 2e6da162716..4c9a0caedda 100644
--- a/devel/pango/patches/patch-aa
+++ b/devel/pango/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:36 jlam Exp $
 
 --- pango.pc.in.orig	Thu Mar  7 03:04:39 2002
 +++ pango.pc.in
diff --git a/devel/pango/patches/patch-ab b/devel/pango/patches/patch-ab
index 732b4fd2edd..19c337a82b5 100644
--- a/devel/pango/patches/patch-ab
+++ b/devel/pango/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:37 jlam Exp $
 
 --- pangoft2.pc.in.orig	Wed Mar  6 03:20:57 2002
 +++ pangoft2.pc.in
diff --git a/devel/pango/patches/patch-ac b/devel/pango/patches/patch-ac
index 37da3087795..4150323b76b 100644
--- a/devel/pango/patches/patch-ac
+++ b/devel/pango/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 00:45:51 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:37 jlam Exp $
 
 --- pangox.pc.in.orig	Wed Mar  6 03:20:57 2002
 +++ pangox.pc.in
diff --git a/devel/pango/patches/patch-ad b/devel/pango/patches/patch-ad
index 6e39d53a732..2f19b3c5749 100644
--- a/devel/pango/patches/patch-ad
+++ b/devel/pango/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ad,v 1.2 2002/08/25 19:22:37 jlam Exp $
 
 --- pangowin32.pc.in.orig	Wed Mar  6 03:20:57 2002
 +++ pangowin32.pc.in
diff --git a/devel/pango/patches/patch-ae b/devel/pango/patches/patch-ae
index 34b48cecb36..58ea5954f98 100644
--- a/devel/pango/patches/patch-ae
+++ b/devel/pango/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2002/07/18 02:19:36 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/08/25 19:22:37 jlam Exp $
 
 --- pangoxft.pc.in.orig	Wed Mar  6 03:20:57 2002
 +++ pangoxft.pc.in