summaryrefslogtreecommitdiff
path: root/wm/icewm
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-12-27 13:37:35 +0000
committerjoerg <joerg@pkgsrc.org>2006-12-27 13:37:35 +0000
commitd26cf36e5784f5b648404b8d68c21adb4398f33f (patch)
treecbd8d2123ffe05331db8b76b38b2de8182524736 /wm/icewm
parent6432f76116c5a27e6f554145314e47d93eeec7a9 (diff)
downloadpkgsrc-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/icewm')
-rw-r--r--wm/icewm/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index 59da5ffe828..9b1eefb43d9 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:41 joerg Exp $
COMMENT= Small, fast and light-weight window manager
@@ -6,9 +6,15 @@ CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]*
CONFIGURE_ARGS+= --with-gnome-menus=no
CONFIGURE_ARGS+= --with-imlib=no
-CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.xpm}
+CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
.include "Makefile.common"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+
+BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"