summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-12-15 20:32:52 +0000
committerjoerg <joerg@pkgsrc.org>2006-12-15 20:32:52 +0000
commit58c314423618d9e74407834dd613376be4ef0878 (patch)
tree18da47edbf63f3b1426c1e8f88063303e6b0ef19 /pkgtools
parent1a74f87f421f832d8d7f18cd95ae4c1f6a8b931f (diff)
downloadpkgsrc-58c314423618d9e74407834dd613376be4ef0878.tar.gz
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
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/x11-links/xfree.mk12
-rw-r--r--pkgtools/x11-links/xorg.mk16
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgtools/x11-links/xfree.mk b/pkgtools/x11-links/xfree.mk
index 4f731013873..ce9ed5e1836 100644
--- a/pkgtools/x11-links/xfree.mk
+++ b/pkgtools/x11-links/xfree.mk
@@ -1,19 +1,19 @@
-# $NetBSD: xfree.mk,v 1.14 2006/04/19 12:30:25 reed Exp $
+# $NetBSD: xfree.mk,v 1.15 2006/12/15 20:33:00 joerg Exp $
FILES_LIST= ${FILESDIR}/xfree
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
# Check if any headers and libraries for ${X11_MODULES} found in
# ${X11BASE} actually belong to the base XFree86 or not.
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 56d8fb616ec..b0e87668d4a 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.3 2006/04/19 12:30:25 reed Exp $
+# $NetBSD: xorg.mk,v 1.4 2006/12/15 20:33:00 joerg Exp $
#
# This is for X.org, but use "xfree" files also.
@@ -7,24 +7,24 @@ FILES_LIST= ${FILESDIR}/xorg
# libXdamage and damageext only in pkgsrc-wip so not used here
# XXX: what about xaw?
-.include "../../fonts/Xft2/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/xpm/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/compositeproto/buildlink3.mk"
.include "../../x11/fixesproto/buildlink3.mk"
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/Xcomposite/buildlink3.mk"
-.include "../../x11/Xfixes/buildlink3.mk"
-.include "../../x11/Xrandr/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
+.include "../../x11/libXcomposite/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/renderproto/buildlink3.mk"
.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xcursor/buildlink3.mk"
# XXX what is ${X11_MODULES} ?