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. --- comms/xtel/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'comms/xtel') diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile index 18667fdfa3c..d4883ac6543 100644 --- a/comms/xtel/Makefile +++ b/comms/xtel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/12/15 20:32:53 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2006/12/27 13:37:36 joerg Exp $ # DISTNAME= xtel-3.3.0 @@ -11,12 +11,15 @@ HOMEPAGE= http://pficheux.free.fr/xtel/ COMMENT= Minitel(r) emulator USE_IMAKE= YES -USE_TOOLS+= mkfontdir +USE_TOOLS+= mkfontdir bdftopcf FONTS_DIRS.x11= ${PREFIX}/lib/X11/fonts/xtel REQD_DIRS= ${PREFIX}/lib/X11/fonts/xtel .include "../../graphics/jpeg/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/xbitmaps/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3