Modular Xorg support.

4 files changed, 23 insertions, 7 deletions

diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 9ac3cc7fd86..3d7f799c6eb 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/11 16:53:18 joerg Exp $
 
 DISTNAME=	fox-1.4.34
 CATEGORIES=	x11
@@ -14,6 +14,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-release
 CONFIGURE_ARGS+=	--with-opengl
 CONFIGURE_ARGS+=	--with-shm
+CONFIGURE_ARGS+=	--with-xft
 CONFIGURE_ARGS+=	--with-x
 
 CONFIGURE_ENV+=		REAL_PTHREAD_LIBS=${PTHREAD_LIBS:Q}
@@ -25,11 +26,20 @@ CONFIGURE_ENV+=		REAL_PTHREAD_LIBS=${PTHREAD_LIBS:Q}
 CONFIGURE_ARGS+=	--disable-threadsafe
 .endif
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../archivers/bzip2/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk
index 9300800b3df..a6e69f285c9 100644
--- a/x11/fox/buildlink3.mk
+++ b/x11/fox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2007/01/11 16:53:18 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FOX_BUILDLINK3_MK:=	${FOX_BUILDLINK3_MK}+
@@ -23,5 +23,11 @@ BUILDLINK_INCDIRS.fox?=		include/fox-1.4
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/tk83/Makefile b/x11/tk83/Makefile
index d2880e2c852..57684acebe7 100644
--- a/x11/tk83/Makefile
+++ b/x11/tk83/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/01/11 16:18:37 joerg Exp $
 
 DISTNAME=	tk8.3.4
 PKGNAME=	tk-8.3.4
@@ -91,5 +91,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
 .include "../../lang/tcl83/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/tk83/buildlink3.mk b/x11/tk83/buildlink3.mk
index cc4d3ae6465..4bcfd0245f0 100644
--- a/x11/tk83/buildlink3.mk
+++ b/x11/tk83/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2007/01/11 16:18:37 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 TK_BUILDLINK3_MK:=	${TK_BUILDLINK3_MK}+
@@ -27,6 +27,6 @@ BUILDLINK_TRANSFORM+=	l:tk:tk83
 TKCONFIG_SH?=	${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
 
 .include "../../lang/tcl83/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}