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. --- lang/sablevm-classpath-gui/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lang/sablevm-classpath-gui') diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile index a49e8e1a2cc..38ca07f1b8e 100644 --- a/lang/sablevm-classpath-gui/Makefile +++ b/lang/sablevm-classpath-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:38 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2006/12/27 13:37:38 joerg Exp $ # .include "../../lang/sablevm-classpath/Makefile.common" @@ -19,8 +19,12 @@ PRINT_PLIST_AWK+= \ /^@dirrm java\/sablevm\/lib\/sablevm-classpath$$/ \ { print "@comment in sablevm-classpath: "$$0; next; } +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/libart2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXtst/buildlink3.mk" .include "../../mk/java-env.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3