From d26cf36e5784f5b648404b8d68c21adb4398f33f Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 27 Dec 2006 13:37:35 +0000 Subject: - fine grained X11 dependencies for packages which have either USE_IMAKE or USE_X11BASE set, but don't include mk/x11.buildlink3.mk directly or via buildlink3.mks - introduce BUILDLINK_PREFIX.libXpm as alias for BUILDLINK_PREFIX.xpm in the !modular case - fix some cases where the check for libX11 couldn't work at all by using C++ for compilation without including the proper headers Verified using a full X11_TYPE=xorg bulk build without additional breakage. Discussed with salo@, wiz@ and send to packages@ for feedback. --- graphics/MesaDemos/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'graphics/MesaDemos') diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile index c94f6475f81..1337e7ea21b 100644 --- a/graphics/MesaDemos/Makefile +++ b/graphics/MesaDemos/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2006/10/09 12:52:35 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2006/12/27 13:37:38 joerg Exp $ PKGNAME= MesaDemos-${MESA_VERSION} COMMENT= OpenGL examples and Demos @@ -32,4 +32,7 @@ do-install: -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir} ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV} +.include "../../x11/libXi/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" + .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3