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/fvwm-wharf/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'x11/fvwm-wharf') diff --git a/x11/fvwm-wharf/Makefile b/x11/fvwm-wharf/Makefile index ab31ce87396..12c0142867d 100644 --- a/x11/fvwm-wharf/Makefile +++ b/x11/fvwm-wharf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/12/27 13:37:42 joerg Exp $ DISTNAME= AfterStep-1.0 PKGNAME= fvwm-wharf-1.0 @@ -21,5 +21,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/modules/Wharf/Wharf ${PREFIX}/bin/Fvwm-Wharf ${INSTALL_MAN} ${WRKSRC}/modules/Wharf/Wharf.man ${PREFIX}/man/man1/Fvwm-Wharf.1 +.include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3