summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES3
-rw-r--r--wm/fluxbox/Makefile12
-rw-r--r--wm/fluxbox/PLIST9
-rw-r--r--wm/fluxbox/distinfo12
-rw-r--r--wm/fluxbox/patches/patch-aa16
-rw-r--r--wm/fluxbox/patches/patch-ab10
-rw-r--r--wm/fluxbox/patches/patch-af10
7 files changed, 32 insertions, 40 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 6d57b3ddead..69249ed42a6 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7084 2004/09/02 20:46:17 recht Exp $
+$NetBSD: CHANGES,v 1.7085 2004/09/02 21:56:32 xtraeme Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -4180,3 +4180,4 @@ Changes to the packages collection and infrastructure in 2004:
Added suse91_fontconfig-9.1 [recht 2004-09-02]
Added suse91_gtk2-9.1 [recht 2004-09-02]
Added suse91_locale-9.1 [recht 2004-09-02]
+ Updated fluxbox to 0.9.10 [xtraeme 2004-09-02]
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index a69e8f5d58d..ac70d0fd853 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2004/05/13 04:29:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/09/02 21:56:32 xtraeme Exp $
#
-DISTNAME= fluxbox-0.9.9
+DISTNAME= fluxbox-0.9.10
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
EXTRACT_SUFX= .tar.bz2
@@ -17,12 +17,10 @@ USE_X11= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-.include "../../mk/bsd.prefs.mk"
-
-FLUXBOX_USE_XINERAMA?= NO
-.if !empty(FLUXBOX_USE_XINERAMA:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+= --enable-nls
CONFIGURE_ARGS+= --enable-xinerama
-.endif
+
+.include "../../mk/bsd.prefs.mk"
FLUXBOX_USE_KDE?= NO
.if !empty(FLUXBOX_USE_KDE:M[Yy][Ee][Ss])
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index fd7292b3c15..09415883100 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/13 04:29:13 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/09/02 21:56:32 xtraeme Exp $
bin/fbrun
bin/fbsetbg
bin/fluxbox
@@ -13,21 +13,14 @@ share/fluxbox/init
share/fluxbox/keys
share/fluxbox/menu
share/fluxbox/nls/C/fluxbox.cat
-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
share/fluxbox/nls/es_ES/fluxbox.cat
share/fluxbox/nls/et_EE/fluxbox.cat
-share/fluxbox/nls/fr
share/fluxbox/nls/fr_FR/fluxbox.cat
share/fluxbox/nls/it_IT/fluxbox.cat
share/fluxbox/nls/ja_JP/fluxbox.cat
-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
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index c20ae50bdcd..d4c732aa041 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2004/05/23 16:30:03 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2004/09/02 21:56:32 xtraeme Exp $
-SHA1 (fluxbox-0.9.9.tar.bz2) = 4322b7abf20b79539c36c74d101a9fb40b6360e2
-Size (fluxbox-0.9.9.tar.bz2) = 536673 bytes
-SHA1 (patch-aa) = 878b07c3dec47316508d330780d6a05fec968dd9
-SHA1 (patch-ab) = 04076d5633acf396ae981255c0a64f6d29fa0ed2
+SHA1 (fluxbox-0.9.10.tar.bz2) = 70bb65327b75c57082d812179e3ec37a9d3f8734
+Size (fluxbox-0.9.10.tar.bz2) = 556030 bytes
+SHA1 (patch-aa) = 4bb7da68b65c4c83900ef7491db724b3932ef052
+SHA1 (patch-ab) = 23022e4a2cfdb347c294b7ee63c2ace1b32b7925
SHA1 (patch-ac) = f304326b795f96d59446f5a618331b15cdca7970
SHA1 (patch-ad) = ea13a889a03203ce559e9d08c7c83dcc86f21cba
SHA1 (patch-ae) = 63f52138beeeb3fddf8a380d8c1d79b1c841e18c
-SHA1 (patch-af) = ed6f1173c0fba36d5883cc2c2a44d30212d09750
+SHA1 (patch-af) = ab6c62661f6271f9c35168f96ac3ebb46e648b8c
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index fe77dd63786..953f036a14a 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2004/05/13 04:29:13 xtraeme Exp $
+$NetBSD: patch-aa,v 1.6 2004/09/02 21:56:32 xtraeme Exp $
---- doc/Makefile.in.orig 2004-05-13 06:03:22.000000000 +0200
-+++ doc/Makefile.in 2004-05-13 06:04:16.000000000 +0200
-@@ -93,10 +93,10 @@
-
- CLEANFILES = fluxbox.1
+--- 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
+ 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
+ fluxstyle.1.in Coding_style
subdir = doc
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index ee5979a7897..29e71f32844 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2004/05/13 04:29:13 xtraeme Exp $
+$NetBSD: patch-ab,v 1.10 2004/09/02 21:56:32 xtraeme Exp $
---- util/Makefile.in.orig 2004-05-13 06:01:43.000000000 +0200
-+++ util/Makefile.in 2004-05-13 06:02:50.000000000 +0200
+--- 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
@@ -9,8 +9,8 @@ $NetBSD: patch-ab,v 1.9 2004/05/13 04:29:13 xtraeme Exp $
-bin_PROGRAMS = bsetroot
+bin_PROGRAMS =
bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
- ../src/FbAtoms.o ../src/FbTk/libFbTk.a
+ 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
diff --git a/wm/fluxbox/patches/patch-af b/wm/fluxbox/patches/patch-af
index 128a02536ee..a69fbf4e35f 100644
--- a/wm/fluxbox/patches/patch-af
+++ b/wm/fluxbox/patches/patch-af
@@ -1,12 +1,12 @@
-$NetBSD: patch-af,v 1.1 2004/05/23 16:30:03 xtraeme Exp $
+$NetBSD: patch-af,v 1.2 2004/09/02 21:56:32 xtraeme Exp $
---- src/I18n.cc.orig 2004-05-23 18:20:51.000000000 +0200
-+++ src/I18n.cc 2004-05-23 18:22:21.000000000 +0200
-@@ -54,7 +54,9 @@
+--- 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 @@
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 = setlocale(LC_MESSAGES, "");
+ char *temp;
+ (void)setlocale(LC_ALL, "");
+ temp = setlocale(LC_MESSAGES, NULL);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 07:32:10 +0000