pkg/25468: fluxbox 0.9.9 + patch

[space7%meinberlikomm.de@localhost]

>Number:         25468
>Category:       pkg
>Synopsis:       new version of fluxbox has been released
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed May 05 09:50:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Krüger
>Release:        NetBSD 2.0E
>Organization:
        
>Environment:
        
        
System: NetBSD dsl-217-9-35-204.berlikomm.net 2.0E NetBSD 2.0E (PLUTO) #2: Tue 
May 4 12:57:06 CEST 2004 
space7%dsl-217-9-35-156.berlikomm.net@localhost:/usr/obj/cvsroot/src/sys/arch/i386/compile/PLUTO
 i386
Architecture: i386
Machine: i386
>Description:
        fluxbox in pkgsrc is 0.9.8, newest is 0.9.9

        News in 0.9.9:
            * New commands:
              * Deiconify <mode> <dest>
                * Where mode is:
                  * last
                   - deiconify last iconified window
                  * lastworkspace (default)
                   - deiconify last iconified window from current workspace
                  * all
                   - deiconify all iconified windows
                  * allworkspace
                   - deiconify all iconfied windows from current workspace
                * and dest is:
                  * current (default)
                   - deiconify them on current windows
                  * origin
                   - deiconify them where they were
                  * originquiet
                   - deiconify to old workspace but dont follow
              * SendToNextWorkspace <num>
                * sends current window forward <num> workspaces
              * SendToPrevWorkspace <num>
                * sends current window backward <num> workspaces
              * WindowMenu
                * popups the window menu
            * New resources:
              * session.tabsAttachArea: <mode>
                * where mode is:
                   * Window
                    - dropping tabs to any part of the destination-window leads
                      to attaching to that frame (default)
                   * Titlebar
                    - dropping tabs only to the titlebar of the destination-
                      window leads to attaching to that frame
              * session.screen<num>.overlay.lineWidth: <integer>
              * session.screen<num>.overlay.lineStyle:
                 * Valid arguments: LineSolid, LineOnOffDash LineDoubleDash
        
              * session.screen<num>.overlay.joinStyle:
                 * Valid arguments: JoinRound, JoindMiter, JoinBevel
        
              * session.screen<num>.overlay.capStyle:
                 * Valid arguments: CapNotLast, CapRound, CapButt, CapProjecting
        
            * KDE dockapps docks in systray inside toolbar now
            * Support aspect ratio hints
            * Optional decoration on transient windows
            * Added ! as a comment char in keys file
            * Improved rendering speed while changing workspace
            * Improved checking for compiler and compiler version
            * Improved transparent rendering speed
            * Remember hidden state for apps
              * [IconHidden] hides the app from the icon bar
              * [FocusHidden] hides the app from the list to be reachable
                via Next/PrevWindow
              * [Hidden] is [IconHidden] + [FocusHidden]
                Example ~/.fluxbox/apps: [IconHidden] {true}
            * Expands tilde for slitlist file
            * Using WM_CLASS instead of NAME in slitlist file
            * Window snapping to other windows
            * More support for Extended Window Manager Hints:
              * _NET_WM_WINDOW_TYPE
              * _NET_WM_WINDOW_TYPE_DOCK
              * _NET_WM_STATE_ABOVE
              * _NET_WM_STATE_BELOW
              * _NET_WM_CLIENT_LIST_STACKING
              * _NET_WM_DESKTOP_VIEWPORT
              * _NET_WM_DESKTOP_GEOMETRY
              * _NET_WORKAREA
              * _NET_ACTIVE_WINDOW
              * _NET_WM_STATE_HIDDEN
              * _NET_WM_STATE_SKIP_TASKBAR
            * sl_SI nls
            * Updated nl_NL locales
            * fbrun news:
              * cycling in tab completion
              * completes binaries from your $PATH
                * if you want to use old history tab-complete, press Ctrl-tab
              * completes path names
              * Control-C clears the text
              * Fixed cursor bug
            * fluxbox-generate_menu news:
              * Updated German locales
              * More firefox support
              * portability fixes
              * improve menu reloading
              * more menu entries
              * French locales
              * Portuguese locales
        Bug fixes:
            * Decoration bug with mwm hint + remember
            * Drawing issues with big menus
            * _MOTIF_WM_HINTS decoration toggle bug
            * No-text-in-iconbar bug on restart
            * Menu time stamp on root menu
            * placeWindow caused spinning with screens higher than width
              e.g. vertical xinerama
            * compiles in cygwin
            * update of keys on keymap change
            * infinite loop in fbrun
            * window size bug in no-decor windows on start/restart
            * The _NET_MOVERESIZE_WINDOW crash bug
            * mplayer -vo xvid bug
            * menu keyboard navigation bug

>How-To-Repeat:
        fluxbox -version
        Fluxbox 0.9.8... ;-)
>Fix:
diff -uNr --exclude CVS fluxbox.orig/Makefile fluxbox/Makefile
--- fluxbox.orig/Makefile       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/Makefile    2004-05-05 11:14:09.000000000 +0200
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.15 2004/03/10 14:12:51 xtraeme Exp $
 #
 
-DISTNAME=      fluxbox-0.9.8
+DISTNAME=      fluxbox-0.9.9
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=  .tar.bz2
diff -uNr --exclude CVS fluxbox.orig/PLIST fluxbox/PLIST
--- fluxbox.orig/PLIST  2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/PLIST       2004-05-05 11:40:36.000000000 +0200
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2004/01/29 16:58:03 jmmv Exp $
+@comment $NetBSD$
 bin/fbrun
 bin/fbsetbg
 bin/fluxbox
 bin/fluxbox-generate_menu
 bin/startfluxbox
+man/man1/fbrun.1
+man/man1/fbsetbg.1
 man/man1/fluxbox.1
+man/man1/fluxstyle.1
+man/man1/startfluxbox.1
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
@@ -26,9 +30,11 @@
 share/fluxbox/nls/lv
 share/fluxbox/nls/lv_LV/fluxbox.cat
 share/fluxbox/nls/nl_NL/fluxbox.cat
+share/fluxbox/nls/pl_PL/fluxbox.cat
 share/fluxbox/nls/pt_BR/fluxbox.cat
 share/fluxbox/nls/pt_PT/fluxbox.cat
 share/fluxbox/nls/ru_RU/fluxbox.cat
+share/fluxbox/nls/sl_SI/fluxbox.cat
 share/fluxbox/nls/sv_SE/fluxbox.cat
 share/fluxbox/nls/tr_TR/fluxbox.cat
 share/fluxbox/styles/Artwiz
@@ -99,9 +105,11 @@
 @dirrm share/fluxbox/styles
 @dirrm share/fluxbox/nls/tr_TR
 @dirrm share/fluxbox/nls/sv_SE
+@dirrm share/fluxbox/nls/sl_SI
 @dirrm share/fluxbox/nls/ru_RU
 @dirrm share/fluxbox/nls/pt_PT
 @dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/pl_PL
 @dirrm share/fluxbox/nls/nl_NL
 @dirrm share/fluxbox/nls/lv_LV
 @dirrm share/fluxbox/nls/ja_JP
diff -uNr --exclude CVS fluxbox.orig/distinfo fluxbox/distinfo
--- fluxbox.orig/distinfo       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/distinfo    2004-05-05 11:28:18.000000000 +0200
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.10 2004/01/29 16:58:03 jmmv Exp $
 
-SHA1 (fluxbox-0.9.8.tar.bz2) = 77368a2a64cc6e4e09e77711d8799dd154f29f8c
-Size (fluxbox-0.9.8.tar.bz2) = 506099 bytes
-SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31
-SHA1 (patch-ab) = da8f09ce7e52e8459b8e561500fec5b4c41bd96a
-SHA1 (patch-ac) = 81962d7dc7d063f5d85e1dc6d3ba801ab45b74fb
+SHA1 (fluxbox-0.9.9.tar.bz2) = 4322b7abf20b79539c36c74d101a9fb40b6360e2
+Size (fluxbox-0.9.9.tar.bz2) = 536673 bytes
+SHA1 (patch-aa) = dd4bdcc2322a1c5fb968d61179396f16940e76e9
+SHA1 (patch-ab) = 478edef0d8a94aebccdcb46a53cfa0de414e279e
+SHA1 (patch-ac) = d0999727a12f0b89179c7e9bb9fd79669d6d5b10
 SHA1 (patch-ad) = ea13a889a03203ce559e9d08c7c83dcc86f21cba
-SHA1 (patch-ae) = f6424828354d6118ee350ae4739a6ebeb0db5bdb
+SHA1 (patch-ae) = 7349f638dee4912239015ec33f1570fbc8d3f37e
diff -uNr --exclude CVS fluxbox.orig/patches/patch-aa fluxbox/patches/patch-aa
--- fluxbox.orig/patches/patch-aa       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/patches/patch-aa    2004-05-05 11:27:43.000000000 +0200
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.4 2002/12/10 20:39:09 jschauma Exp $
+$NetBSD$
 
---- doc/Makefile.in.orig       Tue Dec 10 15:17:17 2002
-+++ doc/Makefile.in    Tue Dec 10 15:17:30 2002
-@@ -94,8 +94,8 @@
+--- doc/Makefile.in.orig       2004-05-05 11:15:19.000000000 +0200
++++ doc/Makefile.in    2004-05-05 11:15:57.000000000 +0200
+@@ -93,10 +93,10 @@
  
  CLEANFILES = fluxbox.1
  MAINTAINERCLEANFILES = Makefile.in
--man_MANS = fluxbox.1 bsetroot.1
--EXTRA_DIST = fluxbox.1.in bsetroot.1 Coding_style
-+man_MANS = fluxbox.1
-+EXTRA_DIST = fluxbox.1.in Coding_style
+-man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \
++man_MANS = fluxbox.1 fbrun.1 fbsetbg.1 \
+       startfluxbox.1 fluxstyle.1 fbrun.1
+ 
+-EXTRA_DIST = fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \
++EXTRA_DIST = fluxbox.1.in fbrun.1 startfluxbox.1 fbsetbg.1 \
+       fluxstyle.1 Coding_style
+ 
  subdir = doc
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
diff -uNr --exclude CVS fluxbox.orig/patches/patch-ab fluxbox/patches/patch-ab
--- fluxbox.orig/patches/patch-ab       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/patches/patch-ab    2004-05-05 11:27:48.000000000 +0200
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.8 2004/01/29 16:58:03 jmmv Exp $
+$NetBSD$
 
---- util/Makefile.in.orig      2004-01-15 13:22:41.000000000 +0100
-+++ util/Makefile.in
-@@ -95,10 +95,10 @@ regex_cmd = @regex_cmd@
+--- util/Makefile.in.orig      2004-04-25 16:30:37.000000000 +0200
++++ util/Makefile.in   2004-05-05 11:23:14.000000000 +0200
+@@ -94,10 +94,10 @@
  SUBDIRS = fbrun
- INCLUDES = -I../src/FbTk/
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
  bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
 -bin_PROGRAMS = bsetroot
 -bsetroot_SOURCES = bsetroot.cc bsetroot.hh
@@ -17,7 +17,7 @@
  
  
  MAINTAINERCLEANFILES = Makefile.in
-@@ -109,14 +109,14 @@ subdir = util
+@@ -108,14 +108,14 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -38,7 +38,7 @@
  SCRIPTS = $(bin_SCRIPTS)
  
  
