summaryrefslogtreecommitdiff
path: root/wm/fluxbox
diff options
context:
space:
mode:
authorhubertf <hubertf>2003-07-28 17:50:07 +0000
committerhubertf <hubertf>2003-07-28 17:50:07 +0000
commit75e7c9b31238b5a9e4de107084d2c96b5b2f6bbc (patch)
tree0673e4d0927b526c35c8fa35168f81bf8798c54d /wm/fluxbox
parent63d561090dd060327b40fa91ee4fe2b12fa4c839 (diff)
downloadpkgsrc-75e7c9b31238b5a9e4de107084d2c96b5b2f6bbc.tar.gz
Update fluxbox to 0.9.4. Changes:
* Keyboard navigation in menus * Keys: Up/Down: select menu item Left/Right: go in/out from sub menus Escape: close menu and return focus to windows Enter: run/execute/toggle menu item To set input focus on the menu you either click on the title bar or bring it up with key bindings * New action strings * ArrangeWindows This will arrange the windows on the current desktop * ShowDesktop This will iconify all windows on the current desktop * The same action strings that are in keys file can now be used in the menu example: [ArrangeWindows] (arrange windows) * New theme items * toolbar.button.borderWidth: <integer> * toolbar.borderWidth: <integer> * toolbar.bevelWidth: <integer> * toolbar.borderColor: <color> * slit.borderWidth: <integer> * slit.bevelWidth: <integer> * slit.borderColor: <color> * [startup] option in remember file Can now add entries to apps file like: [startup] {xterm} Then "xterm" will be launched on fluxbox startup. Can also give a screen option: [startup] (screen=1) {xterm} will start it on screen 1 rather than the default 0. * Rounded corners on menu, windows and toolbar Theme items: * menu.roundCorners: <shape item> * toolbar.shaped: <boolean> * window.roundCorners: <shape item> Shape item can be: TopLeft TopRight BottomLeft and/or BottomRight example: menu.roundCorners: TopRight BottomLeft * The current style is now marked in the style menu * Compile time option for toolbar --disable-toolbar --enable-toolbar (default) * Emacs style key bindings in fbrun * Tab completion in fbrun * Group persistence over a restart * Maximization stop on slit and toolbar (check Maximize Over menu items) * Support for _NET_WM_STRUT * Regular expression support for remember Bug fixes: * Toggle maximize vertical/horizontal * Slit/Toolbar auto hide bug * Button alignment bug in title bar * Trailing whitespace in group file resource * Group cycling Based on patch by Tom Hensel [ tom at replic8 dot net ].
Diffstat (limited to 'wm/fluxbox')
-rw-r--r--wm/fluxbox/Makefile30
-rw-r--r--wm/fluxbox/PLIST6
-rw-r--r--wm/fluxbox/distinfo11
-rw-r--r--wm/fluxbox/patches/patch-ab99
-rw-r--r--wm/fluxbox/patches/patch-ac30
-rw-r--r--wm/fluxbox/patches/patch-ad13
6 files changed, 151 insertions, 38 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 9257ac831bd..31b92776242 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2003/07/17 22:55:11 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/07/28 17:50:10 hubertf Exp $
#
-DISTNAME= fluxbox-0.1.14
-PKGREVISION= 2
+DISTNAME= fluxbox-0.9.4
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +17,31 @@ USE_X11= YES
USE_GCC_SHLIB= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --enable-kde
+.include "../../mk/bsd.prefs.mk"
+FLUKEBOX_USE_XINERAMA?= NO
+.if !empty(FLUKEBOX_USE_XINERAMA:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-xinerama
+.endif
+
+FLUKEBOX_USE_KDE?= NO
+.if !empty(FLUKEBOX_USE_KDE:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-kde
+.endif
+
+FLUKEBOX_USE_GNOME?= NO
+.if !empty(FLUKEBOX_USE_GNOME:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-gnome
+.elseif
+CONFIGURE_ARGS+= --disable-gnome
+.endif
+
+FLUKEBOX_USE_XFT?= YES
+.if !empty(FLUKEBOX_USE_XFT:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-xft
.include "../../fonts/Xft2/buildlink2.mk"
+.elseif
+CONFIGURE_ARGS+= --disable-xft
+.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index d3235ec9e8b..a6d97711033 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/12/10 20:39:08 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/28 17:50:10 hubertf Exp $
bin/fbrun
+bin/fbsetbg
bin/fluxbox
bin/fluxbox-generate_menu
man/man1/fluxbox.1
@@ -11,6 +12,7 @@ share/fluxbox/nls/POSIX
share/fluxbox/nls/US_ASCII
share/fluxbox/nls/bg_BG/fluxbox.cat
share/fluxbox/nls/da_DK/fluxbox.cat
+share/fluxbox/nls/de_DE/fluxbox.cat
share/fluxbox/nls/en
share/fluxbox/nls/en_US
share/fluxbox/nls/es
@@ -38,6 +40,7 @@ share/fluxbox/styles/Flux
share/fluxbox/styles/LemonSpace
share/fluxbox/styles/Makro
share/fluxbox/styles/MerleyKay
+share/fluxbox/styles/Meta
share/fluxbox/styles/Minimal
share/fluxbox/styles/Nyz
share/fluxbox/styles/Operation
@@ -61,6 +64,7 @@ share/fluxbox/styles/qnx-photon
@dirrm share/fluxbox/nls/fr_FR
@dirrm share/fluxbox/nls/et_EE
@dirrm share/fluxbox/nls/es_ES
+@dirrm share/fluxbox/nls/de_DE
@dirrm share/fluxbox/nls/da_DK
@dirrm share/fluxbox/nls/bg_BG
@dirrm share/fluxbox/nls/C
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 8e64a6ecd86..5d84d01ebce 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/02/14 20:57:55 wiz Exp $
+$NetBSD: distinfo,v 1.8 2003/07/28 17:50:11 hubertf Exp $
-SHA1 (fluxbox-0.1.14.tar.bz2) = 9c543bc6e68f9b4491183cbe16d79a191dec8e67
-Size (fluxbox-0.1.14.tar.bz2) = 375499 bytes
+SHA1 (fluxbox-0.9.4.tar.bz2) = b0b5c9f8befc6e2014fed61bb09262ecae0b8b58
+Size (fluxbox-0.9.4.tar.bz2) = 442182 bytes
SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31
-SHA1 (patch-ab) = 7f3ceca7b5f110fee05d6f6eb4e2191d142b8561
-SHA1 (patch-ac) = 2b0b93ca8a6d18f30284baff97fe42be459348ba
+SHA1 (patch-ab) = 296fe52f6215612ed94a0c9279ac804e42efb06c
+SHA1 (patch-ac) = fcbf8b9978b145680a27a6e4796d8a5738a9c035
+SHA1 (patch-ad) = 9fe4a9fe549afc3f402b0b11050c69f3c9621118
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index c30fc690d8e..2014c1f7c4d 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,27 +1,98 @@
-$NetBSD: patch-ab,v 1.6 2002/12/10 20:39:09 jschauma Exp $
+$NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
---- util/Makefile.in.orig Tue Dec 10 15:06:19 2002
-+++ util/Makefile.in Tue Dec 10 15:08:09 2002
-@@ -94,20 +94,18 @@
-
+--- util/Makefile.in.orig Thu Jul 10 18:03:35 2003
++++ util/Makefile.in
+@@ -95,10 +95,10 @@
SUBDIRS = fbrun
INCLUDES = -I../src/FbTk/
--bin_SCRIPTS = bsetbg fluxbox-generate_menu
+ bin_SCRIPTS = fbsetbg fluxbox-generate_menu
-bin_PROGRAMS = bsetroot
-+bin_SCRIPTS = fluxbox-generate_menu
- bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \
- ../src/StringUtil.o ../src/FbTk/libFbTk.a
+-bsetroot_SOURCES = bsetroot.cc bsetroot.hh
+-bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \
+- ../src/FbTk/libFbTk.a
++#HF#bin_PROGRAMS = bsetroot
++#HF#bsetroot_SOURCES = bsetroot.cc bsetroot.hh
++#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \
++#HF# ../src/FbTk/libFbTk.a
MAINTAINERCLEANFILES = Makefile.in
--EXTRA_DIST = bsetbg fluxbox-generate_menu
-+EXTRA_DIST = fluxbox-generate_menu
- subdir = util
+@@ -107,14 +107,14 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
-bin_PROGRAMS = bsetroot$(EXEEXT)
++#HF#bin_PROGRAMS = bsetroot$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
- am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
+-am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
+-bsetroot_OBJECTS = $(am_bsetroot_OBJECTS)
+-bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \
+- ../src/FbAtoms.o ../src/FbTk/libFbTk.a
+-bsetroot_LDFLAGS =
++#HF#am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
++#HF#bsetroot_OBJECTS = $(am_bsetroot_OBJECTS)
++#HF#bsetroot_DEPENDENCIES = ../src/FbRootWindow.o ../src/I18n.o \
++#HF# ../src/FbAtoms.o ../src/FbTk/libFbTk.a
++#HF#bsetroot_LDFLAGS =
+ SCRIPTS = $(bin_SCRIPTS)
+
+
+@@ -124,7 +124,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bsetroot.Po
++#HF#@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bsetroot.Po
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
+@@ -142,7 +142,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-DIST_SOURCES = $(bsetroot_SOURCES)
++#HF#DIST_SOURCES = $(bsetroot_SOURCES)
+
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+@@ -150,7 +150,7 @@
+ uninstall-recursive check-recursive installcheck-recursive
+ DIST_COMMON = Makefile.am Makefile.in
+ DIST_SUBDIRS = $(SUBDIRS)
+-SOURCES = $(bsetroot_SOURCES)
++#HF#SOURCES = $(bsetroot_SOURCES)
+
+ all: all-recursive
+
+@@ -196,9 +196,9 @@
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES)
+- @rm -f bsetroot$(EXEEXT)
+- $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
++#HF#bsetroot$(EXEEXT): $(bsetroot_OBJECTS) $(bsetroot_DEPENDENCIES)
++#HF# @rm -f bsetroot$(EXEEXT)
++#HF# $(CXXLINK) $(bsetroot_LDFLAGS) $(bsetroot_OBJECTS) $(bsetroot_LDADD) $(LIBS)
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+@@ -227,7 +227,7 @@
+ distclean-compile:
+ -rm -f *.tab.c
+
+-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bsetroot.Po@am__quote@
++#HF#@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bsetroot.Po@am__quote@
+
+ distclean-depend:
+ -rm -rf $(DEPDIR)
+@@ -473,7 +473,7 @@
+ distclean-local:
+ rm -f *\~ Makefile.in
+
+-bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
++#HF#bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index d1052dd8a19..e089cb7a765 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,15 +1,17 @@
-$NetBSD: patch-ac,v 1.3 2003/02/14 20:57:56 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2003/07/28 17:50:12 hubertf Exp $
---- src/i18n.cc.orig Sat Dec 7 15:14:05 2002
-+++ src/i18n.cc
-@@ -61,7 +61,9 @@ void NLSInit(const char *catalog) {
- I18n::I18n():m_multibyte(false), m_catalog_fd((nl_catd)(-1)) {
- #ifdef HAVE_SETLOCALE
- //make sure we don't get 0 to m_locale string
-- char *temp = setlocale(LC_ALL, "");
-+ char *temp;
-+ (void)setlocale(LC_ALL, "");
-+ temp = setlocale(LC_MESSAGES, NULL);
- m_locale = ( temp ? temp : "");
- if (m_locale.size() == 0) {
- cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;
+--- src/fluxbox.cc.orig Thu Jul 10 14:00:49 2003
++++ src/fluxbox.cc
+@@ -629,7 +629,11 @@
+
+ bool create_init = false, create_keys = false, create_menu = false;
+
+- string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH) + "/";
++ string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH)
++#if 0
++ + "/"
++#endif
++ ;
+ string init_file, keys_file, menu_file, slitlist_file;
+ init_file = dirname + m_RC_INIT_FILE;
+ keys_file = dirname + "keys";
diff --git a/wm/fluxbox/patches/patch-ad b/wm/fluxbox/patches/patch-ad
new file mode 100644
index 00000000000..b6974dfb07d
--- /dev/null
+++ b/wm/fluxbox/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/07/28 17:50:12 hubertf Exp $
+
+--- util/fluxbox-generate_menu.orig 2003-07-28 01:53:14.000000000 +0200
++++ util/fluxbox-generate_menu 2003-07-28 01:54:11.000000000 +0200
+@@ -101,7 +101,7 @@
+
+ # ugly code for solaris compat.
+ case $(uname) in
+- Linux|*BSD)
++ Linux)
+ find_it() {
+ which $1 > /dev/null 2>&1 && shift && $*
+ }