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

238 files changed, 523 insertions, 525 deletions

diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 8d9ebc51442..7a02f7eb9dc 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/09/09 02:41:54 obache Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:32:52 joerg Exp $
 
 DISTNAME=		dap-2.1.2
 PKGREVISION=		6
@@ -24,7 +24,7 @@ do-install:
 		${WRKSRC}/FEATURES ${PREFIX}/share/doc/dap
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index fcd3e59eef4..5adf32c0b9e 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/08/22 14:29:07 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:52 joerg Exp $
 #
 
 DISTNAME=		lmms-0.2.0
@@ -29,7 +29,7 @@ BUILDLINK_ABI_DEPENDS.SDL+=	SDL>=1.2.11
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mixer.app/Makefile b/audio/mixer.app/Makefile
index 6774ed7a347..20b00b0e665 100644
--- a/audio/mixer.app/Makefile
+++ b/audio/mixer.app/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:41 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	Mixer.app-1.8.0
@@ -25,6 +25,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Mixer.app
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Mixer.app
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmixer/Makefile b/audio/wmmixer/Makefile
index ba1103b696b..e031cf21080 100644
--- a/audio/wmmixer/Makefile
+++ b/audio/wmmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/14 15:22:08 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	wmmixer-1.0-beta1
@@ -22,6 +22,6 @@ NO_INSTALL_MANPAGES=	YES
 pre-build:
 	${TOUCH} ${WRKSRC}/wmmixer.man
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 308c7bcf494..d27c82d927e 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/10/14 07:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=	wmmp3-0.12
 PKGREVISION=	2
@@ -22,5 +22,5 @@ post-install:
 	@${ECHO} "===> Installing sample.wmmp3 in ${PREFIX}/share/examples"
 	${INSTALL_DATA} ${WRKSRC}/sample.wmmp3 ${PREFIX}/share/examples
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmsmixer/Makefile b/audio/wmsmixer/Makefile
index 9a38ae67ef2..b47157ef058 100644
--- a/audio/wmsmixer/Makefile
+++ b/audio/wmsmixer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	wmsmixer-0.5.1
@@ -27,6 +27,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.wmmixer \
 		${PREFIX}/share/doc/wmsmixer/README.wmsmixer
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index f828e126f19..654908cc9fc 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:15 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=	wmusic-1.5.0
 PKGREVISION=	2
@@ -21,5 +21,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/wmusic
 
 .include "../../audio/xmms/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile
index 921eca893cf..df90fb5be96 100644
--- a/audio/xanalyser/Makefile
+++ b/audio/xanalyser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/07/22 04:46:14 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	xanalyser-1.24
@@ -14,7 +14,7 @@ COMMENT=	Frequency spectrum analyser for X
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 908879ab4a6..c087ae851e3 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2006/10/04 20:44:20 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=	xmcd-3.0.2
 PKGREVISION=    9
@@ -61,7 +61,7 @@ post-install:
 .if ${OPSYS} != "SunOS"
 .include "../../devel/ncurses/buildlink3.mk"
 .endif
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmradio/Makefile b/audio/xmradio/Makefile
index 28126734d00..60ef437ff96 100644
--- a/audio/xmradio/Makefile
+++ b/audio/xmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/03/04 21:29:00 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=	xmradio-1.2
 PKGREVISION=	3
@@ -21,7 +21,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmradio
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmradio
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
index cd37a416109..6239bced70e 100644
--- a/audio/xwave/Makefile
+++ b/audio/xwave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=		xwave2
@@ -24,7 +24,7 @@ do-install:
 			${WRKSRC}/INSTALL \
 			${PREFIX}/share/doc/xwave2
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile
index 76c9be80ffd..c445deff2cb 100644
--- a/cad/xchiplogo/Makefile
+++ b/cad/xchiplogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	xchiplogo
@@ -17,7 +17,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${PREFIX}/bin/xchiplogo
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index f4b1901b5af..4383e0c1fb5 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/11/12 14:25:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:53 joerg Exp $
 
 DISTNAME=	xcircuit-3.4.26
 CATEGORIES=	cad graphics
