From d2be3471aa589829dbb798282ef19cb79fccd0f3 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 --- x11/Xcomposite/Makefile | 4 ++-- x11/Xcomposite/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'x11/Xcomposite') diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile index 6e6bd8a57f2..f6780c9f0b7 100644 --- a/x11/Xcomposite/Makefile +++ b/x11/Xcomposite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/10 19:34:48 reed Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/15 20:33:03 joerg Exp $ # DISTNAME= libXcomposite-1.0.1 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE+= xcomposite.pc.in -.include "../../x11/Xfixes/buildlink3.mk" +.include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/Xcomposite/buildlink3.mk b/x11/Xcomposite/buildlink3.mk index 21a082b916a..218cdfa0735 100644 --- a/x11/Xcomposite/buildlink3.mk +++ b/x11/Xcomposite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/12/12 21:52:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2006/12/15 20:33:03 joerg Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -23,7 +23,7 @@ BUILDLINK_ABI_DEPENDS.Xcomposite?= Xcomposite>=1.0.1nb2 BUILDLINK_PKGSRCDIR.Xcomposite?= ../../x11/Xcomposite .endif # XCOMPOSITE_BUILDLINK3_MK -.include "../../x11/Xfixes/buildlink3.mk" +.include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" .include "../../x11/fixesproto/buildlink3.mk" -- cgit v1.2.3