Modular Xorg support.

7 files changed, 24 insertions, 13 deletions

diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 2445405f9ca..896ac8f0045 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:31:06 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/01/11 15:01:14 joerg Exp $
 
 DISTNAME=		9term.1.6.3
 PKGNAME=		9term-1.6.3
@@ -20,5 +20,5 @@ MANCOMPRESSED=		yes
 MAKE_ENV+=		SAM_DIR=${BUILDLINK_PREFIX.sam}
 
 .include "../../editors/sam/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index c96d77d4ad8..138810dc6b3 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/04 22:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/01/11 15:08:24 joerg Exp $
 #
 
 DISTNAME=		XaoS-3.2.2
@@ -27,7 +27,10 @@ SUBST_SED.paths=	-e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,g'
 
 INSTALLATION_DIRS=	${PKGINFODIR}
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index aa607a0e876..76f60d250c5 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/03/04 21:31:11 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2007/01/11 15:22:26 joerg Exp $
 
 DISTNAME=		startup-notification-0.8
 PKGREVISION=		1
@@ -24,5 +24,9 @@ post-install:
 		doc/startup-notification.txt \
 		${PREFIX}/share/doc/startup-notification/
 
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/Makefile b/x11/xvidcap/Makefile
index 976fdfc7318..b6d71debe47 100644
--- a/x11/xvidcap/Makefile
+++ b/x11/xvidcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/17 01:53:18 reed Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/11 15:12:53 joerg Exp $
 #
 
 .include "Makefile.common"
@@ -8,4 +8,7 @@ COMMENT=		Capture X display to individual frames or MPEG video
 
 CONFIGURE_ARGS+=	--without-gtk2
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common
index 2f9414e9a88..5cc8ddcf2fe 100644
--- a/x11/xvidcap/Makefile.common
+++ b/x11/xvidcap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/05/17 05:06:28 reed Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/01/11 15:12:53 joerg Exp $
 #
 
 DISTNAME=		xvidcap-1.1.3
@@ -18,5 +18,6 @@ CONFIGURE_ARGS+=	--without-forced-embedded-ffmpeg
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/xworld/Makefile b/x11/xworld/Makefile
index 694374e9b71..04c90760407 100644
--- a/x11/xworld/Makefile
+++ b/x11/xworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/07/21 17:31:44 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2007/01/11 14:55:15 joerg Exp $
 #
 
 DISTNAME=		xworld-2.0
@@ -30,5 +30,5 @@ SUBST_STAGE.install=	post-patch
 SUBST_FILES.install=	Makefile.in
 SUBST_SED.install=	-e 's,-g bin -o bin,-g ${BINGRP} -o ${BINOWN},g'
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xwrits/Makefile b/x11/xwrits/Makefile
index 160853392a9..78acd6a9a49 100644
--- a/x11/xwrits/Makefile
+++ b/x11/xwrits/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/08/07 23:48:15 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/01/11 14:56:36 joerg Exp $
 
 DISTNAME=	xwrits-2.24
 CATEGORIES=	x11
@@ -10,5 +10,5 @@ COMMENT=	Wrist break reminder for prevention of repetitive stress injuries
 
 GNU_CONFIGURE=	YES
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"