From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 25 01:00:38 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4E11416A4B3 for ; Sat, 25 Oct 2003 01:00:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D46B943FB1 for ; Sat, 25 Oct 2003 01:00:36 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9P80aFY027577 for ; Sat, 25 Oct 2003 01:00:36 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9P80agn027576; Sat, 25 Oct 2003 01:00:36 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 25 Oct 2003 01:00:36 -0700 (PDT) Resent-Message-Id: <200310250800.h9P80agn027576@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeremy Messenger Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AC9016A4B3 for ; Sat, 25 Oct 2003 00:56:14 -0700 (PDT) Received: from ns1.mezzweb.com (ip68-103-32-11.ks.ok.cox.net [68.103.32.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 587BA43FAF for ; Sat, 25 Oct 2003 00:56:13 -0700 (PDT) (envelope-from mezz@ns1.mezzweb.com) Received: from ns1.mezzweb.com (localhost [127.0.0.1]) by ns1.mezzweb.com (8.12.9/8.12.9) with ESMTP id h9P7XcF6010625 for ; Sat, 25 Oct 2003 02:33:38 -0500 (CDT) (envelope-from mezz@ns1.mezzweb.com) Received: (from mezz@localhost) by ns1.mezzweb.com (8.12.9/8.12.9/Submit) id h9P7XcWp010624; Sat, 25 Oct 2003 02:33:38 -0500 (CDT) Message-Id: <200310250733.h9P7XcWp010624@ns1.mezzweb.com> Date: Sat, 25 Oct 2003 02:33:38 -0500 (CDT) From: Jeremy Messenger To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/58508: Maintainer update: deskutils/gdesklets, add a patch to fix the locale X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jeremy Messenger List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Oct 2003 08:00:38 -0000 >Number: 58508 >Category: ports >Synopsis: Maintainer update: deskutils/gdesklets, add a patch to fix the locale >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Oct 25 01:00:36 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Mezz >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD ns1.mezzweb.com 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 13 22:39:47 CDT 2003 mezz@mezz.mezzweb.com:/usr/obj/usr/src/sys/BSDROCKS i386 >Description: Add a patch to fix the locale, so bump the version (PORTREVISION). Submitted by: Fredrick Nilsson >How-To-Repeat: n/a >Fix: --- gdesklets.diff begins here --- diff -urN gdesklets.orig/Makefile gdesklets/Makefile --- gdesklets.orig/Makefile Sat Oct 18 00:51:26 2003 +++ gdesklets/Makefile Sat Oct 25 02:21:15 2003 @@ -7,6 +7,7 @@ PORTNAME= gdesklets PORTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= deskutils gnome MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/ DISTNAME= gDesklets-${PORTVERSION} diff -urN gdesklets.orig/files/patch-display::TargetLabel.py gdesklets/files/patch-display::TargetLabel.py --- gdesklets.orig/files/patch-display::TargetLabel.py Wed Dec 31 18:00:00 1969 +++ gdesklets/files/patch-display::TargetLabel.py Sat Oct 25 02:21:15 2003 @@ -0,0 +1,17 @@ +--- display/TargetLabel.py.orig Sat Oct 25 02:15:56 2003 ++++ display/TargetLabel.py Sat Oct 25 02:21:05 2003 +@@ -76,7 +76,14 @@ + + # determine the locale + import commands ++import string + fail, CHARMAP = commands.getstatusoutput("locale charmap") ++if (fail or not CHARMAP): ++ fail, CHARMAP = commands.getstatusoutput("echo $MM_CHARSET") ++ if (fail or not CHARMAP): ++ fail, CHARMAP = commands.getstatusoutput("echo $LANG") ++ CHARMAP = CHARMAP[string.find(CHARMAP, ".")+1:len(CHARMAP)] ++ + if (fail or not CHARMAP): + print "Could not detect character encoding." + CHARMAP = "ASCII" --- gdesklets.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: