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

7 files changed, 14 insertions, 14 deletions

diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile
index 8c4fe13c8e5..251628e5e90 100644
--- a/net/llnlxdir/Makefile
+++ b/net/llnlxdir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/10/14 08:07:06 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		llnlxdir2_1_2
@@ -20,7 +20,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdir ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XDir.ad ${PREFIX}/lib/X11/app-defaults/XDir
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile
index ba35653a725..7d4bfe9975d 100644
--- a/net/llnlxftp/Makefile
+++ b/net/llnlxftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:32:59 joerg Exp $
 #
 
 DISTNAME=		llnlxftp2.1
@@ -20,7 +20,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xftp ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/XFtp.ad ${PREFIX}/lib/X11/app-defaults/XFtp
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmget/Makefile b/net/wmget/Makefile
index 2ad5e619d40..af9be8992fb 100644
--- a/net/wmget/Makefile
+++ b/net/wmget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/19 11:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:32:59 joerg Exp $
 
 DISTNAME=	wmget-0.6.0-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -26,5 +26,5 @@ SUBST_SED.paths=	-e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|'
 USE_TOOLS+=	gmake
 
 .include "../../www/curl/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wminet/Makefile b/net/wminet/Makefile
index d25c4996b49..5b10701a58f 100644
--- a/net/wminet/Makefile
+++ b/net/wminet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/10/04 21:53:18 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	wmnet-1.2
 PKGNAME=	wminet-1.2
@@ -14,5 +14,5 @@ NOT_FOR_PLATFORM=	Interix-*-* # no userland protocol stack support
 
 USE_X11BASE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wmpload/Makefile b/net/wmpload/Makefile
index ef136c2aa7e..54edeae8d99 100644
--- a/net/wmpload/Makefile
+++ b/net/wmpload/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:10:32 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=	wmpload-0.9.5
@@ -13,5 +13,5 @@ COMMENT=	PPP monitor for X11, totals and current in/out rates in 64x64 cube
 HAS_CONFIGURE=	YES
 USE_IMAKE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index 27d1f9565ba..a7a3d211fa2 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/02/05 23:10:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:00 joerg Exp $
 #
 
 DISTNAME=	xmftp-1.0.4
@@ -23,7 +23,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/../CHANGES ${PREFIX}/share/doc/xmftp
 	${INSTALL_DATA} ${WRKSRC}/../FAQ ${PREFIX}/share/doc/xmftp
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index 812e8e10932..197b0aaada3 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/10/04 21:53:19 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:00 joerg Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	4
@@ -19,7 +19,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin
 
 .include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"