diff options
author | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2006-12-15 20:32:52 +0000 |
commit | 58c314423618d9e74407834dd613376be4ef0878 (patch) | |
tree | 18da47edbf63f3b1426c1e8f88063303e6b0ef19 /x11/xcursor | |
parent | 1a74f87f421f832d8d7f18cd95ae4c1f6a8b931f (diff) | |
download | pkgsrc-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 'x11/xcursor')
-rw-r--r-- | x11/xcursor/Makefile | 6 | ||||
-rw-r--r-- | x11/xcursor/buildlink3.mk | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile index 50217c9cd24..1c092c4e89a 100644 --- a/x11/xcursor/Makefile +++ b/x11/xcursor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/04/06 06:23:04 reed Exp $ +# $NetBSD: Makefile,v 1.21 2006/12/15 20:33:05 joerg Exp $ # DISTNAME= libXcursor-1.1.2 @@ -25,6 +25,6 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 -.include "../../x11/Xfixes/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXfixes/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 26541bc96a5..3c621417abc 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2006/12/12 21:52:38 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2006/12/15 20:33:05 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -19,9 +19,7 @@ BUILDLINK_ABI_DEPENDS.xcursor+= xcursor>=1.1.2nb1 BUILDLINK_PKGSRCDIR.xcursor?= ../../x11/xcursor .endif # XCURSOR_BUILDLINK3_MK -# Xfixes/buildlink3.mk is included by xcursor/builtin.mk -#.include "../../x11/Xfixes/buildlink3.mk" - -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXfixes/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |