Mechanically replace all includes of buildlink3.mk of the following

packages with the modular Xorg equivalent. Those are falling back
to the old location by default, so this commmit doesn't change
dependencies.

graphics/xpm ==> x11/libXpm
fonts/Xft2 ==> x11/libXft
x11/Xfixes ==> x11/libXfixes
x11/xcursor ==> x11/libXcursor
x11/Xrender ==> x11/libXrender
x11/Xrandr ==> libXrandr

25 files changed, 50 insertions, 50 deletions

diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile
index bce75cd5f25..f0a4000cca2 100644
--- a/games/freeciv-client/Makefile
+++ b/games/freeciv-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/06/09 22:01:00 ghen Exp $
+# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:55 joerg Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 PKGREVISION=	1
@@ -21,5 +21,5 @@ CONFIGURE_ARGS+=	--disable-server
 .include "../../audio/esound/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index 98cd6290ffb..ca1026cfb81 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:55 joerg Exp $
 #
 
 DISTNAME=		freesci-0.3.4c
@@ -24,8 +24,8 @@ post-install:
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 #.include "../../mk/motif.buildlink3.mk"
 #.include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index bbca3ca6684..2fee0fda299 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/26 08:56:37 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=		Maelstrom-1.4.3-L2.0.6-src.tar.gz
 PKGNAME=		maelstrom-x11-2.0.6
@@ -43,6 +43,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.* ${PREFIX}/share/maelstrom
 	${INSTALL_PROGRAM} ${WRKSRC}/netplayd/netplayd ${PREFIX}/bin/Maelstrom_netplayd
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 2cfcfdeb92f..6476dc34655 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/05/22 22:01:31 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/12/15 20:32:55 joerg Exp $
 #
 
 .include "../../games/nethack-lib/Makefile.common"
@@ -21,7 +21,7 @@ post-install:
 	@${CP} -f ${WRKSRC}/dat/x11tiles ${WRKSRC}/dat/tiles.xpm
 	@${INSTALL_DATA} ${WRKSRC}/dat/tiles.xpm ${PREFIX}/share/${NETHACK_DIR}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-x11/Makefile b/games/nethack-x11/Makefile
index a343ff2ff4a..68b834ef512 100644
--- a/games/nethack-x11/Makefile
+++ b/games/nethack-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/02/05 23:09:20 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/12/15 20:32:55 joerg Exp $
 #
 
 .include "../../games/nethack-lib/Makefile.common"
@@ -28,5 +28,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/win/X11/nethack.rc \
 	    ${PREFIX}/share/${NETHACK_DIR}/nethack.x11.rc
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 8f8001e9989..365eeaeeee7 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/15 20:32:55 joerg Exp $
 #
 
 DISTNAME=		nighthawk-2.1
@@ -26,7 +26,7 @@ CPPFLAGS+=		-DPREFIX="\"${PREFIX}\"" \
 
 INSTALLATION_DIRS=	bin
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 post-build:
diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 6a807d89983..9ff28694bf4 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/12 21:30:56 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=		tanked-0.90
@@ -19,5 +19,5 @@ post-patch:
 	@${SED} -e 's@XXX@${PREFIX}/share/tanked/@' \
 		< ${WRKSRC}/server/maps.list.bak > ${WRKSRC}/server/maps.list
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index bd3e9383478..506c4cc92b8 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/04/28 16:23:55 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=	xarchon-0.60
@@ -25,7 +25,7 @@ CONFIGURE_ENV+=	CC=${CC:Q}
 #HF#CONFIGURE_ENV+=	GTK_CONFIG=${X11PREFIX}/bin/gtk-config
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 #HF#.include "../../x11/gtk/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 02827d7eec8..8f9e05551b9 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/12/14 14:05:48 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=		xbill-2.0
@@ -33,5 +33,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/xbill.man ${PREFIX}/${PKGMANDIR}/man6/xbill.6
 	${INSTALL_DATA} ${WRKSRC}/scores ${PREFIX}/share/examples/xbill.scores
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index c26c5bb2648..ed28df82451 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/07/16 09:17:15 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=	xboard-4.2.7
 CATEGORIES=	games
