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 /wm/openbox | |
| 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 'wm/openbox')
| -rw-r--r-- | wm/openbox/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 01667b96cc9..6ce59c9a553 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2006/12/27 13:37:41 joerg Exp $ DISTNAME= openbox-3.3.1 CATEGORIES= wm x11 @@ -27,11 +27,16 @@ EGDIR= ${PREFIX}/share/examples/openbox CONF_FILES= ${EGDIR}/menu.xml ${PKG_SYSCONFDIR}/openbox/menu.xml CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" # disabled by default in 3.3 because "it doesn't seem to work well" #.include "../../x11/startup-notification/buildlink3.mk" |