Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.

10 files changed, 43 insertions, 9 deletions

diff --git a/x11/gtk2/buildlink2.mk b/x11/gtk2/buildlink2.mk
new file mode 100644
index 00000000000..98ff46c5faa
--- /dev/null
+++ b/x11/gtk2/buildlink2.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 19:23:31 jlam Exp $
+
+.if !defined(GTK2_BUILDLINK2_MK)
+GTK2_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		gtk2
+BUILDLINK_DEPENDS.gtk2?=	gtk2+>=2.0.0
+BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.gtk2=gtk2
+BUILDLINK_PREFIX.gtk2_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gtk2=	include/gtk-2.0/*/*
+BUILDLINK_FILES.gtk2+=	include/gtk-2.0/*
+BUILDLINK_FILES.gtk2+=	lib/gtk-2.0/*/*/*
+BUILDLINK_FILES.gtk2+=	lib/gtk-2.0/*/*
+BUILDLINK_FILES.gtk2+=	lib/gtk-2.0/*
+BUILDLINK_FILES.gtk2+=	lib/libgdk*-2.0.*
+BUILDLINK_FILES.gtk2+=	lib/libgtk*-2.0.*
+
+.include "../../devel/atk/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pango/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	gtk2-buildlink
+
+gtk2-buildlink: _BUILDLINK_USE
+
+.endif	# GTK2_BUILDLINK2_MK
diff --git a/x11/gtk2/patches/patch-aa b/x11/gtk2/patches/patch-aa
index 5a06fa4fd7c..cbc60799ae5 100644
--- a/x11/gtk2/patches/patch-aa
+++ b/x11/gtk2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2002/08/25 19:23:32 jlam Exp $
 
 --- configure.orig	Sun Jun 16 00:58:22 2002
 +++ configure
diff --git a/x11/gtk2/patches/patch-ac b/x11/gtk2/patches/patch-ac
index 871cdda7afa..fa08e477d84 100644
--- a/x11/gtk2/patches/patch-ac
+++ b/x11/gtk2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.6 2002/08/25 19:23:32 jlam Exp $
 
 --- demos/Makefile.in.orig	Sun Jun 16 01:16:31 2002
 +++ demos/Makefile.in
diff --git a/x11/gtk2/patches/patch-ae b/x11/gtk2/patches/patch-ae
index c1bd3f61a10..afa7a0b00fa 100644
--- a/x11/gtk2/patches/patch-ae
+++ b/x11/gtk2/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.5 2002/08/25 19:23:32 jlam Exp $
 
 --- demos/gtk-demo/Makefile.in.orig	Sun Jun 16 01:16:32 2002
 +++ demos/gtk-demo/Makefile.in
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index f73aa37b639..b4a60b29403 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2002/07/18 02:19:28 rh Exp $
+$NetBSD: patch-af,v 1.6 2002/08/25 19:23:32 jlam Exp $
 
 --- contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in.orig	Wed Mar  6 07:03:50 2002
 +++ contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-aj b/x11/gtk2/patches/patch-aj
index 21d5ee2d580..1df28b950a9 100644
--- a/x11/gtk2/patches/patch-aj
+++ b/x11/gtk2/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-aj,v 1.5 2002/08/25 19:23:32 jlam Exp $
 
 --- gdk/Makefile.in.orig	Sun Jun 16 01:16:19 2002
 +++ gdk/Makefile.in
diff --git a/x11/gtk2/patches/patch-al b/x11/gtk2/patches/patch-al
index 6eb51eebe71..f4bb3d56c26 100644
--- a/x11/gtk2/patches/patch-al
+++ b/x11/gtk2/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.4 2002/07/03 01:23:44 dmcmahill Exp $
+$NetBSD: patch-al,v 1.5 2002/08/25 19:23:32 jlam Exp $
 
 --- gtk/Makefile.in.orig	Sun Jun 16 01:16:26 2002
 +++ gtk/Makefile.in
diff --git a/x11/gtk2/patches/patch-an b/x11/gtk2/patches/patch-an
index 373a1e3aa80..f5b56170f69 100644
--- a/x11/gtk2/patches/patch-an
+++ b/x11/gtk2/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-an,v 1.4 2002/08/25 19:23:32 jlam Exp $
 
 --- gdk-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
 +++ gdk-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-ao b/x11/gtk2/patches/patch-ao
index c5a9f1819ef..43fac144c6a 100644
--- a/x11/gtk2/patches/patch-ao
+++ b/x11/gtk2/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.3 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-ao,v 1.4 2002/08/25 19:23:32 jlam Exp $
 
 --- gdk-pixbuf-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
 +++ gdk-pixbuf-2.0.pc.in
diff --git a/x11/gtk2/patches/patch-ap b/x11/gtk2/patches/patch-ap
index ff49b7e0fe2..6c72c729336 100644
--- a/x11/gtk2/patches/patch-ap
+++ b/x11/gtk2/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1 2002/07/18 02:19:29 rh Exp $
+$NetBSD: patch-ap,v 1.2 2002/08/25 19:23:32 jlam Exp $
 
 --- gtk+-2.0.pc.in.orig	Wed Mar  6 07:03:49 2002
 +++ gtk+-2.0.pc.in