@@ -23,7 +23,7 @@ BUILD_DEFS+=		XAW_TYPE
 CONFIGURE_ARGS+=	--with-Xaw3d
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index e80b74be343..db3f8b8090f 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=		xboing2.4
@@ -23,7 +23,7 @@ post-install:
 	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xboing
 	${INSTALL_MAN} ${WRKSRC}/xboing.man ${PREFIX}/man/man6/xboing.6
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xbreaky/Makefile b/games/xbreaky/Makefile
index e4d79e5f37d..2869d701232 100644
--- a/games/xbreaky/Makefile
+++ b/games/xbreaky/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/08/24 10:28:11 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=	xbreaky-0.0.5
@@ -14,6 +14,6 @@ USE_DIRS+=	xdg-1.1
 
 USE_LANGUAGES=	c c++
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 36b723c8d6e..30ebdb2c7b8 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=       xdemineur-2.1.1
@@ -13,5 +13,5 @@ COMMENT=	Minesweeper game for the X Window System
 USE_IMAKE=	YES
 
 .include "../../devel/sysexits/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 953d47ff46e..775ac520b72 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/09/09 02:42:01 obache Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=	xevilsrc2.02r2
 PKGNAME=	xevil-2.02
@@ -32,5 +32,5 @@ SUBST_STAGE.uname=	pre-configure
 SUBST_FILES.uname=	cmn/utils.cpp
 SUBST_SED.uname=	-e 's,@UNAME@,${UNAME},g'
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index 34d476da929..886247b1406 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/09 21:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=		xgalaga-2.0.34
 PKGREVISION=		4
@@ -20,6 +20,6 @@ MAKE_ENV+=		GAMEOWN=${GAMEOWN:Q} GAMEGRP=${GAMEGRP:Q} \
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xgospel/Makefile b/games/xgospel/Makefile
index 2bf7ff6792f..6f734073885 100644
--- a/games/xgospel/Makefile
+++ b/games/xgospel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 21:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=	xgospel-1.12d
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--with-xaw3d
 # Don't find libintl.a...it's only needed on SCO UNIX.
 CONFIGURE_ENV+=		ac_cv_lib_intl=no
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xjump/Makefile b/games/xjump/Makefile
index 345d9a4aae1..b4680a74e69 100644
--- a/games/xjump/Makefile
+++ b/games/xjump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:09:24 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=		xjump_2.7.5.orig
 PKGNAME=		xjump-2.7.5
@@ -19,5 +19,5 @@ MAKE_ENV+=		VARBASE=${VARBASE:Q}
 do-install:
 	${INSTALL_GAME} ${WRKSRC}/xjump ${PREFIX}/bin/xjump
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index e0793e1be0b..ee55b455adb 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/04 21:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=		xnibbles-1.0BETA4
@@ -22,7 +22,7 @@ SUBST_MESSAGE.audio=	Adjusting path to audio device
 SUBST_FILES.audio=	Makefile
 SUBST_SED.audio=	-e "s|/dev/dsp|${DEVOSSAUDIO}|"
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 101e2c6f718..babd4829746 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/02/05 23:09:25 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=	xpat2-1.07
 PKGREVISION=	1
@@ -23,5 +23,5 @@ post-install:
 	${CHOWN} ${GAMEOWN}.${GAMEGRP} ${PREFIX}/bin/xpat2
 	${CHMOD} ${GAMEMODE} ${PREFIX}/bin/xpat2
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 5b4d97171a3..b0fbaf954db 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/09/16 20:00:03 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=		xpuyopuyo-0.9.1
 PKGREVISION=		6
@@ -28,6 +28,6 @@ pre-configure:
 	${CHMOD} +x ${GNOME_CONFIG}
 
 .include "../../audio/libmikmod/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 5064d549fef..9f6745297f4 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/09 08:21:57 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:56 joerg Exp $
 
 DISTNAME=	xscorch-0.2.0
 PKGREVISION=	2
@@ -16,6 +16,6 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-gnome
 
 .include "../../audio/libmikmod/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 292c280a54e..56af237253d 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=	xscrabble-1.0
@@ -35,5 +35,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xscrabble.scores ${EGDIR}/xscrabble.scores.dist
 	${INSTALL_DATA} ${WRKSRC}/XScrabble.ad ${PREFIX}/lib/X11/app-defaults/XScrabble
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index ddb0603d3da..79d0390065d 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/10/04 21:43:01 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:56 joerg Exp $
 #
 
 DISTNAME=		xsoldier-0.96
@@ -22,5 +22,5 @@ CONF_FILES_PERMS=	${PREFIX}/share/xsoldier/xsoldier.score.dist	\
 post-patch:
 	${TOUCH} ${WRKSRC}/xsoldier.man
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 6301e45de32..cb0c8dae5fd 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:29:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
@@ -27,5 +27,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tux_serv ${PREFIX}/bin/tux_serv
 	${INSTALL_PROGRAM} ${WRKSRC}/xtux ${PREFIX}/bin/xtux
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index e9a49ebb3b7..6df2277661e 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:30 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=	zoom-1.0.3
 PKGREVISION=	3
@@ -30,8 +30,8 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/manual/$$f ${DOCDIR}; \
 	done
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/t1lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"