From owner-svn-ports-head@freebsd.org Fri Oct 14 14:26:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C29BC115DB; Fri, 14 Oct 2016 14:26:36 +0000 (UTC) (envelope-from dbn@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 mx1.freebsd.org (Postfix) with ESMTPS id 3C801FCA; Fri, 14 Oct 2016 14:26:36 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9EEQZBJ027482; Fri, 14 Oct 2016 14:26:35 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9EEQYbX027476; Fri, 14 Oct 2016 14:26:34 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201610141426.u9EEQYbX027476@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Fri, 14 Oct 2016 14:26:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423971 - in head/lang/pypy3: . files 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.23 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: Fri, 14 Oct 2016 14:26:36 -0000 Author: dbn Date: Fri Oct 14 14:26:34 2016 New Revision: 423971 URL: https://svnweb.freebsd.org/changeset/ports/423971 Log: lang/pypy3: update to 5.5.0 - Remove pacthes that have been upstreamed - Fix detection of 'struct winsize' - Correctly handle case when ftime(3) is not used (depreciated) Added: head/lang/pypy3/files/patch-rpython_rlib_rposix.py (contents, props changed) Deleted: head/lang/pypy3/files/patch-pypy_module___cffi__backend_misc.py head/lang/pypy3/files/patch-pypy_module___posixsubprocess_interp__subprocess.py head/lang/pypy3/files/patch-rpython_rlib_rvmprof_src_vmprof__config.h head/lang/pypy3/files/patch-rpython_translator_c_src_precommondefs.h Modified: head/lang/pypy3/Makefile head/lang/pypy3/distinfo head/lang/pypy3/files/patch-pypy_module_time_interp__time.py head/lang/pypy3/pkg-plist Modified: head/lang/pypy3/Makefile ============================================================================== --- head/lang/pypy3/Makefile Fri Oct 14 14:22:20 2016 (r423970) +++ head/lang/pypy3/Makefile Fri Oct 14 14:26:34 2016 (r423971) @@ -2,15 +2,16 @@ # $FreeBSD$ PORTNAME= pypy3 -DISTVERSION= 5.2.0-alpha1 +DISTVERSION= 5.5.0-alpha DISTNAME= ${PORTNAME}.3-v${DISTVERSION}-src MASTERDIR= ${.CURDIR}/../pypy -BUILD_WRKSRC?= ${WRKDIR}/build/usession-release-pypy3.3-v5.2-0/testing_1 +WRKSRC= ${WRKDIR}/${PORTNAME}-v${DISTVERSION:C/-.*//}-src +BUILD_WRKSRC?= ${WRKDIR}/build/usession-release-${PORTNAME}.3-${DISTVERSION:C/-.*//}-0/testing_1 PACKAGE_ARGS= --without-_gdbm --without-sqlite3 --without-tk -PYPY_CFFI_VER= pypy3-52 +PYPY_CFFI_VER= pypy3-55 .include "${MASTERDIR}/Makefile" Modified: head/lang/pypy3/distinfo ============================================================================== --- head/lang/pypy3/distinfo Fri Oct 14 14:22:20 2016 (r423970) +++ head/lang/pypy3/distinfo Fri Oct 14 14:26:34 2016 (r423971) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468995102 -SHA256 (pypy3.3-v5.2.0-alpha1-src.tar.bz2) = 344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426 -SIZE (pypy3.3-v5.2.0-alpha1-src.tar.bz2) = 24390595 +TIMESTAMP = 1476288077 +SHA256 (pypy3.3-v5.5.0-alpha-src.tar.bz2) = d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f +SIZE (pypy3.3-v5.5.0-alpha-src.tar.bz2) = 25122033 Modified: head/lang/pypy3/files/patch-pypy_module_time_interp__time.py ============================================================================== --- head/lang/pypy3/files/patch-pypy_module_time_interp__time.py Fri Oct 14 14:22:20 2016 (r423970) +++ head/lang/pypy3/files/patch-pypy_module_time_interp__time.py Fri Oct 14 14:26:34 2016 (r423971) @@ -1,46 +1,22 @@ ---- pypy/module/time/interp_time.py.orig 2016-05-29 20:38:19 UTC +--- pypy/module/time/interp_time.py.orig 2016-10-12 19:05:22 UTC +++ pypy/module/time/interp_time.py -@@ -4,6 +4,7 @@ from pypy.interpreter.error import Opera +@@ -4,8 +4,7 @@ from pypy.interpreter.error import Opera from pypy.interpreter.gateway import unwrap_spec from rpython.rtyper.lltypesystem import lltype - from rpython.rlib.rarithmetic import intmask -+from rpython.rlib.rposix import CLOCK_T as clock_t - from rpython.rlib.rtime import win_perf_counter + from rpython.rlib.rarithmetic import intmask, r_ulonglong, r_longfloat, widen +-from rpython.rlib.rtime import (TIMEB, c_ftime, +- GETTIMEOFDAY_NO_TZ, TIMEVAL, ++from rpython.rlib.rtime import (GETTIMEOFDAY_NO_TZ, TIMEVAL, + HAVE_GETTIMEOFDAY, HAVE_FTIME) from rpython.rlib import rposix, rtime from rpython.translator.tool.cbuild import ExternalCompilationInfo -@@ -147,7 +148,6 @@ class CConfig: - libraries=rtime.libraries - ) - CLOCKS_PER_SEC = platform.ConstantInteger("CLOCKS_PER_SEC") -- clock_t = platform.SimpleType("clock_t", rffi.ULONG) - has_gettimeofday = platform.Has('gettimeofday') - has_clock_gettime = platform.Has('clock_gettime') - CLOCK_PROF = platform.DefinedConstantInteger('CLOCK_PROF') -@@ -224,7 +224,6 @@ if _POSIX: +@@ -14,6 +13,9 @@ import os + import sys + import time as pytime - CLOCKS_PER_SEC = cConfig.CLOCKS_PER_SEC - HAS_CLOCK_GETTIME = cConfig.has_clock_gettime --clock_t = cConfig.clock_t - tm = cConfig.tm - glob_buf = lltype.malloc(tm, flavor='raw', zero=True, immortal=True) - -@@ -966,7 +965,9 @@ else: - with lltype.scoped_alloc(rposix.TMS) as tms: - ret = rposix.c_times(tms) - if rffi.cast(lltype.Signed, ret) != -1: -- cpu_time = float(tms.c_tms_utime + tms.c_tms_stime) -+ c_tms_utime = rffi.cast(lltype.Signed, tms.c_tms_utime) -+ c_tms_stime = rffi.cast(lltype.Signed, tms.c_tms_stime) -+ cpu_time = float(c_tms_utime + c_tms_stime) - if w_info is not None: - _setinfo(space, w_info, "times()", - 1.0 / rposix.CLOCK_TICKS_PER_SECOND, -@@ -993,7 +994,7 @@ else: - records.""" - value = _clock() - # Is this casting correct? -- if value == rffi.cast(clock_t, -1): -+ if intmask(value) == intmask(rffi.cast(clock_t, -1)): - raise oefmt(space.w_RuntimeError, - "the processor time used is not available or its value" - "cannot be represented") ++if HAVE_FTIME: ++ from rpython.rlib.rtime import TIMEB, c_ftime ++ + _POSIX = os.name == "posix" + _WIN = os.name == "nt" + _MACOSX = sys.platform == "darwin" Added: head/lang/pypy3/files/patch-rpython_rlib_rposix.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy3/files/patch-rpython_rlib_rposix.py Fri Oct 14 14:26:34 2016 (r423971) @@ -0,0 +1,11 @@ +--- rpython/rlib/rposix.py.orig 2016-10-08 20:52:00 UTC ++++ rpython/rlib/rposix.py +@@ -233,7 +233,7 @@ else: + else: + _ptyh = 'pty.h' + includes = ['unistd.h', 'sys/types.h', 'sys/wait.h', +- 'utime.h', 'sys/time.h', 'sys/times.h', ++ 'utime.h', 'sys/time.h', 'sys/times.h', 'sys/ttycom.h', + 'grp.h', 'dirent.h', 'sys/stat.h', 'fcntl.h', + 'signal.h', 'sys/utsname.h', _ptyh] + libraries = ['util'] Modified: head/lang/pypy3/pkg-plist ============================================================================== --- head/lang/pypy3/pkg-plist Fri Oct 14 14:22:20 2016 (r423970) +++ head/lang/pypy3/pkg-plist Fri Oct 14 14:26:34 2016 (r423971) @@ -9,7 +9,9 @@ bin/pypy3 %%PYPY_DIR%%/include/README %%PYPY_DIR%%/include/abstract.h %%PYPY_DIR%%/include/boolobject.h +%%PYPY_DIR%%/include/bytearrayobject.h %%PYPY_DIR%%/include/bytesobject.h +%%PYPY_DIR%%/include/cStringIO.h %%PYPY_DIR%%/include/ceval.h %%PYPY_DIR%%/include/code.h %%PYPY_DIR%%/include/compile.h @@ -1918,6 +1920,8 @@ bin/pypy3 %%PYPY_DIR%%/lib_pypy/_pypy_irc_topic.py %%PYPY_DIR%%/lib_pypy/_pypy_testcapi.py %%PYPY_DIR%%/lib_pypy/_pypy_wait.py +%%PYPY_DIR%%/lib_pypy/_pypy_winbase_build.py +%%PYPY_DIR%%/lib_pypy/_pypy_winbase_cffi.py %%PYPY_DIR%%/lib_pypy/_resource_build.py %%PYPY_DIR%%/lib_pypy/_resource_cffi.%%PYPY_CFFI_VER%%.so %%PYPY_DIR%%/lib_pypy/_scproxy.py