From b28533fe59c3ed8a07d089eec0ddb72591404098 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. --- wm/fvwm1/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'wm/fvwm1') diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile index 254d30d62dc..70816a246b9 100644 --- a/wm/fvwm1/Makefile +++ b/wm/fvwm1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:41 joerg Exp $ DISTNAME= fvwm-1.24r PKGNAME= ${DISTNAME:S/fvwm/fvwm1/} @@ -45,4 +45,10 @@ post-install: ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ ${PREFIX}/lib/X11/fvwm/bitmaps +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXmu/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3