From owner-svn-ports-head@freebsd.org Mon Jun 11 22:57:27 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D6721009FF3; Mon, 11 Jun 2018 22:57:27 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C7939836B9; Mon, 11 Jun 2018 22:57:26 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8CE321D86; Mon, 11 Jun 2018 22:57:26 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5BMvQZ4049911; Mon, 11 Jun 2018 22:57:26 GMT (envelope-from shurd@FreeBSD.org) Received: (from shurd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5BMvQq7049909; Mon, 11 Jun 2018 22:57:26 GMT (envelope-from shurd@FreeBSD.org) Message-Id: <201806112257.w5BMvQq7049909@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: shurd set sender to shurd@FreeBSD.org using -f From: Stephen Hurd Date: Mon, 11 Jun 2018 22:57:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472215 - in head/comms/quisk: . files X-SVN-Group: ports-head X-SVN-Commit-Author: shurd X-SVN-Commit-Paths: in head/comms/quisk: . files X-SVN-Commit-Revision: 472215 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 22:57:27 -0000 Author: shurd Date: Mon Jun 11 22:57:26 2018 New Revision: 472215 URL: https://svnweb.freebsd.org/changeset/ports/472215 Log: Much better way to ensure a UTF-8 CODESET in the locale No longer force language or country codes, always call setlocale() Modified: head/comms/quisk/Makefile head/comms/quisk/files/patch-quisk.py Modified: head/comms/quisk/Makefile ============================================================================== --- head/comms/quisk/Makefile Mon Jun 11 22:57:11 2018 (r472214) +++ head/comms/quisk/Makefile Mon Jun 11 22:57:26 2018 (r472215) @@ -3,7 +3,7 @@ PORTNAME= quisk PORTVERSION= 4.1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://james.ahlstrom.name/quisk/ \ LOCAL/db Modified: head/comms/quisk/files/patch-quisk.py ============================================================================== --- head/comms/quisk/files/patch-quisk.py Mon Jun 11 22:57:11 2018 (r472214) +++ head/comms/quisk/files/patch-quisk.py Mon Jun 11 22:57:26 2018 (r472215) @@ -1,13 +1,15 @@ ---- quisk.py.orig 2018-06-11 21:58:22 UTC +--- quisk.py.orig 2016-11-30 18:26:59 UTC +++ quisk.py -@@ -21,6 +21,11 @@ os.chdir(os.path.normpath(os.path.dirnam +@@ -21,6 +21,13 @@ os.chdir(os.path.normpath(os.path.dirnam if sys.path[0] != "'.'": # Make sure the current working directory is on path sys.path.insert(0, '.') +# Hack to ensure unicode is available. +import locale -+if locale.nl_langinfo(locale.CODESET) == 'US-ASCII': -+ locale.setlocale(locale.LC_ALL, 'en_US.UTF-8') ++locale.setlocal(locale.LC_ALL, '') ++cloc = locale.getdefaultlocale() ++if locale.nl_langinfo(locale.CODESET) != 'UTF-8': ++ locale.setlocale(locale.LC_ALL, (cloc[0], 'UTF-8')) + import wxversion # Thanks to Mario, DH5YM wxversion.ensureMinimal('2.8')