From 58c314423618d9e74407834dd613376be4ef0878 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 15 Dec 2006 20:32:52 +0000 Subject: 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 --- fonts/Xft2/Makefile | 4 ++-- fonts/Xft2/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'fonts/Xft2') diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile index 37b01547910..65d5e541d9b 100644 --- a/fonts/Xft2/Makefile +++ b/fonts/Xft2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2006/10/09 12:52:34 joerg Exp $ +# $NetBSD: Makefile,v 1.49 2006/12/15 20:32:55 joerg Exp $ DISTNAME= libXft-2.1.7 PKGNAME= Xft2-2.1.7 @@ -29,5 +29,5 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.2 .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/Xft2/buildlink3.mk b/fonts/Xft2/buildlink3.mk index 4004f368c6a..9e072c839ab 100644 --- a/fonts/Xft2/buildlink3.mk +++ b/fonts/Xft2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2006/07/08 23:10:49 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:32:55 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XFT2_BUILDLINK3_MK:= ${XFT2_BUILDLINK3_MK}+ @@ -18,6 +18,6 @@ BUILDLINK_PKGSRCDIR.Xft2?= ../../fonts/Xft2 .endif # XFT2_BUILDLINK3_MK .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3