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

9 files changed, 19 insertions, 19 deletions

diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 7c04005d646..9ad243b9a2f 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/12/06 14:45:42 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	cooledit-3.17.17
 PKGREVISION=	2
@@ -23,7 +23,7 @@ post-configure:
 	fi
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/elvis-x11/Makefile b/editors/elvis-x11/Makefile
index 2ca6a0e6656..811303e4d02 100644
--- a/editors/elvis-x11/Makefile
+++ b/editors/elvis-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/05/15 16:29:19 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:32:54 joerg Exp $
 #
 
 .include "../../editors/elvis/Makefile.common"
@@ -14,6 +14,6 @@ CONFIGURE_ARGS+=	--with-xft
 
 #MAKEFLAGS+=	CC="${CC} -I${LOCALBASE}/include/freetype2 ${CFLAGS}"
 
-.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/editors/emacs/Makefile b/editors/emacs/Makefile
index 9a66faf02f2..b50f1c1b1af 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2006/07/02 10:03:14 rillig Exp $
+# $NetBSD: Makefile,v 1.98 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	emacs-${EMACSVERSION}a
 PKGREVISION=	7
@@ -12,7 +12,7 @@ CONFLICTS+=	emacs-nox11-[0-9]*
 CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC:Q}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-xpm
 .include "../../graphics/jpeg/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-jpeg
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 2e124abac9b..0fbcbfc0f3d 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2006/12/15 20:32:54 joerg Exp $
 
 DISTNAME=	ted-2.16.src
 PKGNAME=	ted-2.16
@@ -84,7 +84,7 @@ do-install:
 .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 "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-gtk/Makefile b/editors/vim-gtk/Makefile
index 9d8c20eb63a..c2239e8cf4f 100644
--- a/editors/vim-gtk/Makefile
+++ b/editors/vim-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.55 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-gtk-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -28,7 +28,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile
index 276f73c549b..c86324d7641 100644
--- a/editors/vim-motif/Makefile
+++ b/editors/vim-motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/07/18 10:27:16 martti Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -31,7 +31,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/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/editors/vim-xaw/Makefile b/editors/vim-xaw/Makefile
index 045b47d3e71..e843cf531e3 100644
--- a/editors/vim-xaw/Makefile
+++ b/editors/vim-xaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/03/02 10:41:41 martti Exp $
+# $NetBSD: Makefile,v 1.44 2006/12/15 20:32:54 joerg Exp $
 
 PKGNAME=		vim-xaw-${VIM_VERSION}.${VIM_PATCHLEVEL}
 #PKGREVISION=		1
@@ -39,7 +39,7 @@ post-install:
 .endfor
 
 .include "../../devel/ncurses/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/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 5efb98bb563..cbce82d0b4e 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2006/04/17 13:46:23 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2006/12/15 20:32:54 joerg Exp $
 
 .include "../../editors/xemacs/Makefile.common"
 
@@ -14,5 +14,5 @@ PLIST_SUBST+=	X11ONLY=""
 .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 "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index a2c358c807f..999bf9b718d 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/09/09 02:41:59 obache Exp $
+# $NetBSD: Makefile,v 1.53 2006/12/15 20:32:55 joerg Exp $
 
 DISTNAME=		vile-9.5
 PKGNAME=		xvile-9.5
@@ -45,7 +45,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
 	done
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"