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

8 files changed, 16 insertions, 16 deletions

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"