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

diff --git a/time/asclock-xlib/Makefile b/time/asclock-xlib/Makefile
index c747b2beed3..2e7588213fb 100644
--- a/time/asclock-xlib/Makefile
+++ b/time/asclock-xlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	asclock-xlib-2.0.11
@@ -32,5 +32,5 @@ post-install:
 	${CP} -R ${WRKSRC}/themes/* ${PREFIX}/share/asclock-xlib
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/asclock-xlib
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index bc65deb2093..3f32ea99491 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/11/12 02:22:44 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/15 20:33:01 joerg Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -75,5 +75,5 @@ do-install:
 .endfor
 	@${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC}
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/gnyaclock/Makefile b/time/gnyaclock/Makefile
index 239dccd5cb9..ecfbfaf3653 100644
--- a/time/gnyaclock/Makefile
+++ b/time/gnyaclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:09 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	gnya
@@ -22,5 +22,5 @@ do-install:
 		${INSTALL_MAN} ${WRKSRC}/gnyaclock.man \
 			${PREFIX}/man/ja_JP.EUC/man1/gnyaclock.1
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index ac0621cfa51..9055c850b66 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/02/05 23:11:10 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -21,5 +21,5 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/pclock
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pclock
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index e850ebf63b8..8629f555d9b 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -26,5 +26,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/wmCalClock.1 ${PREFIX}/man/man1/
 	${INSTALL_PROGRAM} ${WRKSRC}/wmCalClock ${PREFIX}/bin/
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmclockmon/Makefile b/time/wmclockmon/Makefile
index e78dbb7efff..80cfeece026 100644
--- a/time/wmclockmon/Makefile
+++ b/time/wmclockmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:11:11 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmclockmon-0.8.1
@@ -12,6 +12,6 @@ COMMENT=	Windowmaker dockapp for time/date
 
 GNU_CONFIGURE=	yes
 
-.include "../../graphics/xpm/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 5bdb768b8d2..eca1258a92d 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/10/04 22:01:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
@@ -22,5 +22,5 @@ MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 EXTRA_LOCAL_LIBS=       -lsocket
 .endif
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmtime/Makefile b/time/wmtime/Makefile
index 0941877578b..05d5bb647f7 100644
--- a/time/wmtime/Makefile
+++ b/time/wmtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	wmtime-1.0b2
@@ -18,5 +18,5 @@ BUILD_DIRS=	${CONFIGURE_DIRS}
 post-extract:
 	${CP} ${WRKSRC}/Imakefile ${WRKSRC}/wmtime/Imakefile
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/xbeats/Makefile b/time/xbeats/Makefile
index 25b026d117d..c2f510cb2f0 100644
--- a/time/xbeats/Makefile
+++ b/time/xbeats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/03/04 21:30:53 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/12/15 20:33:01 joerg Exp $
 #
 
 DISTNAME=	xbeats-0.4
@@ -12,5 +12,5 @@ COMMENT=	Beats clock dockable in both Window Maker and AfterStep
 
 GNU_CONFIGURE=	YES
 
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"