Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

6 files changed, 38 insertions, 5 deletions

diff --git a/devel/glib2/buildlink.mk b/devel/glib2/buildlink.mk
index 00daedfb02b..0cdf2f91c0e 100644
--- a/devel/glib2/buildlink.mk
+++ b/devel/glib2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/08/01 05:48:08 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/08/25 19:22:28 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib2.
 #
diff --git a/devel/glib2/buildlink2.mk b/devel/glib2/buildlink2.mk
new file mode 100644
index 00000000000..7c38a68ad69
--- /dev/null
+++ b/devel/glib2/buildlink2.mk
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:22:28 jlam Exp $
+
+.if !defined(GLIB2_BUILDLINK2_MK)
+GLIB2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		glib2
+BUILDLINK_DEPENDS.glib2?=	glib2>=2.0.1nb1
+BUILDLINK_PKGSRCDIR.glib2?=	../../devel/glib2
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.glib2=glib2
+BUILDLINK_PREFIX.glib2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.glib2=	include/glib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+=	include/glib/glib-2.0/*
+BUILDLINK_FILES.glib2+=	lib/glib-2.0/*/*
+BUILDLINK_FILES.glib2+=	lib/libglib-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgmodule-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgobject-2.0.*
+BUILDLINK_FILES.glib2+=	lib/libgthread-2.0.*
+
+USE_PTHREAD=	native ptl2
+
+.include "../../mk/bsd.prefs.mk"
+.include "../../mk/pthread.buildlink2.mk"
+
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	glib2-buildlink
+
+glib2-buildlink: _BUILDLINK_USE
+
+.endif	# GLIB2_BUILDLINK2_MK
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index d30f2708194..a7f0a3fb863 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-aa,v 1.4 2002/08/25 19:22:29 jlam Exp $
 
 --- glib-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
 +++ glib-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ab b/devel/glib2/patches/patch-ab
index b3a94992acd..0a573dc1a4a 100644
--- a/devel/glib2/patches/patch-ab
+++ b/devel/glib2/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ab,v 1.4 2002/08/25 19:22:29 jlam Exp $
 
 --- gmodule-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
 +++ gmodule-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ac b/devel/glib2/patches/patch-ac
index 2cca15a7de4..e8d8654643c 100644
--- a/devel/glib2/patches/patch-ac
+++ b/devel/glib2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2002/05/10 01:17:29 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/08/25 19:22:29 jlam Exp $
 
 --- gobject-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
 +++ gobject-2.0.pc.in
diff --git a/devel/glib2/patches/patch-ad b/devel/glib2/patches/patch-ad
index ea777af1f06..30b94c05563 100644
--- a/devel/glib2/patches/patch-ad
+++ b/devel/glib2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2002/05/10 01:17:30 rh Exp $
+$NetBSD: patch-ad,v 1.4 2002/08/25 19:22:29 jlam Exp $
 
 --- gthread-2.0.pc.in.orig	Wed Mar  6 01:37:24 2002
 +++ gthread-2.0.pc.in