From 52c3466008ff380c001a522925849a6ddf290f58 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 6 Feb 2007 18:16:02 +0000
Subject: Modular Xorg support.

---
 emulators/BasiliskII/options.mk | 10 ++++++++--
 emulators/xm7/Makefile          |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/emulators/BasiliskII/options.mk b/emulators/BasiliskII/options.mk
index 7a035c78710..ff57a1032c2 100644
--- a/emulators/BasiliskII/options.mk
+++ b/emulators/BasiliskII/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/09/01 11:31:57 hira Exp $
+# $NetBSD: options.mk,v 1.4 2007/02/06 18:16:02 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.BasiliskII
 PKG_SUPPORTED_OPTIONS=	esound gtk sdl
@@ -25,5 +25,11 @@ CONFIGURE_ARGS+=	--enable-sdl-audio
 CONFIGURE_ARGS+=	--enable-sdl-video
 .include "../../devel/SDL/buildlink3.mk"
 .else
-.include "../../mk/x11.buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .endif
diff --git a/emulators/xm7/Makefile b/emulators/xm7/Makefile
index c15d2461bbb..9b9adc9567a 100644
--- a/emulators/xm7/Makefile
+++ b/emulators/xm7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/09/09 02:42:00 obache Exp $
+# $NetBSD: Makefile,v 1.19 2007/02/06 18:20:07 joerg Exp $
 #
 
 DISTNAME=		xm71010s
@@ -26,13 +26,14 @@ NO_CONFIGURE=		yes
 MAKE_FILE=		makefile.x11
 INSTALLATION_DIRS=	bin
 
-.include "../../mk/x11.buildlink3.mk"
-
 post-extract:
 	@cd ${WRKDIR}; ${MV} linux/* vm
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/vm/xm7 ${PREFIX}/bin
 
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3