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

5 files changed, 12 insertions, 12 deletions

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"