From owner-svn-ports-head@FreeBSD.ORG  Sat May 31 08:14:25 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B75E62E;
 Sat, 31 May 2014 08:14:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ED51D22B4;
 Sat, 31 May 2014 08:14:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4V8EO76079326;
 Sat, 31 May 2014 08:14:24 GMT (envelope-from mva@svn.freebsd.org)
Received: (from mva@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4V8EOYN079325;
 Sat, 31 May 2014 08:14:24 GMT (envelope-from mva@svn.freebsd.org)
Message-Id: <201405310814.s4V8EOYN079325@svn.freebsd.org>
From: Marcus von Appen <mva@FreeBSD.org>
Date: Sat, 31 May 2014 08:14:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355942 - head/Mk
X-SVN-Group: ports-head
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2014 08:14:25 -0000

Author: mva
Date: Sat May 31 08:14:24 2014
New Revision: 355942
URL: http://svnweb.freebsd.org/changeset/ports/355942
QAT: https://qat.redports.org/buildarchive/r355942/

Log:
  Handle non-ASCII encoded setup.py files properly, if the locale of the
  execution environment does not match the encoding of the setup.py file. Simply
  read everything in as binary data without trying to convert it to the matching
  locale.

Modified:
  head/Mk/bsd.python.mk

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Sat May 31 07:12:10 2014	(r355941)
+++ head/Mk/bsd.python.mk	Sat May 31 08:14:24 2014	(r355942)
@@ -494,7 +494,7 @@ post-install: stage-python-compileall
 
 # distutils support
 PYSETUP?=				setup.py
-PYDISTUTILS_SETUP?=	-c "import setuptools; __file__='${PYSETUP}'; exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))"
+PYDISTUTILS_SETUP?=	-c "import setuptools; __file__='${PYSETUP}'; exec(compile(open(__file__, 'rb').read().replace(b'\\r\\n', b'\\n'), __file__, 'exec'))"
 PYDISTUTILS_CONFIGUREARGS?=
 PYDISTUTILS_BUILDARGS?=
 PYDISTUTILS_INSTALLARGS?=	-c -O1 --prefix=${PREFIX}