From b28fb5fdd73d12e7b1b32965e990221c8519397d Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 6 Nov 2006 11:25:54 +0000 Subject: Switch to modular buildlinks. --- graphics/Mesa/Makefile.common | 7 +++++-- graphics/aalib/buildlink3.mk | 4 ++-- graphics/aalib/options.mk | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common index 35e6c9530ed..c9ec61a5c2d 100644 --- a/graphics/Mesa/Makefile.common +++ b/graphics/Mesa/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.53 2006/10/09 12:52:35 joerg Exp $ +# $NetBSD: Makefile.common,v 1.54 2006/11/06 11:25:54 joerg Exp $ # # This Makefile fragment is included either directly or indirectly (through # Makefile.lib) by all packages that are built from the Mesa sources. @@ -28,4 +28,7 @@ BUILDING_MESA= yes NO_CONFIGURE= yes DIST_SUBDIR= Mesa-${MESA_VERSION} -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" diff --git a/graphics/aalib/buildlink3.mk b/graphics/aalib/buildlink3.mk index defdf7e737b..4b8a3338f4c 100644 --- a/graphics/aalib/buildlink3.mk +++ b/graphics/aalib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:10:50 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2006/11/06 11:26:30 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ AALIB_BUILDLINK3_MK:= ${AALIB_BUILDLINK3_MK}+ @@ -34,7 +34,7 @@ MAKEVARS+= PKG_BUILD_OPTIONS.aalib .endif .if !empty(PKG_BUILD_OPTIONS.aalib:Mx11) -. include "../../mk/x11.buildlink3.mk" +. include "../../x11/libX11/buildlink3.mk" .endif BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/aalib/options.mk b/graphics/aalib/options.mk index 71890cb0482..61434538f4e 100644 --- a/graphics/aalib/options.mk +++ b/graphics/aalib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/12/11 09:40:44 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2006/11/06 11:26:31 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.aalib PKG_SUPPORTED_OPTIONS= ncurses slang x11 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-slang-driver=no .endif .if !empty(PKG_OPTIONS:Mx11) -. include "../../mk/x11.buildlink3.mk" +. include "../../x11/libX11/buildlink3.mk" CONFIGURE_ARGS+= --with-x11-driver=yes .else CONFIGURE_ARGS+= --with-x11-driver=no -- cgit v1.2.3