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

11 files changed, 22 insertions, 22 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"