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

67 files changed, 152 insertions, 154 deletions

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