Modular Xorg support.

6 files changed, 27 insertions, 14 deletions

diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index abb9062f0b7..9710cd32408 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/08/20 23:08:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.28 2007/02/01 22:08:35 joerg Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -17,6 +17,10 @@ CONFLICTS+=	blackbox70>=0.70.1
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox70/Makefile b/wm/blackbox70/Makefile
index f337cf4f9d1..e440d566764 100644
--- a/wm/blackbox70/Makefile
+++ b/wm/blackbox70/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2006/08/20 23:07:17 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2007/02/01 21:56:13 joerg Exp $
 #
 
 DISTNAME=	blackbox-0.70.1
@@ -17,5 +17,8 @@ USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 USE_TOOLS+=     pkg-config
 
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox70/buildlink3.mk b/wm/blackbox70/buildlink3.mk
index 3c623b653dc..1d54581158a 100644
--- a/wm/blackbox70/buildlink3.mk
+++ b/wm/blackbox70/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2006/08/20 23:07:17 jschauma Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/02/01 21:56:13 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 BLACKBOX70_BUILDLINK3_MK:=	${BLACKBOX70_BUILDLINK3_MK}+
@@ -17,4 +17,6 @@ BUILDLINK_ABI_DEPENDS.blackbox70+=	blackbox70>=0.70.0
 BUILDLINK_PKGSRCDIR.blackbox70?=	../../wm/blackbox70
 .endif	# BLACKBOX70_BUILDLINK3_MK
 
+.include "../../x11/libX11/buildlink3.mk"
+
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/evilwm/Makefile b/wm/evilwm/Makefile
index 26ed647d02a..c6f1800cca7 100644
--- a/wm/evilwm/Makefile
+++ b/wm/evilwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2007/02/01 22:12:25 joerg Exp $
 #
 
 DISTNAME=	evilwm-0.99.25
@@ -11,8 +11,6 @@ COMMENT=	Minimalist Window Manager for X
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/evilwm ${PREFIX}/bin/evilwm
 	${INSTALL_MAN} ${WRKSRC}/evilwm.1 ${PREFIX}/${PKGMANDIR}/man1/evilwm.1
@@ -22,4 +20,6 @@ do-install:
 	    ${INSTALL_DATA} ${WRKSRC}/$$docfile ${PREFIX}/share/doc/evilwm/; \
 	done
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/vtwm/Makefile b/wm/vtwm/Makefile
index 3a7fb220270..41549de68fc 100644
--- a/wm/vtwm/Makefile
+++ b/wm/vtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2007/02/01 21:57:56 joerg Exp $
 #
 
 DISTNAME=	vtwm-5.4.7
@@ -12,7 +12,10 @@ COMMENT=	TWM with virtual desktop, m4, sound and 3-D buttons
 
 USE_IMAKE=	YES
 
-.include "../../x11/libXpm/buildlink3.mk"
 .include "../../audio/rplay/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index c73e7ce724d..6fbc6d8046e 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/01/07 09:14:15 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/01 21:59:34 joerg Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -18,10 +18,11 @@ MAKE_ENV+=	CCC=${CXX:Q}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/cat1
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wm2 ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${PKGMANDIR}/cat1/wm2.0
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"