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. --- x11/xpad/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'x11/xpad') diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile index b1399bed917..3a237d3fb3e 100644 --- a/x11/xpad/Makefile +++ b/x11/xpad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:47 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2006/12/27 13:37:46 joerg Exp $ # DISTNAME= xpad-1.12 @@ -20,7 +20,11 @@ LIBS.SunOS+= -lX11 BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3