diff options
| author | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-12-27 13:37:35 +0000 |
| commit | d26cf36e5784f5b648404b8d68c21adb4398f33f (patch) | |
| tree | cbd8d2123ffe05331db8b76b38b2de8182524736 /www | |
| parent | 6432f76116c5a27e6f554145314e47d93eeec7a9 (diff) | |
| download | pkgsrc-d26cf36e5784f5b648404b8d68c21adb4398f33f.tar.gz | |
- 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.
Diffstat (limited to 'www')
| -rw-r--r-- | www/chimera/Makefile | 5 | ||||
| -rw-r--r-- | www/firefox/Makefile.common | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/www/chimera/Makefile b/www/chimera/Makefile index 6e975e99542..4c9511b9748 100644 --- a/www/chimera/Makefile +++ b/www/chimera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:51 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2006/12/27 13:37:42 joerg Exp $ # DISTNAME= chimera-2.0a19 @@ -26,4 +26,7 @@ post-install: .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index e649b2318ba..38d93a143f9 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2006/12/15 20:33:03 joerg Exp $ +# $NetBSD: Makefile.common,v 1.13 2006/12/27 13:37:42 joerg Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -46,11 +46,17 @@ BUILD_TARGET= # empty UNLIMIT_RESOURCES= datasize memorysize stacksize +.include "../../x11/xextproto/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXi/buildlink3.mk" + .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .if defined(MOZILLA_USE_GTK2) .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs .else .include "../../graphics/freetype2/buildlink3.mk" |