[pkgsrc/trunk]: pkgsrc/x11/gtk2 Switch to modular buildlinks.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fda8872bb5cc
branches:  trunk
changeset: 521178:fda8872bb5cc
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 06 10:42:38 2006 +0000

description:
Switch to modular buildlinks.

diffstat:

 x11/gtk2/Makefile      |  19 ++++++++++++-------
 x11/gtk2/buildlink3.mk |  10 ++++++----
 2 files changed, 18 insertions(+), 11 deletions(-)

diffs (63 lines):

diff -r 1dcb5905f21d -r fda8872bb5cc x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Mon Nov 06 10:36:42 2006 +0000
+++ b/x11/gtk2/Makefile Mon Nov 06 10:42:38 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2006/10/12 14:18:40 drochner Exp $
+# $NetBSD: Makefile,v 1.132 2006/11/06 10:42:38 joerg Exp $
 
 DISTNAME=              gtk+-2.10.6
 PKGNAME=               ${DISTNAME:S/gtk/gtk2/}
@@ -88,16 +88,21 @@
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1dcb5905f21d -r fda8872bb5cc x11/gtk2/buildlink3.mk
--- a/x11/gtk2/buildlink3.mk    Mon Nov 06 10:36:42 2006 +0000
+++ b/x11/gtk2/buildlink3.mk    Mon Nov 06 10:42:38 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2006/10/12 14:18:40 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2006/11/06 10:42:38 joerg Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GTK2_BUILDLINK3_MK:=   ${GTK2_BUILDLINK3_MK}+
@@ -29,11 +29,13 @@
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}