1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-04 06:15:24 +00:00

shells/xonsh: Upgrade to version 0.7.8

Changelog: https://github.com/xonsh/xonsh/blob/0.7.8/CHANGELOG.rst

PR:		230369
Submitted by:	Roberto Fernandez Cueto <roberfern@gmail.com> (maintainer)
Reported by:	Nathan <ndowens@yahoo.com>
Reviewed by:	krion, mat
Reviewed by:	Nathan <ndowens@yahoo.com> (previous version)
Reviewed by:	John Hein <z7dr6ut7gs@snkmail.com> (previous version)
Approved by:	krion (mentor)
Differential Revision:	https://reviews.freebsd.org/D17152
This commit is contained in:
Mateusz Piotrowski 2018-09-15 12:34:47 +00:00
parent ecbeb4d934
commit 83f0bf94f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=479833
4 changed files with 22 additions and 14 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xonsh
PORTVERSION= 0.6.0
PORTVERSION= 0.7.8
CATEGORIES= shells python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -10,6 +10,7 @@ MAINTAINER= roberfern@gmail.com
COMMENT= Python-ish BASH-wards shell
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/license
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}amalgamate>=0:devel/py-amalgamate@${PY_FLAVOR}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1511473787
SHA256 (xonsh-0.6.0.tar.gz) = 19aa4c075378aef8476b8b2cdb0bea6fa5e10933163de443b958fa485e0f6dc6
SIZE (xonsh-0.6.0.tar.gz) = 652164
TIMESTAMP = 1536835442
SHA256 (xonsh-0.7.8.tar.gz) = 956c7fbf19968afaade11fa5cb627a7f2c177a9e05f8cb03f7efa86b5fe4cb08
SIZE (xonsh-0.7.8.tar.gz) = 827000

View File

@ -1,11 +1,11 @@
--- xonsh/platform.py.orig 2017-03-12 02:36:40 UTC
--- xonsh/platform.py.orig 2018-09-05 14:16:47 UTC
+++ xonsh/platform.py
@@ -491,7 +491,7 @@ def LIBC():
libc = ctypes.CDLL('cygwin1.dll')
@@ -571,7 +571,7 @@ def LIBC():
libc = ctypes.CDLL("msys-2.0.dll")
elif ON_BSD:
try:
- libc = ctypes.CDLL('libc.so')
+ libc = ctypes.CDLL(ctypes.util.find_library("c"))
- libc = ctypes.CDLL("libc.so")
+ libc = ctypes.CDLL(ctypes.util.find_library("c"))
except AttributeError:
libc = None
except OSError:

View File

@ -1,11 +1,18 @@
--- xonsh/xoreutils/uptime.py.orig 2017-02-11 16:24:07 UTC
--- xonsh/xoreutils/uptime.py.orig 2018-09-05 14:16:47 UTC
+++ xonsh/xoreutils/uptime.py
@@ -100,7 +100,7 @@ def _uptime_bsd():
@@ -100,13 +100,13 @@ def _uptime_bsd():
return None
# Determine how much space we need for the response.
sz = ctypes.c_uint(0)
- xp.LIBC.sysctlbyname('kern.boottime', None, ctypes.byref(sz), None, 0)
+ xp.LIBC.sysctlbyname(b'kern.boottime', None, ctypes.byref(sz), None, 0)
if sz.value != struct.calcsize('@LL'):
- xp.LIBC.sysctlbyname("kern.boottime", None, ctypes.byref(sz), None, 0)
+ xp.LIBC.sysctlbyname(b"kern.boottime", None, ctypes.byref(sz), None, 0)
if sz.value != struct.calcsize("@LL"):
# Unexpected, let's give up.
return None
# For real now.
buf = ctypes.create_string_buffer(sz.value)
- xp.LIBC.sysctlbyname("kern.boottime", buf, ctypes.byref(sz), None, 0)
+ xp.LIBC.sysctlbyname(b"kern.boottime", buf, ctypes.byref(sz), None, 0)
sec, usec = struct.unpack_from("@LL", buf.raw)
# OS X disagrees what that second value is.
if usec > 1000000: