Update wm/fluxbox to 0.9.14

Update maintainer

remove dependancy over bsetroot, fluxbox now provides fbsetroot (and this one
builds with gcc4)

approved by jmcneill@ and wiz@

9 files changed, 30 insertions, 103 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index ff969a242c8..a1f8230d06a 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.27 2005/09/04 23:41:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.28 2005/09/27 12:49:04 tonio Exp $
 #
 
-DISTNAME=	fluxbox-0.9.13
+DISTNAME=	fluxbox-0.9.14
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	jmcneill@NetBSD.org
+MAINTAINER=	tonio@NetBSD.org
 HOMEPAGE=	http://fluxbox.sourceforge.net/
 COMMENT=	Window Manager for X based on Blackbox
 
-DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
-
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
 USE_TOOLS=	gmake
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index ec28918358c..fe5e16321a1 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2005/09/04 20:21:18 tonio Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/09/27 12:49:04 tonio Exp $
 bin/fbrun
 bin/fbsetbg
+bin/fbsetroot
 bin/fluxbox
 bin/fluxbox-generate_menu
 bin/startfluxbox
 man/man1/fbrun.1
 man/man1/fbsetbg.1
+man/man1/fbsetroot.1
 man/man1/fluxbox.1
 man/man1/fluxstyle.1
 man/man1/startfluxbox.1
@@ -13,10 +15,12 @@ share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
 share/fluxbox/nls/C/fluxbox.cat
+share/fluxbox/nls/be_BY/fluxbox.cat
 share/fluxbox/nls/bg_BG/fluxbox.cat
 share/fluxbox/nls/cs_CZ/fluxbox.cat
 share/fluxbox/nls/da_DK/fluxbox.cat
 share/fluxbox/nls/de_DE/fluxbox.cat
+share/fluxbox/nls/el_GR/fluxbox.cat
 share/fluxbox/nls/es_ES/fluxbox.cat
 share/fluxbox/nls/et_EE/fluxbox.cat
 share/fluxbox/nls/fr_FR/fluxbox.cat
@@ -32,6 +36,7 @@ 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/nls/uk_UA/fluxbox.cat
 share/fluxbox/nls/vi_VN/fluxbox.cat
 share/fluxbox/styles/Artwiz
 share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
@@ -100,6 +105,7 @@ share/fluxbox/styles/qnx-photon
 @dirrm share/fluxbox/styles/BlueFlux
 @dirrm share/fluxbox/styles
 @dirrm share/fluxbox/nls/vi_VN
+@dirrm share/fluxbox/nls/uk_UA
 @dirrm share/fluxbox/nls/tr_TR
 @dirrm share/fluxbox/nls/sv_SE
 @dirrm share/fluxbox/nls/sl_SI
@@ -115,10 +121,12 @@ 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/el_GR
 @dirrm share/fluxbox/nls/de_DE
 @dirrm share/fluxbox/nls/da_DK
 @dirrm share/fluxbox/nls/cs_CZ
 @dirrm share/fluxbox/nls/bg_BG
+@dirrm share/fluxbox/nls/be_BY
 @dirrm share/fluxbox/nls/C
 @dirrm share/fluxbox/nls
 @dirrm share/fluxbox
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index bf02c341a0a..2f9980d2091 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.17 2005/09/04 20:21:18 tonio Exp $
+$NetBSD: distinfo,v 1.18 2005/09/27 12:49:04 tonio Exp $
 
-SHA1 (fluxbox-0.9.13.tar.bz2) = 550585f33917469dfee0891d3c675d2bdf67369c
-RMD160 (fluxbox-0.9.13.tar.bz2) = 444b3c9f39eab5bb506a88a13153aa1d27160d3d
-Size (fluxbox-0.9.13.tar.bz2) = 663812 bytes
-SHA1 (patch-aa) = 4bb7da68b65c4c83900ef7491db724b3932ef052
-SHA1 (patch-ab) = 23022e4a2cfdb347c294b7ee63c2ace1b32b7925
-SHA1 (patch-ac) = f304326b795f96d59446f5a618331b15cdca7970
-SHA1 (patch-ad) = 66212af7e80cd5d8775851608941f9b7356f1f36
-SHA1 (patch-ae) = 63f52138beeeb3fddf8a380d8c1d79b1c841e18c
-SHA1 (patch-af) = ab6c62661f6271f9c35168f96ac3ebb46e648b8c
+SHA1 (fluxbox-0.9.14.tar.bz2) = 6e9d6d42631bb92b2fcfa1b74476b4383af91c3b
+RMD160 (fluxbox-0.9.14.tar.bz2) = 17cb299115164303972988471526a57bf0eeebde
+Size (fluxbox-0.9.14.tar.bz2) = 671916 bytes
+SHA1 (patch-ac) = f180c8cc2878f73ca14fa48aea73e04ff599004b
+SHA1 (patch-ad) = 8fe91a52ce87f3f35f986ad8afb136c5cfd660d5
+SHA1 (patch-af) = 2e20d43536b348dc72696110d41d85a69f2f19c9
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
deleted file mode 100644
index 953f036a14a..00000000000
--- a/wm/fluxbox/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2004/09/02 21:56:32 xtraeme Exp $
-
---- doc/Makefile.in.orig	2004-09-02 23:14:59.000000000 +0200
-+++ doc/Makefile.in	2004-09-02 23:15:38.000000000 +0200
-@@ -95,10 +95,10 @@
- SUBDIRS = ru
- CLEANFILES = fluxbox.1 fluxstyle.1
- MAINTAINERCLEANFILES = Makefile.in
--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.in Coding_style
- 
- subdir = doc
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
deleted file mode 100644
index 29e71f32844..00000000000
--- a/wm/fluxbox/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2004/09/02 21:56:32 xtraeme Exp $
-
---- util/Makefile.in.orig	2004-09-02 23:16:03.000000000 +0200
-+++ util/Makefile.in	2004-09-02 23:16:38.000000000 +0200
-@@ -94,7 +94,7 @@
- SUBDIRS = fbrun
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
- bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
--bin_PROGRAMS = bsetroot
-+bin_PROGRAMS =
- bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \
- 			../src/FbTk/libFbTk.a
-@@ -108,7 +108,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS =
- PROGRAMS = $(bin_PROGRAMS)
- 
- am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
-@@ -143,7 +143,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--DIST_SOURCES = $(bsetroot_SOURCES)
-+DIST_SOURCES =
- 
- RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
- 	uninstall-info-recursive all-recursive install-data-recursive \
-@@ -151,7 +151,7 @@
- 	uninstall-recursive check-recursive installcheck-recursive
- DIST_COMMON = Makefile.am Makefile.in
- DIST_SUBDIRS = $(SUBDIRS)
--SOURCES = $(bsetroot_SOURCES)
-+SOURCES =
- 
- all: all-recursive
- 
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index 0b4cf6ad67b..1cbd371bee7 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2004/05/13 10:03:12 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2005/09/27 12:49:04 tonio Exp $
 
---- src/fluxbox.cc.orig	2004-04-26 11:25:42.000000000 +0200
+--- src/fluxbox.cc.orig	2005-09-01 11:22:01.000000000 +0200
 +++ src/fluxbox.cc
-@@ -700,11 +700,11 @@ void Fluxbox::setupConfigFiles() {
+@@ -570,11 +570,11 @@ void Fluxbox::setupConfigFiles() {
  
      bool create_init = false, create_keys = false, create_menu = false;
  
diff --git a/wm/fluxbox/patches/patch-ad b/wm/fluxbox/patches/patch-ad
index f9a5cb6e5fe..5f6ed7375be 100644
--- a/wm/fluxbox/patches/patch-ad
+++ b/wm/fluxbox/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2005/09/04 20:21:18 tonio Exp $
+$NetBSD: patch-ad,v 1.4 2005/09/27 12:49:04 tonio Exp $
 
---- util/startfluxbox.in.orig	2005-05-14 18:13:52.000000000 +0200
-+++ util/startfluxbox.in	2005-05-14 18:14:39.000000000 +0200
-@@ -29,7 +29,9 @@
+--- util/startfluxbox.in.orig	2005-07-20 13:01:49.000000000 +0200
++++ util/startfluxbox.in
+@@ -29,7 +29,9 @@ elif [ -r "$startup" ]; then
      exec sh "$startup"
  else
      if [ ! -d ~/.fluxbox ]; then
diff --git a/wm/fluxbox/patches/patch-ae b/wm/fluxbox/patches/patch-ae
deleted file mode 100644
index 10e171c1a06..00000000000
--- a/wm/fluxbox/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/05/13 10:04:09 wiz Exp $
-
---- src/Makefile.in.orig	2004-04-25 16:30:37.000000000 +0200
-+++ src/Makefile.in
-@@ -1841,6 +1841,14 @@ distclean-compile:
- distclean-depend:
- 	-rm -rf $(DEPDIR)
- 
-+Screen.o: Screen.cc
-+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS:S/-O2/-O0/) \
-+	-c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-+
- .cc.o:
- @AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
diff --git a/wm/fluxbox/patches/patch-af b/wm/fluxbox/patches/patch-af
index a69fbf4e35f..82a64533468 100644
--- a/wm/fluxbox/patches/patch-af
+++ b/wm/fluxbox/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2004/09/02 21:56:32 xtraeme Exp $
+$NetBSD: patch-af,v 1.3 2005/09/27 12:49:04 tonio Exp $
 
---- src/FbTk/I18n.cc.orig	2004-09-02 23:21:32.000000000 +0200
-+++ src/FbTk/I18n.cc	2004-09-02 23:22:28.000000000 +0200
-@@ -77,7 +77,9 @@
+--- src/FbTk/I18n.cc.orig	2005-05-18 10:31:05.000000000 +0200
++++ src/FbTk/I18n.cc
+@@ -74,7 +74,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