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, 10 insertions, 10 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index 6ec58e1a587..a7d1e1a516d 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/08/10 03:21:40 minskim Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=		advi-1.6.0
 PKGREVISION=		4
@@ -57,10 +57,10 @@ post-install:
 .include "../../graphics/camlimages/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/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index f7ff54d997a..73432bb25da 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/09/21 16:16:24 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -31,7 +31,7 @@ USE_LIBTOOL=		yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
 
diff --git a/print/mgv/Makefile b/print/mgv/Makefile
index 8b1de78661b..2d4e314031e 100644
--- a/print/mgv/Makefile
+++ b/print/mgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/04 21:30:31 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=		mgv-3.1.5
 PKGREVISION=		4
@@ -21,7 +21,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html
 	${LN} -fs ${PREFIX}/share/mgv/3.1.5/help ${PREFIX}/share/doc/html/mgv
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 4ec1b0e648b..d3030e8c00c 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/04/17 13:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	transfig.3.2.5_alpha7
 PKGNAME=	transfig-3.2.5alpha7
@@ -27,6 +27,6 @@ USE_TOOLS+=		gmake
 MAKE_ENV+=		ICONVLIBS="${BUILDLINK_LDADD.iconv}"
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/transfig/buildlink3.mk b/print/transfig/buildlink3.mk
index 308b57867e1..0d1f051c3df 100644
--- a/print/transfig/buildlink3.mk
+++ b/print/transfig/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/12/15 20:33:00 joerg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 TRANSFIG_BUILDLINK3_MK:=	${TRANSFIG_BUILDLINK3_MK}+
@@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.transfig?=	../../print/transfig
 .endif	# TRANSFIG_BUILDLINK3_MK
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}