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

14 files changed, 31 insertions, 31 deletions

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"