From 9a488c3b0da87591cf0e2437dc1342bdd3db830b Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 2 Jan 2007 11:26:58 +0000
Subject: Convert to modular Xorg.

---
 x11/gtk/Makefile      | 11 ++++++++---
 x11/gtk/buildlink3.mk |  5 +++--
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'x11/gtk')

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 61317183725..4707c5d8c90 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2006/12/02 22:33:00 jschauma Exp $
+# $NetBSD: Makefile,v 1.121 2007/01/02 11:26:58 joerg Exp $
 
 DISTNAME=		gtk+-1.2.10
 PKGREVISION=		9
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.gtk.org/
 COMMENT=		GIMP Toolkit v1 - libraries for building X11 user interfaces
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -63,7 +63,12 @@ pre-configure:
 		${RM} $${file}.fixme;					\
 	done
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk
index f5df2da813d..1121a5d658b 100644
--- a/x11/gtk/buildlink3.mk
+++ b/x11/gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2007/01/02 11:26:58 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GTK_BUILDLINK3_MK:=	${GTK_BUILDLINK3_MK}+
@@ -19,6 +19,7 @@ BUILDLINK_PKGSRCDIR.gtk?=	../../x11/gtk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
-- 
cgit v1.2.3