summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-01-05 20:10:10 +0000
committerjschauma <jschauma>2003-01-05 20:10:10 +0000
commita6d803aaabd8c6ce7a12d84e8b008e97bcb6d72b (patch)
treeabc9ae698e6aa132c08f0f39261695517f5a64a5 /wm
parent9caeccaff414e845eae6b067b5740d63a9c97f8a (diff)
downloadpkgsrc-a6d803aaabd8c6ce7a12d84e8b008e97bcb6d72b.tar.gz
Bump dependency on bsetroot for the boxes so that they all require a bsetroot
that works without blackbox and uses it's own NLS files. While we're at it, nitpick the following: fluxbox: as pointed out in PR pkg/19687, fluxbox will detect Xft2 (if available) and depend on it automatically. Options were: add CONFIGURE_ARGS+= --disable-xft or include Xft2's buildlink. For the time being, add the buildlink following openboxes example. openbox: USE_BUILDLINK2=YES -- otherwise including buildlink2's is a no-op
Diffstat (limited to 'wm')
-rw-r--r--wm/blackbox/Makefile4
-rw-r--r--wm/fluxbox/Makefile5
-rw-r--r--wm/openbox/Makefile5
3 files changed, 8 insertions, 6 deletions
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 6e20a9007e3..e0b438afc63 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/11/20 18:20:30 jschauma Exp $
+# $NetBSD: Makefile,v 1.10 2003/01/05 20:10:10 jschauma Exp $
#
DISTNAME= blackbox-0.65.0
@@ -10,7 +10,7 @@ MAINTAINER= jschauma@netbsd.org
HOMEPAGE= http://blackboxwm.sourceforge.net/
COMMENT= small and fast X11R6 window manager
-DEPENDS+= bsetroot>=0.1:../../wm/bsetroot
+DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
USE_BUILDLINK2= yes
USE_X11BASE= yes
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index b10f5e8b978..6e0a515b630 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/12/10 20:39:08 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/05 20:10:11 jschauma Exp $
#
DISTNAME= fluxbox-0.1.14
@@ -10,7 +10,7 @@ MAINTAINER= jmcneill@netbsd.org
HOMEPAGE= http://fluxbox.sourceforge.net/
COMMENT= Window Manager for X based on Blackbox
-DEPENDS+= bsetroot>=0.1:../../wm/bsetroot
+DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
USE_BUILDLINK2= YES
USE_X11BASE= YES
@@ -19,5 +19,6 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-kde
+.include "../../fonts/Xft2/buildlink2.mk"
.include "../../lang/gcc/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index d68aea8be0b..be2ace68b2f 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/26 01:48:32 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/05 20:10:12 jschauma Exp $
#
DISTNAME= openbox-2.2.3
@@ -9,8 +9,9 @@ MAINTAINER= jrp@hispabsd.org
HOMEPAGE= http://icculus.org/openbox/
COMMENT= Window manager based on Blackbox
-DEPENDS+= bsetroot>=0.1:../../wm/bsetroot
+DEPENDS+= bsetroot>=0.1nb1:../../wm/bsetroot
+USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES