From 90e452c4cd09620859115e0d4e58a25bcc1e282a 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. --- audio/xmix/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'audio/xmix') diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile index d6bb0db50db..7c884d24f3d 100644 --- a/audio/xmix/Makefile +++ b/audio/xmix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/03/09 21:04:42 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/12/27 13:37:35 joerg Exp $ DISTNAME= xmix-2.1 PKGREVISION= 2 @@ -22,5 +22,7 @@ pre-configure: pre-install: ${INSTALL_DATA} ${WRKSRC}/XMix ${PREFIX}/lib/X11/app-defaults +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3