-@@ -126,7 +126,7 @@ CPPFLAGS = @CPPFLAGS@
+@@ -125,7 +125,7 @@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -47,7 +47,7 @@
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-@@ -144,7 +144,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
+@@ -143,7 +143,7 @@
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -56,7 +56,7 @@
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
        uninstall-info-recursive all-recursive install-data-recursive \
-@@ -152,7 +152,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -151,7 +151,7 @@
        uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -65,7 +65,7 @@
  
  all: all-recursive
  
-@@ -198,9 +198,9 @@ uninstall-binPROGRAMS:
+@@ -197,9 +197,9 @@
  
  clean-binPROGRAMS:
        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -78,7 +78,7 @@
  install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -229,7 +229,7 @@ mostlyclean-compile:
+@@ -228,7 +228,7 @@
  distclean-compile:
        -rm -f *.tab.c
  
@@ -87,14 +87,14 @@
  
  distclean-depend:
        -rm -rf $(DEPDIR)
-@@ -477,8 +477,8 @@ all-local: startfluxbox
+@@ -476,8 +476,8 @@
  clean-local:
                rm -f startfluxbox fluxbox-generate_menu
  
--bsetroot.o:   bsetroot.cc ../config.h bsetroot.hh \
--                      ../src/FbRootWindow.hh ../src/FbAtoms.hh
-+#HF#bsetroot.o:       bsetroot.cc ../config.h bsetroot.hh \
-+#HF#                  ../src/FbRootWindow.hh ../src/FbAtoms.hh
+-bsetroot.o:   bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
+-                      $(top_srcdir)/src/FbRootWindow.hh 
$(top_srcdir)/src/FbAtoms.hh
++#HF#bsetroot.o:       bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
++#HF#                  $(top_srcdir)/src/FbRootWindow.hh 
$(top_srcdir)/src/FbAtoms.hh
  
  startfluxbox:         startfluxbox.in
                @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
diff -uNr --exclude CVS fluxbox.orig/patches/patch-ac fluxbox/patches/patch-ac
--- fluxbox.orig/patches/patch-ac       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/patches/patch-ac    2004-05-05 11:27:52.000000000 +0200
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2004/01/29 16:58:03 jmmv Exp $
+$NetBSD$
 
---- src/fluxbox.cc.orig        2004-01-13 15:31:15.000000000 +0100
-+++ src/fluxbox.cc
-@@ -668,11 +668,11 @@ void Fluxbox::setupConfigFiles() {
+--- src/fluxbox.cc.orig        2004-04-26 11:25:42.000000000 +0200
++++ src/fluxbox.cc     2004-05-05 11:23:52.000000000 +0200
+@@ -700,11 +700,11 @@
  
      bool create_init = false, create_keys = false, create_menu = false;
  
diff -uNr --exclude CVS fluxbox.orig/patches/patch-ae fluxbox/patches/patch-ae
--- fluxbox.orig/patches/patch-ae       2004-05-05 11:13:31.000000000 +0200
+++ fluxbox/patches/patch-ae    2004-05-05 11:28:07.000000000 +0200
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/08/14 14:17:41 jschauma Exp $
+$NetBSD$
 
---- src/I18n.cc.orig   2003-08-14 10:03:53.000000000 -0400
-+++ src/I18n.cc        2003-08-14 10:05:06.000000000 -0400
-@@ -58,7 +58,9 @@
+--- src/I18n.cc.orig   2004-01-21 15:12:51.000000000 +0100
++++ src/I18n.cc        2004-05-05 11:24:17.000000000 +0200
+@@ -54,7 +54,9 @@
  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
@@ -11,5 +11,5 @@
 +    (void)setlocale(LC_ALL, "");
 +    temp = setlocale(LC_MESSAGES, NULL);
      m_locale = ( temp ?  temp : ""); 
-     if (m_locale.size() == 0) {
+     if (m_locale.empty()) {
          cerr<<"Warning: Failed to set locale, reverting to \"C\""<<endl;
>Release-Note:
>Audit-Trail:
>Unformatted: