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. --- inputmethod/kinput2/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'inputmethod/kinput2') diff --git a/inputmethod/kinput2/Makefile b/inputmethod/kinput2/Makefile index feb38a748db..20c3f8d5b41 100644 --- a/inputmethod/kinput2/Makefile +++ b/inputmethod/kinput2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:09:43 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:38 joerg Exp $ DISTNAME= kinput2-v3 PKGNAME= kinput2-3.0 @@ -24,4 +24,7 @@ pre-configure: do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${XMKMF} +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3