From 33326d6f0d8bdb731b51dd4f7586a15630e9eeaa Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 14 Feb 2003 20:57:55 +0000
Subject: Update to 0.1.14nb1: include patch from 20009 for better setlocale
 handling.

---
 wm/fluxbox/Makefile         |  3 ++-
 wm/fluxbox/distinfo         |  3 ++-
 wm/fluxbox/patches/patch-ac | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 wm/fluxbox/patches/patch-ac

(limited to 'wm/fluxbox')

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 6e0a515b630..e611087cd8f 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/01/05 20:10:11 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/14 20:57:55 wiz Exp $
 #
 
 DISTNAME=	fluxbox-0.1.14
+PKGREVISION=	1
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 88bec591a5f..8e64a6ecd86 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/12/10 20:39:08 jschauma Exp $
+$NetBSD: distinfo,v 1.7 2003/02/14 20:57:55 wiz Exp $
 
 SHA1 (fluxbox-0.1.14.tar.bz2) = 9c543bc6e68f9b4491183cbe16d79a191dec8e67
 Size (fluxbox-0.1.14.tar.bz2) = 375499 bytes
 SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31
 SHA1 (patch-ab) = 7f3ceca7b5f110fee05d6f6eb4e2191d142b8561
+SHA1 (patch-ac) = 2b0b93ca8a6d18f30284baff97fe42be459348ba
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
new file mode 100644
index 00000000000..d1052dd8a19
--- /dev/null
+++ b/wm/fluxbox/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2003/02/14 20:57:56 wiz 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;
-- 
cgit v1.2.3