@@ -41,7 +41,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/*.* ${PREFIX}/share/examples/xcircuit/
 	${INSTALL_DATA} ${WRKSRC}/examples/xcircuitrc ${PREFIX}/share/examples/xcircuit/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index 247a7450e35..9c4f60f4407 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/10/06 22:14:44 reed Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=		xisp-2.7p1
@@ -24,7 +24,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/
 	${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/xisp/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile
index 127653d5d5c..18667fdfa3c 100644
--- a/comms/xtel/Makefile
+++ b/comms/xtel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/28 17:38:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	xtel-3.3.0
@@ -17,6 +17,6 @@ FONTS_DIRS.x11=	${PREFIX}/lib/X11/fonts/xtel
 REQD_DIRS=	${PREFIX}/lib/X11/fonts/xtel
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index ade17caf7b4..a71027db33e 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:11 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	xsqlmenu-2.10
@@ -24,7 +24,7 @@ do-install:
 
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index f0e2cfa9384..727ee4a67f5 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/09/04 08:56:09 martti Exp $
+# $NetBSD: Makefile,v 1.73 2006/12/15 20:32:53 joerg Exp $
 #
 
 DISTNAME=	ddd-3.3.11
@@ -48,6 +48,6 @@ post-install:
 	${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd-paper.ps
 	${GZIP_CMD} ${PREFIX:Q}/share/doc/ddd/ddd.ps
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile
index c37259833be..4eef4244246 100644
--- a/devel/devIL/Makefile
+++ b/devel/devIL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:54 joerg Exp $
 #
 
 DISTNAME=	DevIL-1.6.6
@@ -23,5 +23,5 @@ CONFIGURE_ARGS+=	--disable-lcms
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk
index f47f3aeddbf..76eef3fbab8 100644
--- a/devel/devIL/buildlink3.mk
+++ b/devel/devIL/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:10:42 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/12/15 20:32:54 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DEVIL_BUILDLINK3_MK:=	${DEVIL_BUILDLINK3_MK}+
@@ -23,6 +23,6 @@ BUILDLINK_PKGSRCDIR.devIL?=	../../devel/devIL
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libdockapp/Makefile b/devel/libdockapp/Makefile
index 8b10f7501e5..d7fa3008181 100644
--- a/devel/libdockapp/Makefile
+++ b/devel/libdockapp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/19 19:14:38 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:32:54 joerg Exp $
 #
 
 DISTNAME=	libdockapp-0.4.0
@@ -18,5 +18,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdockapp
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libdockapp
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk
index 5ac959c836f..ee95f361e18 100644
--- a/devel/libdockapp/buildlink3.mk
+++ b/devel/libdockapp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:10:44 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:32:54 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDOCKAPP_BUILDLINK3_MK:=	${LIBDOCKAPP_BUILDLINK3_MK}+
@@ -17,6 +17,6 @@ BUILDLINK_ABI_DEPENDS.libdockapp+=	libdockapp>=0.4.0nb2
 BUILDLINK_PKGSRCDIR.libdockapp?=	../../devel/libdockapp
 .endif	# LIBDOCKAPP_BUILDLINK3_MK
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index b722b6af0c3..39e26c6c133 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/16 10:48:35 obache Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:54 joerg Exp $
 #
 
 DISTNAME=	libmatchbox-1.9
@@ -13,8 +13,8 @@ USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmatchbox/buildlink3.mk b/devel/libmatchbox/buildlink3.mk
index 3ad725bbb68..0827a3b8548 100644
--- a/devel/libmatchbox/buildlink3.mk
+++ b/devel/libmatchbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:45 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/15 20:32:54 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBMATCHBOX_BUILDLINK3_MK:=	${LIBMATCHBOX_BUILDLINK3_MK}+
@@ -17,8 +17,8 @@ BUILDLINK_ABI_DEPENDS.libmatchbox+=	libmatchbox>=1.7nb3
 BUILDLINK_PKGSRCDIR.libmatchbox?=	../../devel/libmatchbox
 .endif	# LIBMATCHBOX_BUILDLINK3_MK
 
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 7c04005d646..9ad243b9a2f 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/12/06 14:45:42 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	cooledit-3.17.17
 PKGREVISION=	2
@@ -23,7 +23,7 @@ post-configure:
 	fi
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile
index 2ca6a0e6656..811303e4d02 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/15 16:29:19 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:32:54 joerg Exp $
 #
 
 .include "../../editors/elvis/Makefile.common"
@@ -14,6 +14,6 @@ CONFIGURE_ARGS+=	--with-xft
 
 #MAKEFLAGS+=	CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}"
 
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 9a66faf02f2..b50f1c1b1af 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2006/07/02 10:03:14 rillig Exp $
+# $NetBSD: Makefile,v 1.98 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 PKGREVISION=	7
@@ -12,7 +12,7 @@ CONFLICTS+=	emacs-nox11-[0-9]*
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-xpm
 .include "../../graphics/jpeg/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-jpeg
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 2e124abac9b..0fbcbfc0f3d 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
@@ -84,7 +84,7 @@ do-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 9d8c20eb63a..c2239e8cf4f 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.55 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -28,7 +28,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 276f73c549b..c86324d7641 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/07/18 10:27:16 martti Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -31,7 +31,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 045b47d3e71..e843cf531e3 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.44 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -39,7 +39,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 5efb98bb563..cbce82d0b4e 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/04/17 13:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2006/12/15 20:32:54 joerg Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -14,5 +14,5 @@ PLIST_SUBST+=	X11ONLY=""
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index a2c358c807f..999bf9b718d 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/09/09 02:41:59 obache Exp $
+# $NetBSD: Makefile,v 1.53 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=		vile-9.5
 PKGNAME=		xvile-9.5
@@ -45,7 +45,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 50f89c2f491..57c25fd2c01 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/03/09 21:04:43 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/15 20:32:55 joerg Exp $
 #
 
 DISTNAME=		tuxnes-0.75
@@ -28,6 +28,6 @@ post-install:
 .endfor
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 85ad55d4c54..9993cf6b52b 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/10/14 02:13:04 rillig Exp $
+# $NetBSD: Makefile,v 1.70 2006/12/15 20:32:55 joerg Exp $
 #
 
 DISTNAME=		vice-1.19
@@ -57,6 +57,6 @@ post-patch:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/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/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index 4d0cd7ab6d0..0072454bb15 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:55 joerg Exp $
 #
 
 DISTNAME=		xcopilot-0.6.6
@@ -17,5 +17,5 @@ GNU_CONFIGURE=		YES
 post-extract:
 	${RM} -f ${WRKSRC}/mc68k/custom.c
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index 42bc037b42a..82ee1669840 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:06 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=		xinvest-2.6.9
 PKGREVISION=		2
@@ -12,7 +12,7 @@ COMMENT=		Personal finance tracking and performance tool
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 7d120862d57..6a425e8dcee 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=		xquote-2.6.10
 PKGREVISION=		2
@@ -15,7 +15,7 @@ NO_INSTALL_MANPAGES=	YES
 # needs a symbol that appeared after 4.9.1
 BUILDLINK_API_DEPENDS.Xbae+=        Xbae>=4.50
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/Xbae/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 37b01547910..65d5e541d9b 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=	libXft-2.1.7
 PKGNAME=	Xft2-2.1.7
@@ -29,5 +29,5 @@ BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.2
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk
index 4004f368c6a..9e072c839ab 100644
--- a/fonts/Xft2/buildlink3.mk
+++ b/fonts/Xft2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:32:55 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFT2_BUILDLINK3_MK:=	${XFT2_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.Xft2?=	../../fonts/Xft2
 .endif	# XFT2_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
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"
diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile
index 7487f2dbd80..74b67726179 100644
--- a/geography/mapserver/Makefile
+++ b/geography/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/11 11:05:54 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:57 joerg Exp $
 #
 
 DISTNAME=		mapserver-4.0
@@ -32,5 +32,5 @@ do-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index f55896cea58..d1605807701 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/05/21 13:23:31 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=		camlimages-2.2.0
 PKGREVISION=		4
@@ -37,10 +37,10 @@ PLIST_SUBST+=	COND_DLL="@comment "
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 7a9e96d68f2..3915571acb5 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=	fly-1.6.5
 PKGREVISION=	8
@@ -37,5 +37,5 @@ do-install:
 
 .include "../../graphics/freetype-lib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index f8af860ad7d..0dfdba84e53 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2006/10/12 14:02:09 drochner Exp $
+# $NetBSD: Makefile,v 1.150 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=	gimp-2.2.13
 PKGREVISION=	1
@@ -65,11 +65,11 @@ PLIST_SUBST+=		TWAIN="@comment "
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../print/gimp-print-lib/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index f78faad7c03..27413481875 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:32:57 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GIMP_BASE_BUILDLINK3_MK:=	${GIMP_BASE_BUILDLINK3_MK}+
@@ -21,8 +21,8 @@ BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../multimedia/mpeg-lib/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/gimp1-base/options.mk b/graphics/gimp1-base/options.mk
index caf63e00efe..8739dc8b13f 100644
--- a/graphics/gimp1-base/options.mk
+++ b/graphics/gimp1-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2006/12/15 20:32:57 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gimp-base
 PKG_SUPPORTED_OPTIONS=	gimp1-helpbrowser
@@ -13,6 +13,6 @@ PLIST_SUBST+=	HELPBROWSER="@comment "
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .endif
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 50a3cf953c8..7f83b727933 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/12/15 20:23:52 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=		gthumb-2.8.1
 CATEGORIES=		graphics
@@ -26,6 +26,7 @@ BUILDLINK_API_DEPENDS.libglade2+=   libglade2>=2.4.0
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
@@ -38,6 +39,5 @@ BUILDLINK_API_DEPENDS.libglade2+=   libglade2>=2.4.0
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index a7cef97d5e1..2c993d479d4 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/08/03 18:48:59 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:57 joerg Exp $
 #
 
 DISTNAME=	libgdiplus-1.1.13.6
@@ -23,14 +23,14 @@ BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 BUILDLINK_TRANSFORM+=		rm:-Werror
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index 4cd88593d0b..2cc195978c3 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/07/08 23:10:52 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/12/15 20:32:57 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGDIPLUS_BUILDLINK3_MK:=	${LIBGDIPLUS_BUILDLINK3_MK}+
@@ -18,13 +18,13 @@ BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 .endif	# LIBGDIPLUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index 87096f48840..430f1116e3e 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/03/04 21:29:51 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=		pixmap2.6
 PKGNAME=		pixmap-2.6.4
@@ -21,7 +21,7 @@ USE_IMAKE=		YES
 MAKE_ENV+=		LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 MAKE_ENV+=		MOTIFBASE=${MOTIFBASE:Q}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 2aef0f3c4a0..365cce5068d 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:29:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:32:57 joerg Exp $
 #
 
 DISTNAME=	wmphoto-0.3a
@@ -20,5 +20,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wmphoto
 	${INSTALL_DATA} ${WRKSRC}/HINTS ${PREFIX}/share/doc/wmphoto
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index 056daad658f..6698e2636ba 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/11/10 16:18:48 tv Exp $
+# $NetBSD: Makefile,v 1.43 2006/12/15 20:32:57 joerg Exp $
 #
 
 DISTNAME=	xart19980415
@@ -22,5 +22,5 @@ post-extract:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/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/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index b4458ad620e..f68cf5d423a 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/06/26 16:11:43 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=		xbmbrowser5.1
 PKGNAME=		xbmbrowser-5.1
@@ -12,5 +12,5 @@ COMMENT=		View complete directories of X bitmaps and X pixmaps
 USE_TOOLS+=		gmake
 USE_IMAKE=		YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index ae1b7772ba1..3d29ab18c11 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/11/16 02:28:58 markd Exp $
+# $NetBSD: Makefile,v 1.50 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=	xfig.3.2.5-alpha5.full
 PKGNAME=	xfig-3.2.5alpha5
@@ -52,7 +52,7 @@ post-install:
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index dc33f5e1d43..a6926649723 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/04/17 13:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/12/15 20:32:57 joerg Exp $
 
 DISTNAME=       xpaint-2.7.8.1
 PKGREVISION=	2
@@ -28,6 +28,6 @@ pre-configure:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/fcitx/Makefile b/inputmethod/fcitx/Makefile
index 3b225397e29..b8699de06b0 100644
--- a/inputmethod/fcitx/Makefile
+++ b/inputmethod/fcitx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/10/28 21:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/12/15 20:32:58 joerg Exp $
 #
 
 DISTNAME=		fcitx-3.1.1
@@ -17,6 +17,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-xft
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile
index 64fe96c5fa7..d8867a1afc0 100644
--- a/lang/pnetlib/Makefile
+++ b/lang/pnetlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/04/12 20:50:56 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:32:58 joerg Exp $
 #
 
 PKGREVISION=		3
@@ -11,6 +11,6 @@ CONFIGURE_ARGS+=	--with-x
 
 CONFLICTS=		pnetlib-nox11-[0-9]*
 
-#.include "../../fonts/Xft2/buildlink3.mk"
+#.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index 36320b10318..896421df027 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/12 14:14:13 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:32:58 joerg Exp $
 
 .include "../../lang/swi-prolog-lite/Makefile.common"
 
@@ -64,10 +64,10 @@ teardownx:
 
 
 .include "../../lang/swi-prolog-lite/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 #.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 705ee0d0b5a..bacde3054bc 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/15 20:32:58 joerg Exp $
 
 DISTNAME=	wmbiff-0.4.26
 PKGREVISION=	5
@@ -18,7 +18,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${EX_DIR}
 	${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${EX_DIR}
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 48d489fff65..4a324e22ba5 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/10/23 07:47:15 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2006/12/15 20:32:58 joerg Exp $
 
 DISTNAME=		xfmail-1.5.5
 PKGREVISION=		1
@@ -26,7 +26,7 @@ post-install:
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 96afb546747..67c19c3f8fd 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:59 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:32:58 joerg Exp $
 #
 
 DISTNAME=       xmailbox-2.5
@@ -21,5 +21,5 @@ post-install:
 	     5xmail1.xpm xmail1.xpm xnomail1.xpm \
 	     ${PREFIX}/share/xmailbox
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/abs/Makefile b/math/abs/Makefile
index baefbf68508..dae13f37793 100644
--- a/math/abs/Makefile
+++ b/math/abs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/10/04 21:47:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:58 joerg Exp $
 #
 
 DISTNAME=	abs-src-0.8
@@ -20,5 +20,5 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abs ${PREFIX}/bin
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 6f5b6a8f7be..a37aaf49dfe 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/07/21 05:35:39 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2006/12/15 20:32:58 joerg Exp $
 #
 
 DISTNAME=	grace-5.1.14
@@ -32,10 +32,10 @@ post-install:
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../math/fftw2/buildlink3.mk"
 .include "../../print/pdflib/buildlink3.mk"
 .include "../../x11/Xbae/buildlink3.mk"
 .include "../../x11/XmHTML/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/snns/Makefile b/math/snns/Makefile
index 3fb37369b26..09e682eed8f 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/02/05 23:10:04 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:32:58 joerg Exp $
 
 DISTNAME=	SNNSv4.2
 PKGNAME=	snns-4.2
@@ -32,5 +32,5 @@ post-install:
 		    ${PREFIX}/share/examples/snns; \
 		done
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index a8a8f73403c..6cb08e104c4 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/03/24 11:28:09 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:32:58 joerg Exp $
 
 DISTNAME=		xldlas-0.85
 PKGREVISION=		5
@@ -22,7 +22,7 @@ do-install:
 	${CP} -R ${WRKSRC}/help ${PREFIX}/share/xldlas
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile
index 6324e336419..2c624ec2e9e 100644
--- a/math/xmgr/Makefile
+++ b/math/xmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/07/21 05:27:21 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=		xmgr-4.1.2
 PKGREVISION=		4
@@ -28,7 +28,7 @@ REPLACE_PERL+=		auxiliary/fdf2fit
 USE_TOOLS+=		perl:run
 
 .include "../../devel/netcdf/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 674444ad91c..1c73bd53d46 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/07/25 22:20:58 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=		root_v5.10.00.source
 PKGNAME=		root-5.10
@@ -44,9 +44,9 @@ CONFIGURE_ARGS+=	--disable-xml
 post-extract:
 	${CP} ${FILESDIR}/Makefile.netbsd ${WRKSRC}/config
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index fe1b16adfc0..66e3150595d 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/03/04 21:30:13 jlam Exp $
+# $NetBSD: Makefile,v 1.49 2006/12/15 20:32:59 joerg Exp $
 #
 # Note: I have tried to update this package to 3.6.0, but there were
 # some undefined identifiers "DndDrop" and "DndRawData" in the
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--with-xawm=Xaw
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../lang/guile14/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/mowitz/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile
index c2d9e7e2be0..e9316cdda16 100644
--- a/misc/xtide/Makefile
+++ b/misc/xtide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/11/05 21:51:21 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=	xtide-2.8.3
 CATEGORIES=	misc x11
@@ -35,5 +35,5 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/${HARMONICS_FILE} ${PREFIX}/share/xtide
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 41ec702244f..a810372944e 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/09/25 13:23:22 tron Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	10
@@ -31,7 +31,7 @@ pre-configure:
 
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 8f4eb0d6b79..2542567b312 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/12/11 19:14:20 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		gnash-0.7.2
@@ -29,7 +29,6 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/gtkglext/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
@@ -37,6 +36,7 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/gst-plugins0.8/Makefile b/multimedia/gst-plugins0.8/Makefile
index a7b7ccffcb7..9437338d6a5 100644
--- a/multimedia/gst-plugins0.8/Makefile
+++ b/multimedia/gst-plugins0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/16 15:36:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/15 20:32:59 joerg Exp $
 #
 
 USE_LANGUAGES=		c c++
@@ -30,6 +30,6 @@ REPLACE_PERL+=		tools/gst-launch-ext-m.m
 REPLACE_PERL+=		tools/gst-visualise-m.m
 
 .include "../../devel/GConf2/schemas.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 1db3268165a..11e4f2d9fe7 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/04/22 09:22:12 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=	xawtv-3.95
@@ -41,10 +41,10 @@ CONFIGURE_ARGS+=	--enable-mmx
 .endif
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index b71fb77b876..3af490055ee 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		xine-ui-0.99.4
@@ -21,12 +21,12 @@ USE_GNU_READLINE=	yes
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile
index 8c4fe13c8e5..251628e5e90 100644
--- a/net/llnlxdir/Makefile
+++ b/net/llnlxdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		llnlxdir2_1_2
@@ -20,7 +20,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdir ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XDir.ad ${PREFIX}/lib/X11/app-defaults/XDir
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile
index ba35653a725..7d4bfe9975d 100644
--- a/net/llnlxftp/Makefile
+++ b/net/llnlxftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		llnlxftp2.1
@@ -20,7 +20,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xftp ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XFtp.ad ${PREFIX}/lib/X11/app-defaults/XFtp
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmget/Makefile b/net/wmget/Makefile
index 2ad5e619d40..af9be8992fb 100644
--- a/net/wmget/Makefile
+++ b/net/wmget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=	wmget-0.6.0-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -26,5 +26,5 @@ SUBST_SED.paths=	-e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|'
 USE_TOOLS+=	gmake
 
 .include "../../www/curl/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index d25c4996b49..5b10701a58f 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	wmnet-1.2
 PKGNAME=	wminet-1.2
@@ -14,5 +14,5 @@ NOT_FOR_PLATFORM=	Interix-*-* # no userland protocol stack support
 
 USE_X11BASE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index ef136c2aa7e..54edeae8d99 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=	wmpload-0.9.5
@@ -13,5 +13,5 @@ COMMENT=	PPP monitor for X11, totals and current in/out rates in 64x64 cube
 HAS_CONFIGURE=	YES
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index 27d1f9565ba..a7a3d211fa2 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -23,7 +23,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../CHANGES ${PREFIX}/share/doc/xmftp
 	${INSTALL_DATA} ${WRKSRC}/../FAQ ${PREFIX}/share/doc/xmftp
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 812e8e10932..197b0aaada3 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:53:19 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	4
@@ -19,7 +19,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/knews/Makefile b/news/knews/Makefile
index f7636861e96..21fa807c5e4 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	knews-1.0b.1
 PKGNAME=	knews-1.0
@@ -43,6 +43,6 @@ post-patch:
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mail/faces/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 8af6eaff0e1..3085659f8da 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/10/21 20:25:21 markd Exp $
+# $NetBSD: Makefile,v 1.22 2006/12/15 20:33:00 joerg Exp $
 #
 
 PKGNAME=		sge-6.0.8
@@ -142,7 +142,7 @@ do-install:
 #% scripts/distinst -local"
 
 .include "../../databases/db4/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index 4f731013873..ce9ed5e1836 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,19 +1,19 @@
-# $NetBSD: xfree.mk,v 1.14 2006/04/19 12:30:25 reed Exp $
+# $NetBSD: xfree.mk,v 1.15 2006/12/15 20:33:00 joerg Exp $
 
 FILES_LIST=	${FILESDIR}/xfree
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
 
 # Check if any headers and libraries for ${X11_MODULES} found in
 # ${X11BASE} actually belong to the base XFree86 or not.
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 56d8fb616ec..b0e87668d4a 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.3 2006/04/19 12:30:25 reed Exp $
+# $NetBSD: xorg.mk,v 1.4 2006/12/15 20:33:00 joerg Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -7,24 +7,24 @@ FILES_LIST=	${FILESDIR}/xorg
 # libXdamage and damageext only in pkgsrc-wip so not used here
 # XXX: what about xaw?
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/Xcomposite/buildlink3.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
 
 # XXX  what is ${X11_MODULES} ?
 
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 6ec58e1a587..a7d1e1a516d 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/08/10 03:21:40 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=		advi-1.6.0
 PKGREVISION=		4
@@ -57,10 +57,10 @@ post-install:
 .include "../../graphics/camlimages/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/lablgtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/ocaml-graphics/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index f7ff54d997a..73432bb25da 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/21 16:16:24 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -31,7 +31,7 @@ USE_LIBTOOL=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
 
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 8b1de78661b..2d4e314031e 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=		mgv-3.1.5
 PKGREVISION=		4
@@ -21,7 +21,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
 	${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 4ec1b0e648b..d3030e8c00c 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	transfig.3.2.5_alpha7
 PKGNAME=	transfig-3.2.5alpha7
@@ -27,6 +27,6 @@ USE_TOOLS+=		gmake
 MAKE_ENV+=		ICONVLIBS="${BUILDLINK_LDADD.iconv}"
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 308b57867e1..0d1f051c3df 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:00 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TRANSFIG_BUILDLINK3_MK:=	${TRANSFIG_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.transfig?=	../../print/transfig
 .endif	# TRANSFIG_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 20e14273ad8..3ca3afc846e 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/11/18 08:27:10 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=		asapm-2.11
@@ -22,5 +22,5 @@ CONFIGURE_ARGS+=	--with-xpm
 CONFIGURE_ARGS+=	--with-xpm-includes=${BUILDLINK_PREFIX.xpm}/include
 CONFIGURE_ARGS+=	--with-xpm-library=${BUILDLINK_PREFIX.xpm}/lib
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index b6d2b49aeb4..ff55ffd2399 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/10/15 12:32:57 obache Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=	idesk-0.7.5
@@ -25,8 +25,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/idesk
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idesk
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmSMPmon/Makefile b/sysutils/wmSMPmon/Makefile
index 10740068a42..b01de3bb39d 100644
--- a/sysutils/wmSMPmon/Makefile
+++ b/sysutils/wmSMPmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	wmSMPmon-2.3
 PKGREVISION=	1
@@ -15,5 +15,5 @@ WRKSRC=		${WRKDIR}/wmSMPmon-2.x/wmSMPmon
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/wmsmpmon.1 ${PREFIX}/man/man1/wmSMPmon.1
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index 53e4e10528e..83ba0c468e4 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmcpuload-1.0.1
@@ -13,5 +13,5 @@ COMMENT=	Dockable CPU monitor
 
 GNU_CONFIGURE= 	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 392c5247fc6..6494de08a3d 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmmemmon-1.0.1
@@ -12,5 +12,5 @@ COMMENT=	Dockapp to monitor memory and swap usages
 
 GNU_CONFIGURE= 	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index c05a940c34f..e73978849b6 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:10:57 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	xbatt-1.3pr1
@@ -25,5 +25,5 @@ post-install:
 		${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/xbatt
 		${INSTALL_MAN} ${WRKSRC}/README.jp ${PREFIX}/share/doc/xbatt
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xfm/Makefile b/sysutils/xfm/Makefile
index 4331c4589c4..3f3bc9b331c 100644
--- a/sysutils/xfm/Makefile
+++ b/sysutils/xfm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/01 22:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	xfm-1.4.3
 PKGREVISION=	2
@@ -14,7 +14,7 @@ BUILD_TARGET+=	all xfm.install.script Xfm.ad
 WRKSRC=		${WRKDIR}/xfm-1.4.3
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 2365a31c77c..2021c96674f 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	xosview-1.8.3
 CATEGORIES=	sysutils
@@ -35,5 +35,5 @@ CPPFLAGS+=	-I${X11BASE:Q}/include
 LIBS+=		-lsocket -lnsl
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index c747b2beed3..2e7588213fb 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
@@ -32,5 +32,5 @@ post-install:
 	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index bc65deb2093..3f32ea99491 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/11/12 02:22:44 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -75,5 +75,5 @@ do-install:
 .endfor
 	@${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index 239dccd5cb9..ecfbfaf3653 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	gnya
@@ -22,5 +22,5 @@ do-install:
 		${INSTALL_MAN} ${WRKSRC}/gnyaclock.man \
 			${PREFIX}/man/ja_JP.EUC/man1/gnyaclock.1
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index ac0621cfa51..9055c850b66 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:10 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -21,5 +21,5 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/pclock
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pclock
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index e850ebf63b8..8629f555d9b 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -26,5 +26,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmclockmon/Makefile b/time/wmclockmon/Makefile
index e78dbb7efff..80cfeece026 100644
--- a/time/wmclockmon/Makefile
+++ b/time/wmclockmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmclockmon-0.8.1
@@ -12,6 +12,6 @@ COMMENT=	Windowmaker dockapp for time/date
 
 GNU_CONFIGURE=	yes
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 5bdb768b8d2..eca1258a92d 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
@@ -22,5 +22,5 @@ MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 EXTRA_LOCAL_LIBS=       -lsocket
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmtime/Makefile b/time/wmtime/Makefile
index 0941877578b..05d5bb647f7 100644
--- a/time/wmtime/Makefile
+++ b/time/wmtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmtime-1.0b2
@@ -18,5 +18,5 @@ BUILD_DIRS=	${CONFIGURE_DIRS}
 post-extract:
 	${CP} ${WRKSRC}/Imakefile ${WRKSRC}/wmtime/Imakefile
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xbeats/Makefile b/time/xbeats/Makefile
index 25b026d117d..c2f510cb2f0 100644
--- a/time/xbeats/Makefile
+++ b/time/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	xbeats-0.4
@@ -12,5 +12,5 @@ COMMENT=	Beats clock dockable in both Window Maker and AfterStep
 
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/afterstep1/Makefile b/wm/afterstep1/Makefile
index 0a00fd9bf67..1e3eaebea68 100644
--- a/wm/afterstep1/Makefile
+++ b/wm/afterstep1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/12/12 13:59:15 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	AfterStep-1.8.11
 PKGNAME=	${DISTNAME:S/AfterStep/afterstep/}
@@ -41,5 +41,5 @@ pre-configure:
 .include "../../audio/rplay/buildlink3.mk"
 .include "../../graphics/jpeg/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/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 977cd253848..5af8aec49a8 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	bbrun-1.3
 PKGREVISION=	4
@@ -21,7 +21,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bbrun
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/bbrun
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile
index fef3ff499a0..b731f2c02cd 100644
--- a/wm/ctwm/Makefile
+++ b/wm/ctwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:11:12 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	ctwm-3.7
@@ -37,6 +37,6 @@ pre-install:
 	${INSTALL_DATA} ${WRKSRC}/${f} ${EXAMPLEDIR}
 .endfor
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/cwm/Makefile b/wm/cwm/Makefile
index 4f77fc9974d..c0acf0841d6 100644
--- a/wm/cwm/Makefile
+++ b/wm/cwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/11 13:05:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	cwm-3
@@ -13,5 +13,5 @@ COMMENT=	Window manager for X11 initially inspired by evilwm
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 082a0c12926..7dfd59a36f8 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/12/02 18:20:43 obache Exp $
+# $NetBSD: Makefile,v 1.37 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	e16-0.16.8.4
 PKGNAME=	${DISTNAME:S/e16/enlightenment/}
@@ -48,6 +48,6 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/options.mk b/wm/fluxbox/options.mk
index 8cf0631a741..6bb2f47b702 100644
--- a/wm/fluxbox/options.mk
+++ b/wm/fluxbox/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/10/24 17:23:33 tonio Exp $
+# $NetBSD: options.mk,v 1.4 2006/12/15 20:33:01 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fluxbox
 PKG_SUPPORTED_OPTIONS=	gnome kde imlib2 xft xrender
@@ -27,14 +27,14 @@ CONFIGURE_ARGS+=	--disable-imlib2
 
 .if !empty(PKG_OPTIONS:Mxft)
 CONFIGURE_ARGS+=        --enable-xft
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
 .if !empty(PKG_OPTIONS:Mxrender)
 CONFIGURE_ARGS+=	--enable-xrender
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xrender
 .endif
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
index 839f53d2dc7..83202e590ad 100644
--- a/wm/fvwm-devel/Makefile
+++ b/wm/fvwm-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/12/12 07:05:01 martti Exp $
+# $NetBSD: Makefile,v 1.19 2006/12/15 20:33:02 joerg Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -36,7 +36,7 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile
index 25ae5f75e09..9113e84c110 100644
--- a/wm/fvwm/Makefile
+++ b/wm/fvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/12/12 06:57:59 martti Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 #PKGREVISION=	1
@@ -77,5 +77,5 @@ CONFIGURE_ARGS+=	--without-gtk-prefix
 .endif
 
 .include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 2301b0e1320..4577c0c3c5e 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/03/04 21:30:54 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -47,5 +47,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample.golem/golemrc ${EGDIR}/golemrc.default
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index b99a917dff9..59da5ffe828 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/10/04 19:38:05 rillig Exp $
+# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:02 joerg Exp $
 
 COMMENT=		Small, fast and light-weight window manager
 
@@ -9,6 +9,6 @@ CONFIGURE_ARGS+=	--with-imlib=no
 CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.xpm}
 
 .include "Makefile.common"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 38312e04386..a4c3bc778ed 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.56 2006/11/28 15:26:18 rillig Exp $
+# $NetBSD: Makefile.common,v 1.57 2006/12/15 20:33:02 joerg Exp $
 
 DISTNAME=		icewm-1.2.27
 CATEGORIES=		x11 wm
@@ -64,5 +64,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${HTMLDIR}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index aa4bfff6021..6671df3d046 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/09/01 15:43:10 abs Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=		jwm-1.8rc1
@@ -32,7 +32,7 @@ CONF_FILES= 		${EGDIR}/system.jwmrc ${PKG_SYSCONFDIR}/system.jwmrc
 
 .include "options.mk"
 
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/matchbox-wm/Makefile b/wm/matchbox-wm/Makefile
index e1fdb0881f4..1f41e884b2c 100644
--- a/wm/matchbox-wm/Makefile
+++ b/wm/matchbox-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/10/16 10:55:50 obache Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=		matchbox-window-manager-1.1
@@ -25,6 +25,6 @@ post-install:
 		${PREFIX}/share/examples/matchbox/
 
 .include "../../devel/libmatchbox/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 28d1f00a0b3..ee24fe6ef0e 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2006/11/24 18:00:07 drochner Exp $
+# $NetBSD: Makefile,v 1.64 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	metacity-2.16.3
@@ -36,8 +36,8 @@ BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.7
 .include "../../devel/pango/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
-.include "../../x11/Xcomposite/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile
index a51f6ee54f9..5863d2a4be5 100644
--- a/wm/mlvwm/Makefile
+++ b/wm/mlvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/22 09:22:16 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	mlvwm091
@@ -31,5 +31,5 @@ SUBST_FILES.xpm=	sample_rc/Mlvwmrc
 SUBST_SED.xpm=		-e "s,@PREFIX@,${PREFIX},"
 SUBST_MESSAGE.xpm=	Fixing configuration file.
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile
index cd80598d5b4..0faac0f97f9 100644
--- a/wm/novawm/Makefile
+++ b/wm/novawm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/05/11 19:52:03 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	NovaWM-0.8_alpha
@@ -15,5 +15,5 @@ GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index cf564774bbd..69ea69b61f9 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:11:14 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	olvwm4.src4
@@ -16,6 +16,6 @@ DEPENDS+=	xview-clients>=3.2.1:../../x11/xview-clients
 WRKSRC=		${WRKDIR}
 USE_IMAKE=	yes
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xview-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 0df8d6660fe..01667b96cc9 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/09/10 10:23:25 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:02 joerg Exp $
 
 DISTNAME=	openbox-3.3.1
 CATEGORIES=	wm x11
@@ -30,8 +30,8 @@ CONF_FILES+=		${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 # disabled by default in 3.3 because "it doesn't seem to work well"
 #.include "../../x11/startup-notification/buildlink3.mk"
 
diff --git a/wm/openbox/buildlink3.mk b/wm/openbox/buildlink3.mk
index 3035fd0e251..478fbd7f604 100644
--- a/wm/openbox/buildlink3.mk
+++ b/wm/openbox/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/12/15 20:33:02 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENBOX_BUILDLINK3_MK:=	${OPENBOX_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.openbox?=	../../wm/openbox
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
index eb623411e74..06e18372537 100644
--- a/wm/openbox2/Makefile
+++ b/wm/openbox2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/05/11 19:43:02 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	openbox-2.2.3
@@ -18,6 +18,6 @@ GNU_CONFIGURE=	YES
 
 CPPFLAGS+=	-DHAVE_STRFTIME=1
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile
index cb7cbaf168f..a6a8d169d3d 100644
--- a/wm/oroborox/Makefile
+++ b/wm/oroborox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	OroboROX-0.9.8
@@ -80,9 +80,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR:Q}/oroborox ${PREFIX:Q}/bin
 
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/oroborus/Makefile b/wm/oroborus/Makefile
index f6be3a51362..d6b8fa21eec 100644
--- a/wm/oroborus/Makefile
+++ b/wm/oroborus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	oroborus_2.0.12-1
@@ -14,5 +14,5 @@ COMMENT=	Small and simple window manager for X
 WRKSRC=         ${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index a18364bee87..6bce4c6553b 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/10/14 08:24:24 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	pekwm-0.1.5
@@ -33,9 +33,9 @@ CONF_FILES=
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile
index 734828d882d..f3c932af369 100644
--- a/wm/piewm/Makefile
+++ b/wm/piewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:02 joerg Exp $
 
 DISTNAME=	piewm-1.02
 PKGREVISION=	2
@@ -11,6 +11,6 @@ COMMENT=	Minimalist window manager based on tvtwm with pie menus
 
 USE_IMAKE=	yes
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 39a82402a0b..b058e997057 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/07/22 04:46:19 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -22,5 +22,5 @@ post-install:
 .include "options.mk"
 .include "../../audio/esound/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile
index 764c6797d88..0297460911e 100644
--- a/wm/skippy/Makefile
+++ b/wm/skippy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 13:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	skippy-0.5.0
@@ -19,6 +19,6 @@ INSTALLATION_DIRS=	share/examples/${PKGBASE}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/skippyrc-default ${EGDIR}/skippyrc
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index 05342187574..197cb256b30 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:02 joerg Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
@@ -12,5 +12,5 @@ COMMENT=	Classic twm with virtual desktop support
 WRKSRC=		${WRKDIR}/tvtwm
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/vtwm/Makefile b/wm/vtwm/Makefile
index 873ee5e8ace..3a7fb220270 100644
--- a/wm/vtwm/Makefile
+++ b/wm/vtwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/05 23:11:15 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	vtwm-5.4.7
@@ -12,7 +12,7 @@ COMMENT=	TWM with virtual desktop, m4, sound and 3-D buttons
 
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../audio/rplay/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 3b35c0160cd..7bd3f6b77d2 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/10/04 22:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/15 20:33:02 joerg Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -35,7 +35,7 @@ REPLACE_PERL = \
 	data/scripts/procinfo.pl \
 	data/scripts/stylesdir.pl.in
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 9c9a692f644..4d2cb9e63f3 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/14 08:24:25 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	wampager-0.9.1
@@ -23,5 +23,5 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wampager ${PREFIX}/bin
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 1b5906f9435..49647524596 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	windowlab-1.33
@@ -24,5 +24,5 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${EGDIR}
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index ad08b466971..175dbc212dd 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2006/10/04 17:46:01 reed Exp $
+# $NetBSD: Makefile,v 1.72 2006/12/15 20:33:03 joerg Exp $
 
 DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
@@ -94,12 +94,12 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk
index f14f8107618..d7c24c774c3 100644
--- a/wm/windowmaker/buildlink3.mk
+++ b/wm/windowmaker/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/07/08 23:11:11 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2006/12/15 20:33:03 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 WINDOWMAKER_BUILDLINK3_MK:=	${WINDOWMAKER_BUILDLINK3_MK}+
@@ -17,12 +17,12 @@ BUILDLINK_ABI_DEPENDS.windowmaker+=	windowmaker>=0.92.0nb7
 BUILDLINK_PKGSRCDIR.windowmaker?=	../../wm/windowmaker
 .endif	# WINDOWMAKER_BUILDLINK3_MK
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/wm/wmi/Makefile b/wm/wmi/Makefile
index 98c4098a26b..56dd39f08c1 100644
--- a/wm/wmi/Makefile
+++ b/wm/wmi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	wmi-10
@@ -13,5 +13,5 @@ COMMENT=	Minimalist, flexible and highly customizable window manager
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index dfe21d8d3e6..e755b98e58a 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2006/03/04 21:30:55 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2006/12/15 20:33:03 joerg Exp $
 
 DISTNAME=	wmx-6
 WMX_VERS=	6.0
@@ -30,4 +30,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README.contrib ${PREFIX}/share/doc/wmx
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/wmx
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
diff --git a/wm/xfce4-wm/Makefile b/wm/xfce4-wm/Makefile
index 0488a199256..c1fe2fa206f 100644
--- a/wm/xfce4-wm/Makefile
+++ b/wm/xfce4-wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/04/17 13:46:13 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/12/15 20:33:03 joerg Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -11,7 +11,7 @@ CATEGORIES=	wm
 COMMENT=	Xfce window manager
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/xfce4-wm/buildlink3.mk b/wm/xfce4-wm/buildlink3.mk
index c116f60a3fc..b8dd18bda65 100644
--- a/wm/xfce4-wm/buildlink3.mk
+++ b/wm/xfce4-wm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/10/12 09:24:20 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:03 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_WM_BUILDLINK3_MK:=	${XFCE4_WM_BUILDLINK3_MK}+
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.xfce4-wm?=	../../wm/xfce4-wm
 .endif	# XFCE4_WM_BUILDLINK3_MK
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xfce4-mcs-plugins/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common
index 2a2f0dc790d..e649b2318ba 100644
--- a/www/firefox/Makefile.common
+++ b/www/firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2006/11/03 07:53:05 joerg Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/12/15 20:33:03 joerg Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		mozilla-${MOZ_DIST_VER}-source
@@ -182,7 +182,7 @@ CONFIGURE_ARGS+=	 --with-pthreads
 .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)
 CONFIGURE_ARGS+=	--enable-xft
 # pkgconfig defaults to a "build" dependency, which is what we want.
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .endif
 
 # Fix for firefox* packages.
diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile
index 77b5e1ddf09..85de9630557 100644
--- a/www/htmldoc-x11/Makefile
+++ b/www/htmldoc-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/04/17 14:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:03 joerg Exp $
 #
 
 .include "../../www/htmldoc/Makefile.common"
@@ -12,6 +12,6 @@ CONFLICTS=		htmldoc-[0-9]*
 CONFIGURE_ARGS+=	--with-gui --with-x
 
 .include "../../x11/fltk/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common
index 97b6c8be2bb..5841ac379d5 100644
--- a/www/seamonkey/Makefile.common
+++ b/www/seamonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/10/14 08:24:59 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2006/12/15 20:33:03 joerg Exp $
 
 MOZ_DIST_VER?=		${MOZ_VER}
 DISTNAME?=		seamonkey-${MOZ_DIST_VER}.source
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=	--enable-default-toolkit=gtk2 --disable-gnomevfs
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
 .endif
 
@@ -190,7 +190,7 @@ CONFIGURE_ARGS+=	--with-pthreads
 .if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)
 CONFIGURE_ARGS+=	--enable-xft
 # pkgconfig defaults to a "build" dependency, which is what we want.
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .endif
 
 # Fix for firefox* packages.
diff --git a/x11/Xaw-Xpm/Makefile b/x11/Xaw-Xpm/Makefile
index 869e4ffa5a4..b7024ee3468 100644
--- a/x11/Xaw-Xpm/Makefile
+++ b/x11/Xaw-Xpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=		Xaw-XPM-1.1
@@ -27,5 +27,5 @@ post-install:
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	cd ${PREFIX} && ${LS} lib/libXaw3d* >> ${PLIST_SRC}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw-Xpm/buildlink3.mk b/x11/Xaw-Xpm/buildlink3.mk
index 32f8b175535..ba3fdfdcbda 100644
--- a/x11/Xaw-Xpm/buildlink3.mk
+++ b/x11/Xaw-Xpm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XAW_XPM_BUILDLINK3_MK:=	${XAW_XPM_BUILDLINK3_MK}+
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.Xaw-Xpm?=	../../x11/Xaw-Xpm
 .endif	# XAW_XPM_BUILDLINK3_MK
 
 .include "../../mk/bsd.fast.prefs.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 LIBXAW?=	-L${BUILDLINK_PREFIX.Xaw-Xpm}/lib			\
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.Xaw-Xpm}/lib	\
diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 26192e98962..246dc8621fc 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	Xaw3d-1.5E
@@ -42,5 +42,5 @@ post-install:
 .endif
 	cd ${DESTDIR}${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile
index 6e6bd8a57f2..f6780c9f0b7 100644
--- a/x11/Xcomposite/Makefile
+++ b/x11/Xcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/10/10 19:34:48 reed Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=		libXcomposite-1.0.1
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=	xcomposite.pc.in
 
-.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk
index 21a082b916a..218cdfa0735 100644
--- a/x11/Xcomposite/buildlink3.mk
+++ b/x11/Xcomposite/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -23,7 +23,7 @@ BUILDLINK_ABI_DEPENDS.Xcomposite?=	Xcomposite>=1.0.1nb2
 BUILDLINK_PKGSRCDIR.Xcomposite?=	../../x11/Xcomposite
 .endif	# XCOMPOSITE_BUILDLINK3_MK
 
-.include "../../x11/Xfixes/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
 
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 153092f2fe6..c2c4ec985f9 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/04/17 13:46:00 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -24,7 +24,7 @@ do-install:
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index e3d55cfd289..df92bd0fd35 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:03 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XMHTML_BUILDLINK3_MK:=	${XMHTML_BUILDLINK3_MK}+
@@ -19,6 +19,6 @@ BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index ef0bee5de73..18db550744b 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=		libXrandr-1.0.2
@@ -25,7 +25,7 @@ PKGCONFIG_OVERRIDE+=    xrandr.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk
index 22637c0aab6..56950746f01 100644
--- a/x11/Xrandr-mixedcase/buildlink3.mk
+++ b/x11/Xrandr-mixedcase/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2006/12/12 21:52:37 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2006/12/15 20:33:03 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -19,7 +19,7 @@ BUILDLINK_ABI_DEPENDS.Xrandr+=	Xrandr>=1.0.2nb3
 BUILDLINK_PKGSRCDIR.Xrandr?=	../../x11/Xrandr
 .endif	# XRANDR_BUILDLINK3_MK
 
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 04d749f7cae..7471cc741f8 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/12/11 12:23:24 sketch Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	aterm-1.0.0
@@ -45,6 +45,6 @@ SPECIAL_PERMS=		${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS}
 
 .include "../../graphics/jpeg/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/x11/dfm/Makefile.common b/x11/dfm/Makefile.common
index 7e0f4417dea..42ee549c4b0 100644
--- a/x11/dfm/Makefile.common
+++ b/x11/dfm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/06/01 18:03:28 jlam Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	dfm-0.99.9
@@ -11,7 +11,7 @@ CONFIGURE_ARGS+= 	--enable-imlib-icons
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/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/x11/efltk/Makefile b/x11/efltk/Makefile
index 115a4f5e6e0..21218b0bf99 100644
--- a/x11/efltk/Makefile
+++ b/x11/efltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/07/22 04:46:19 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	efltk-2.0.5
@@ -27,9 +27,9 @@ CONFIGURE_ARGS+=	--disable-shared
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk
index 2d57d4b0455..18c79453447 100644
--- a/x11/efltk/buildlink3.mk
+++ b/x11/efltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EFLTK_BUILDLINK3_MK:=	${EFLTK_BUILDLINK3_MK}+
@@ -18,8 +18,8 @@ BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 .endif	# EFLTK_BUILDLINK3_MK
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index cadbc87ab0d..6f52fc6affa 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/05/11 16:57:24 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	fbdesk-1.2.1
@@ -21,5 +21,5 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index b4f6f952e8c..174cabb5b70 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:03 joerg Exp $
 #
 
 DISTNAME=	fspanel-0.8beta1
@@ -23,6 +23,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fspanel ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fspanel/
 
-.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile
index bcab29bc4ac..ab31ce87396 100644
--- a/x11/fvwm-wharf/Makefile
+++ b/x11/fvwm-wharf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:32 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:03 joerg Exp $
 
 DISTNAME=		AfterStep-1.0
 PKGNAME=		fvwm-wharf-1.0
@@ -21,5 +21,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf
 	${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/man/man1/Fvwm-Wharf.1
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index f5dfd9e6761..48e5b352917 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=		gdkxft-1.5
@@ -30,9 +30,9 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/control-center/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 92c192f2462..8c14b9d57df 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2006/04/22 09:22:17 rillig Exp $
+# $NetBSD: Makefile,v 1.120 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=		gnome-libs-1.4.2
 PKGREVISION=		6
@@ -40,9 +40,9 @@ SUBST_SED.varbase=	-e 's,@VARBASE@,${VARBASE},g'
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
 CONFIGURE_ENV.db-${BDB_TYPE}?=	ac_cv_func_dbopen=no
diff --git a/x11/gnome-libs/buildlink3.mk b/x11/gnome-libs/buildlink3.mk
index 35ee4e422d9..b18e04908a2 100644
--- a/x11/gnome-libs/buildlink3.mk
+++ b/x11/gnome-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2006/07/08 23:11:13 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_LIBS_BUILDLINK3_MK:=	${GNOME_LIBS_BUILDLINK3_MK}+
@@ -20,9 +20,9 @@ BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index e8c3242001c..7f99c5f95b6 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2006/11/24 18:31:25 drochner Exp $
+# $NetBSD: Makefile,v 1.73 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=	control-center-2.16.2
@@ -63,7 +63,6 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
@@ -81,8 +80,9 @@ BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libxklavier/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 16838a69216..4443b1705c1 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/09/16 12:20:32 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -24,7 +24,6 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
@@ -32,6 +31,7 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 7d48faa7be0..e3372f17bff 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/10/13 18:27:19 drochner Exp $
+# $NetBSD: Makefile,v 1.61 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=		gnome-terminal-2.16.1
@@ -28,11 +28,11 @@ BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.8
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libzvt/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/vte/buildlink3.mk"
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 92cdee431db..484781fcc7e 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/09/16 18:10:31 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=	gnustep-back-0.11.0
 CATEGORIES=	x11 gnustep
@@ -17,10 +17,10 @@ MAKE_FILE=	GNUmakefile
 pre-install:
 	${INSTALL_DATA_DIR} ${GNUSTEP_SYSTEM_ROOT}/Library/Fonts
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gnustep-gui/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnustep-back/buildlink3.mk b/x11/gnustep-back/buildlink3.mk
index 1beedaf7bb1..724e175c34c 100644
--- a/x11/gnustep-back/buildlink3.mk
+++ b/x11/gnustep-back/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNUSTEP_BACK_BUILDLINK3_MK:=	${GNUSTEP_BACK_BUILDLINK3_MK}+
@@ -17,10 +17,10 @@ BUILDLINK_ABI_DEPENDS.gnustep-back+=	gnustep-back>=0.10.3nb1
 BUILDLINK_PKGSRCDIR.gnustep-back?=	../../x11/gnustep-back
 .endif	# GNUSTEP_BACK_BUILDLINK3_MK
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../x11/gnustep-gui/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 6238f7db388..498dd49d5f5 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2006/10/12 10:35:55 markd Exp $
+# $NetBSD: Makefile,v 1.120 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -206,8 +206,8 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
 .if !empty(PKG_OPTIONS:Msasl)
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
-.include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 92bb53836b9..3ab4f8b2049 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -37,8 +37,8 @@ BUILDLINK_API_DEPENDS.Xrandr+=      Xrandr>=1.0
 .if !empty(PKG_BUILD_OPTIONS.kdebase:Msasl)
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
-.include "../../x11/Xrandr/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/kterm/Makefile b/x11/kterm/Makefile
index 73b2f4043e9..762d9450196 100644
--- a/x11/kterm/Makefile
+++ b/x11/kterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=	kterm-6.2.0
 PKGREVISION=	10
@@ -30,7 +30,7 @@ PATCHFILES+=	KTerm-BGP-Imlib-1.0.patch.gz
 .  elif ${KTERM_USE_WALLPAPER} == "YES"
 SITES.KTerm-BGP-1.0.patch.gz=	http://delegate.uec.ac.jp:8081/club/mma/%7Etakkun/fun/handling/
 PATCHFILES+=	KTerm-BGP-1.0.patch.gz
-.    include "../../graphics/xpm/buildlink3.mk"
+.    include "../../x11/libXpm/buildlink3.mk"
 .  endif
 .endif
 
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index f3aa22f4c74..857636242b5 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2006/07/29 14:32:12 adam Exp $
+# $NetBSD: Makefile,v 1.91 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=	lesstif-0.95.0
 CATEGORIES=	x11
@@ -64,5 +64,5 @@ post-patch:
 	done
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/lesstif/buildlink3.mk b/x11/lesstif/buildlink3.mk
index cb01690a3cf..057ba494113 100644
--- a/x11/lesstif/buildlink3.mk
+++ b/x11/lesstif/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LESSTIF_BUILDLINK3_MK:=	${LESSTIF_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.lesstif?=	../../x11/lesstif
 .endif	# LESSTIF_BUILDLINK3_MK
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/matchbox-panel/Makefile b/x11/matchbox-panel/Makefile
index e7c99d6c14a..bf966cd18ea 100644
--- a/x11/matchbox-panel/Makefile
+++ b/x11/matchbox-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/08/06 05:20:40 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=		matchbox-panel-0.9.2
@@ -31,8 +31,8 @@ PLIST_SUBST+=	COND_APM=""
 .endif
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../devel/libmatchbox/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index b1475be864b..60c81f33a13 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:10 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:04 joerg Exp $
 
 DISTNAME=	Mowitz-0.2.2
 PKGREVISION=	2
@@ -24,6 +24,6 @@ CONFIGURE_ARGS+=--with-xawm=neXtaw
 CONFIGURE_ARGS+=--with-xawm=Xaw
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/mowitz/buildlink3.mk b/x11/mowitz/buildlink3.mk
index b9223e4fa43..09b790c794f 100644
--- a/x11/mowitz/buildlink3.mk
+++ b/x11/mowitz/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MOWITZ_BUILDLINK3_MK:=	${MOWITZ_BUILDLINK3_MK}+
@@ -17,6 +17,6 @@ BUILDLINK_ABI_DEPENDS.Mowitz+=	Mowitz>=0.2.2nb2
 BUILDLINK_PKGSRCDIR.Mowitz?=	../../x11/mowitz
 .endif	# MOWITZ_BUILDLINK3_MK
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile
index e35870735cc..156e722999f 100644
--- a/x11/mrxvt/Makefile
+++ b/x11/mrxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 13:47:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=	mrxvt-0.4.1
@@ -31,6 +31,6 @@ SPECIAL_PERMS=	${PREFIX}/bin/mrxvt ${SETUID_ROOT_PERMS}
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index e944438439b..9d411909d05 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/03/04 21:31:10 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/15 20:33:04 joerg Exp $
 #
 
 DISTNAME=	multi-aterm-0.0.4
@@ -23,5 +23,5 @@ CONFIGURE_ARGS+=	--with-xpm=${BUILDLINK_PREFIX.xpm}
 
 .include "options.mk"
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 4323e7ecd02..a4c9b2fcb12 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:04 joerg Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
 PKGREVISION=	9
@@ -23,11 +23,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/buildlink3.mk b/x11/qt2-libs/buildlink3.mk
index 601a85ccc58..9a12a079f39 100644
--- a/x11/qt2-libs/buildlink3.mk
+++ b/x11/qt2-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:11:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT2_LIBS_BUILDLINK3_MK:=	${QT2_LIBS_BUILDLINK3_MK}+
@@ -20,12 +20,12 @@ BUILDLINK_LIBDIRS.qt2-libs=	qt2/lib
 .endif	# QT2_LIBS_BUILDLINK3_MK
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 
 QTDIR=		${BUILDLINK_PREFIX.qt2-libs}/qt2
 CONFIGURE_ENV+=	QTDIR=${QTDIR:Q}
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 85395d534bf..9177d18663e 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/10/23 14:54:11 adam Exp $
+# $NetBSD: Makefile,v 1.58 2006/12/15 20:33:04 joerg Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
 MAINTAINER=	adam@NetBSD.org
@@ -55,15 +55,15 @@ SUBST_SED.socklen=	-e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk
index 9d435044d12..c7591ef231b 100644
--- a/x11/qt3-libs/buildlink3.mk
+++ b/x11/qt3-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2006/07/26 13:30:24 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT3_LIBS_BUILDLINK3_MK:=	${QT3_LIBS_BUILDLINK3_MK}+
@@ -26,15 +26,15 @@ BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
 PTHREAD_OPTS+=	require
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 CONFIGURE_ENV+=		MOC="${QTDIR}/bin/moc"
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 5c81daf4761..fc1e27eab52 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/07/17 15:30:16 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2006/12/15 20:33:04 joerg Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -56,14 +56,14 @@ SUBST_FILES.socklen=	mkspecs/darwin-g++/qplatformdefs.h
 SUBST_SED.socklen=	-e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
 .endif
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index 499eb4a0795..f5401f1178d 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:16 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2006/12/15 20:33:04 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -25,14 +25,14 @@ BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
 
 PTHREAD_OPTS+=	require
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if !defined(BUILD_QT4)
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 93b5c4a353c..d2011803c30 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/12/15 16:01:16 martin Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=		rxvt-unicode-8.1
@@ -27,6 +27,6 @@ post-install:
 
 .include "options.mk"
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rxvt-unicode/options.mk b/x11/rxvt-unicode/options.mk
index ffb44146998..bc99f33980d 100644
--- a/x11/rxvt-unicode/options.mk
+++ b/x11/rxvt-unicode/options.mk
@@ -1,5 +1,5 @@
 #
-# $Id: options.mk,v 1.2 2006/12/15 16:01:16 martin Exp $
+# $Id: options.mk,v 1.3 2006/12/15 20:33:05 joerg Exp $
 #
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.rxvt-unicode
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-unicode3
 
 .if !empty(PKG_OPTIONS:Mxft2)
 CONFIGURE_ARGS+=	--enable-xft
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-xft
 .endif
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index ac1c1d73d51..d3da340d5e1 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/02/05 23:11:43 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=		rxvt-2.7.10
 PKGREVISION=		5
@@ -65,5 +65,5 @@ pre-install:
 		${INSTALL_DATA} ${FILESDIR}/Rxvt ${PREFIX}/lib/X11/app-defaults; \
 	fi
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/speyes/Makefile b/x11/speyes/Makefile
index a88c6329ea2..4ff866e9820 100644
--- a/x11/speyes/Makefile
+++ b/x11/speyes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:31:11 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=	speyes-1.2.0
 PKGREVISION=	1
@@ -11,5 +11,5 @@ COMMENT=	South Park XEyes clone
 
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 92d4c0a5fd3..09f0906abc2 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/11/13 21:02:53 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=	vte-0.14.1
@@ -29,7 +29,7 @@ BUILDLINK_API_DEPENDS.fontconfig+=	fontconfig>=2.1.93
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/wmavgload/Makefile b/x11/wmavgload/Makefile
index 9b8016aea45..1868be2e2a2 100644
--- a/x11/wmavgload/Makefile
+++ b/x11/wmavgload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/05/30 19:49:24 reed Exp $
+# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=	wmavgload-0.7.0
 PKGREVISION=	1
@@ -12,5 +12,5 @@ USE_IMAKE=      	YES
 
 NO_INSTALL_MANPAGES=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 60cc53ddfa8..bb30d247a94 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:31:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=	wmfire-0.0.3.9pre4
@@ -20,5 +20,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index bba1a45b51e..53b03a272a9 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/09/03 00:56:30 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=	wmfstatus-0.4
 PKGREVISION=	1
@@ -19,5 +19,5 @@ do-install:
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README \
 		${WRKDIR}/${DISTNAME}/HINTS ${PREFIX}/share/doc/wmfstatus
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index e5fc29e4887..98c27cbc185 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/11/19 11:50:26 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=	wmweather-2.4.2
@@ -23,7 +23,7 @@ CONF_FILES+=	${EGDIR}/wmweather.conf ${PKG_SYSCONFDIR}/wmweather.conf
 
 LDFLAGS.SunOS+=	-lsocket
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 5e2f9024329..ea04d7a14ed 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:11:45 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=		XBanner1.31
 PKGNAME=		xbanner-1.31
@@ -31,5 +31,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad			\
 		${PREFIX}/lib/X11/app-defaults/XBanner
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile
index d20c0b2fc2a..98881f2c1f3 100644
--- a/x11/xcompmgr/Makefile
+++ b/x11/xcompmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/18 19:46:17 reed Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=	xcompmgr-1.1.1
@@ -20,7 +20,7 @@ GNU_CONFIGURE=	yes
 PKG_SKIP_REASON+=	"This package is exclusively for X.org."
 .endif
 
-.include "../../x11/Xcomposite/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index 50217c9cd24..1c092c4e89a 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:04 reed Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=		libXcursor-1.1.2
@@ -25,6 +25,6 @@ PKGCONFIG_OVERRIDE+=    xcursor.pc.in
 
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 
-.include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk
index 26541bc96a5..3c621417abc 100644
--- a/x11/xcursor/buildlink3.mk
+++ b/x11/xcursor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2006/12/12 21:52:38 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:05 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -19,9 +19,7 @@ BUILDLINK_ABI_DEPENDS.xcursor+=	xcursor>=1.1.2nb1
 BUILDLINK_PKGSRCDIR.xcursor?=	../../x11/xcursor
 .endif	# XCURSOR_BUILDLINK3_MK
 
-# Xfixes/buildlink3.mk is included by xcursor/builtin.mk
-#.include "../../x11/Xfixes/buildlink3.mk"
-
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile
index 522947caea3..14bfd4a400c 100644
--- a/x11/xcursorgen/Makefile
+++ b/x11/xcursorgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=	xcursorgen-4.3.0
 PKGREVISION=	4
@@ -20,6 +20,6 @@ LIBPNG=		-L${BUILDLINK_PREFIX.png}/lib				\
 MAKE_FLAGS+=	LIBPNGLIB=${LIBPNG:Q}
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index 61f069d1dcd..3b3569e62a8 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:05 joerg Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		8
@@ -38,8 +38,8 @@ CONFIGURE_ARGS+=	--disable-audiofile
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 4957434eb9c..96e43abb1f1 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/10/18 21:36:03 rillig Exp $
+# $NetBSD: Makefile,v 1.58 2006/12/15 20:33:05 joerg Exp $
 #
 
 DISTNAME=	xforms-1.0-release
@@ -21,6 +21,6 @@ SCRIPTS_ENV=	DEPEND_DEFINES="${CPPFLAGS}"
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk
index 587ebba6651..df263f2a44e 100644
--- a/x11/xforms/buildlink3.mk
+++ b/x11/xforms/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:05 joerg Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 XFORMS_BUILDLINK3_MK:=	${XFORMS_BUILDLINK3_MK}+
@@ -19,6 +19,6 @@ BUILDLINK_PKGSRCDIR.xforms?=	../../x11/xforms
 
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xkbd/Makefile b/x11/xkbd/Makefile
index 57d3e1d6805..59b1667a35d 100644
--- a/x11/xkbd/Makefile
+++ b/x11/xkbd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:06 joerg Exp $
 #
 
 DISTNAME=	xkbd-0.8.5
@@ -14,5 +14,5 @@ CONFIGURE_ARGS+=--enable-xpm
 
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 9b264431ea4..5f324ece9e7 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:47 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/12/15 20:33:06 joerg Exp $
 #
 
 DISTNAME=	xlupe-1.1
@@ -12,5 +12,5 @@ COMMENT=	Magnifier for X
 
 USE_IMAKE=	yes
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 983a107e914..367dbf53dcc 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/09 12:52:36 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:06 joerg Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-clients-${XORG_VER}
@@ -66,10 +66,10 @@ post-configure:
 
 .include "../../meta-pkgs/xorg/Makefile.common"
 
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xorg-server/Makefile b/x11/xorg-server/Makefile
index 4198244fe75..8c3b3943db8 100644
--- a/x11/xorg-server/Makefile
+++ b/x11/xorg-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/11/06 12:18:09 dsainty Exp $
+# $NetBSD: Makefile,v 1.49 2006/12/15 20:33:06 joerg Exp $
 
 DISTNAME=	${DISTFILES}
 PKGNAME=	xorg-server-${XORG_VER}
@@ -87,6 +87,6 @@ post-install:
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../meta-pkgs/xorg/Makefile.common"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpenguins/Makefile b/x11/xpenguins/Makefile
index 637108eead4..1c85547c3db 100644
--- a/x11/xpenguins/Makefile
+++ b/x11/xpenguins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:31:13 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:06 joerg Exp $
 #
 
 DISTNAME=	xpenguins-2.2
@@ -12,5 +12,5 @@ COMMENT=	Little penguins walking along the tops of your windows
 
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpmroot/Makefile b/x11/xpmroot/Makefile
index d458ee023c5..37920b73787 100644
--- a/x11/xpmroot/Makefile
+++ b/x11/xpmroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/12/12 06:48:56 martti Exp $
+# $NetBSD: Makefile,v 1.52 2006/12/15 20:33:06 joerg Exp $
 #
 
 DISTNAME=	fvwm-${PKG_VERSION}
@@ -32,5 +32,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC:Q}/utils/xpmroot.1 \
 		${PREFIX:Q}/${PKGMANDIR:Q}/man1
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index 43573251e21..fb6b3ba1da0 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.92 2006/08/10 14:54:13 reed Exp $
+# $NetBSD: Makefile.common,v 1.93 2006/12/15 20:33:06 joerg Exp $
 #
 
 # When updating the package, and screensavers are removed,
@@ -68,6 +68,6 @@ GCC_REQD+=		2.95.3
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/gle/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
 
 .include "../../mk/x11.buildlink3.mk"
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index e4658b34df2..d5584143fcc 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/09/10 19:57:28 schwarz Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:06 joerg Exp $
 
 DISTNAME=	xsnow-1.42
 PKGREVISION=	2
@@ -19,5 +19,5 @@ USE_IMAKE=	yes
 IMAKEOPTS+=     -DExtraLibraries=${BUILDLINK_LDADD.libnbcompat:Q}
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xteddy/Makefile b/x11/xteddy/Makefile
index 36c89c4aee4..b6bbbd80ee5 100644
--- a/x11/xteddy/Makefile
+++ b/x11/xteddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/10/04 22:06:57 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:06 joerg Exp $
 
 DISTNAME=	xteddy-1.1
 PKGREVISION=	1
@@ -15,5 +15,5 @@ pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy
 	${INSTALL_DATA_DIR} ${PREFIX}/share/xteddy/pixmaps
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xterm/options.mk b/x11/xterm/options.mk
index 9a20bf9a74f..121eaf4effc 100644
--- a/x11/xterm/options.mk
+++ b/x11/xterm/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/01/31 11:44:53 joerg Exp $
+# $NetBSD: options.mk,v 1.4 2006/12/15 20:33:06 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.xterm
 PKG_SUPPORTED_OPTIONS=	xterm-luit freetype
@@ -23,6 +23,6 @@ CONFIGURE_ARGS+= --enable-luit
 .if !empty(PKG_OPTIONS:Mfreetype)
 CONFIGURE_ARGS+= --enable-freetype
 
-.include "../../fonts/Xft2/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .endif