Modular Xorg support.

5 files changed, 15 insertions, 11 deletions

diff --git a/games/finalbattle/Makefile b/games/finalbattle/Makefile
index ada0a01ed32..e278cae2318 100644
--- a/games/finalbattle/Makefile
+++ b/games/finalbattle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/04 21:43:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/02/02 17:14:04 joerg Exp $
 #
 
 DISTNAME=	finalbattle.0.0
@@ -17,5 +17,5 @@ MAKE_FILE=	makefile
 
 USE_X11BASE=	yes
 
-.include "../../mk/x11.buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index aa83337be8c..b8bafa56b79 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/07 09:13:54 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2007/02/02 17:19:04 joerg Exp $
 
 DISTNAME=	lincity-1.12.1
 PKGREVISION=	1
@@ -25,6 +25,11 @@ pre-install:
 post-install:
 	${LN} -sf lincity.6 ${PREFIX}/${PKGMANDIR}/man6/xlincity.6
 
+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/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 76f34445826..982b6d4568b 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:30:10 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2007/02/02 17:15:51 joerg Exp $
 
 DISTNAME=       ast54unx
 PKGNAME=        astrolog-5.40
@@ -29,8 +29,6 @@ BUILD_TARGET=	astrolog
 
 INSTALLATION_DIRS=	bin
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
 	cd ${DISTDIR}/${DIST_SUBDIR} && \
@@ -53,4 +51,5 @@ do-install:
 	@${ECHO} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for"
 	@${ECHO} "help and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 65a75cfe47f..59cc730e141 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:11 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2007/02/02 17:13:56 joerg Exp $
 
 DISTNAME=       kp-0.96
 PKGREVISION=	1
@@ -10,8 +10,6 @@ COMMENT=	The Keyboard Practicer, touch-type training program
 
 DEPENDS+=	tk>=8.3.2:../../x11/tk
 
-.include "../../mk/x11.buildlink3.mk"
-
 pre-configure:
 	for f in `${FIND} ${WRKDIR}/. -type f -print \
 		| ${XARGS} ${GREP} -l '/usr/local'`; do \
diff --git a/time/xalarm/Makefile b/time/xalarm/Makefile
index 1ef6571cefc..893d57bc931 100644
--- a/time/xalarm/Makefile
+++ b/time/xalarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/16 01:00:06 perry Exp $
+# $NetBSD: Makefile,v 1.11 2007/02/02 17:21:17 joerg Exp $
 
 DISTNAME=	xalarm-3.06
 CATEGORIES=	time
@@ -53,5 +53,7 @@ pre-configure:
 		-e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h
 	${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
 
+.include "../../x11/libXp/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"