From owner-svn-ports-all@FreeBSD.ORG Mon May 18 18:56:29 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BEE851FE; Mon, 18 May 2015 18:56:29 +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 AB2EC141A; Mon, 18 May 2015 18:56:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IIuT0O067035; Mon, 18 May 2015 18:56:29 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IIuR9A067014; Mon, 18 May 2015 18:56:27 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201505181856.t4IIuR9A067014@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Mon, 18 May 2015 18:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386702 - in head: . lang lang/pypy lang/pypy-devel lang/pypy/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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 18:56:30 -0000 Author: dbn Date: Mon May 18 18:56:27 2015 New Revision: 386702 URL: https://svnweb.freebsd.org/changeset/ports/386702 Log: lang/pypy: update to 2.5.1 Changes: * Merge pypy-devel into pypy * Drop pypy-devel (was intended to track pypy-current but no automated process was implemented) * Drop upstreamed patches PR: 199790 Deleted: head/lang/pypy-devel/ head/lang/pypy/files/patch-lib_pypy___sqlite3.py Modified: head/MOVED head/lang/Makefile head/lang/pypy/Makefile head/lang/pypy/distinfo head/lang/pypy/files/Makefile head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py head/lang/pypy/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Mon May 18 18:53:55 2015 (r386701) +++ head/MOVED Mon May 18 18:56:27 2015 (r386702) @@ -7582,3 +7582,4 @@ archivers/lz4|archivers/liblz4|2015-05-0 deskutils/libopensync-plugin-python||2015-05-09|Has expired: Unfetchable, devices are not produced anymore deskutils/msynctool||2015-05-09|Has expired: Unfetchable, devices are not produced anymore devel/ruby-flexmock|devel/rubygem-flexmock|2015-05-10|Rename to match our rubygems naming +lang/pypy-devel|lang/pypy|2015-05-17|Superseded by lang/pypy Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon May 18 18:53:55 2015 (r386701) +++ head/lang/Makefile Mon May 18 18:56:27 2015 (r386702) @@ -244,7 +244,6 @@ SUBDIR += py-mx-base SUBDIR += py-prolog SUBDIR += pypy - SUBDIR += pypy-devel SUBDIR += pypy3-devel SUBDIR += python SUBDIR += python-doc-html Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Mon May 18 18:53:55 2015 (r386701) +++ head/lang/pypy/Makefile Mon May 18 18:56:27 2015 (r386702) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pypy -DISTVERSION= 2.4.0 +DISTVERSION= 2.5.1 CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy DISTNAME= release-${DISTVERSION} @@ -16,7 +16,8 @@ LICENSE_COMB= multi LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libffi.so:${PORTSDIR}/devel/libffi \ - libsqlite3.so:${PORTSDIR}/databases/sqlite3 + libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ + libgdbm.so:${PORTSDIR}/databases/gdbm PYTHON_DESC= Use Python-2.7 to translate (slowest) PYPY_DESC= Use PyPy to translate (fastest, highest memory usage) @@ -43,7 +44,7 @@ USES= compiler:c11 gettext iconv tar:bz MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -WRKSRC= ${WRKDIR}/pypy-pypy-c6ad44ecf5d8 +WRKSRC= ${WRKDIR}/pypy-pypy-e3d046c43451 PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYTHON_IMPL_VER= 2.7 @@ -236,8 +237,8 @@ do-configure: post-build: # UPDATING: check pypy/tool/release/package.py for list of cffi modules -.for mod in _sqlite3 _curses syslog - ${SETENV} ${MAKE_ENV} ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' +.for mod in _sqlite3 _curses syslog gdbm + ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKDIR}:${LD_LIBRARY_PATH} ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' .endfor ${STRIP_CMD} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/__pycache__/_cffi__*.pypy-${PYPY_VER:C/\.//}.so .for _path in ${PYPYDIRS} @@ -254,7 +255,7 @@ post-build: do-install: .for _path in ${PYPYDIRS} - ${RM} -f ${STAGEDIR}${PREFIX}/${_path:C/.*://} + ${RM} -r ${STAGEDIR}${PREFIX}/${_path:C/.*://} (cd ${WRKSRC}/${_path:C/:.*//}; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${_path:C/.*://}) .endfor .for name in ${PYPY_NAMES:O} @@ -262,6 +263,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKDIR}/${name} ${STAGEDIR}${PREFIX}/bin/${name}-${PYPY_VER} ${ECHO} bin/${name}-${PYPY_VER} >> ${TMPPLIST} .endfor + ${INSTALL_LIB} ${WRKDIR}/libpypy-c.so ${STAGEDIR}${PREFIX}/lib/ test: patch .for inst in ${PYPY_INST} @@ -270,10 +272,11 @@ test: patch .endfor pkg-plist: build - ${RM} -f ${WRKDIR}/.plist-files-gen ${WRKDIR}/.plist-dirs-gen + ${RM} ${WRKDIR}/.plist-files-gen ${WRKDIR}/.plist-dirs-gen .for path in ${PYPYDIRS} cd ${WRKDIR} && ${FIND} ${path:C/.*://}/ -type f >> ${WRKDIR}/.plist-files-gen .endfor + ${ECHO} lib/libpypy-c.so >> ${WRKDIR}/.plist-files-gen ${REINPLACE_CMD} -e 's|^${PYPY_LIBDIR}|%%PYPY_LIBDIR%%|g' \ -e 's|^${PYPY_INCLUDEDIR}|%%PYPY_INCLUDEDIR%%|g' \ -e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|g' \ Modified: head/lang/pypy/distinfo ============================================================================== --- head/lang/pypy/distinfo Mon May 18 18:53:55 2015 (r386701) +++ head/lang/pypy/distinfo Mon May 18 18:56:27 2015 (r386702) @@ -1,2 +1,2 @@ -SHA256 (pypy/release-2.4.0.tar.bz2) = 7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2 -SIZE (pypy/release-2.4.0.tar.bz2) = 15390145 +SHA256 (pypy/release-2.5.1.tar.bz2) = 32b33d407797f78d9453c81f2066c981501beddc17eaf8f7bcdc1798017bf03f +SIZE (pypy/release-2.5.1.tar.bz2) = 16509234 Modified: head/lang/pypy/files/Makefile ============================================================================== --- head/lang/pypy/files/Makefile Mon May 18 18:53:55 2015 (r386701) +++ head/lang/pypy/files/Makefile Mon May 18 18:56:27 2015 (r386702) @@ -28,6 +28,7 @@ BUILDDIR= usession-release-${DISTVERSION ${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/pypy-c ${CP} build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/pypy-c \ ${PYPY_${inst}_NAME} + -${CP} build_${PYPY_${inst}_NAME}/${BUILDDIR}/testing_1/libpypy-c.so . .done_translate_${PYPY_${inst}_NAME}: ${RM} -rf build_${PYPY_${inst}_NAME} Modified: head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py ============================================================================== --- head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py Mon May 18 18:53:55 2015 (r386701) +++ head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py Mon May 18 18:56:27 2015 (r386702) @@ -18,7 +18,7 @@ @@ -56,10 +59,10 @@ return Dir({ 'bin': Dir({ - 'pypy-c': RealFile(self.executable), + 'pypy-c': RealFile(self.executable, mode=0111), - 'lib-python': RealDir(os.path.join(libroot, 'lib-python'), - exclude=exclude), - 'lib_pypy': RealDir(os.path.join(libroot, 'lib_pypy'), Modified: head/lang/pypy/pkg-plist ============================================================================== --- head/lang/pypy/pkg-plist Mon May 18 18:53:55 2015 (r386701) +++ head/lang/pypy/pkg-plist Mon May 18 18:56:27 2015 (r386702) @@ -24,8 +24,11 @@ %%PYPY_INCLUDEDIR%%/methodobject.h %%PYPY_INCLUDEDIR%%/missing.h %%PYPY_INCLUDEDIR%%/modsupport.h +%%PYPY_INCLUDEDIR%%/numpy/__multiarray_api.h %%PYPY_INCLUDEDIR%%/numpy/arrayobject.h +%%PYPY_INCLUDEDIR%%/numpy/ndarraytypes.h %%PYPY_INCLUDEDIR%%/numpy/npy_3kcompat.h +%%PYPY_INCLUDEDIR%%/numpy/npy_common.h %%PYPY_INCLUDEDIR%%/numpy/old_defines.h %%PYPY_INCLUDEDIR%%/object.h %%PYPY_INCLUDEDIR%%/patchlevel.h @@ -953,6 +956,14 @@ %%PYPY_LIBDIR%%/encodings/uu_codec.pyc %%PYPY_LIBDIR%%/encodings/zlib_codec.py %%PYPY_LIBDIR%%/encodings/zlib_codec.pyc +%%PYPY_LIBDIR%%/ensurepip/__init__.py +%%PYPY_LIBDIR%%/ensurepip/__init__.pyc +%%PYPY_LIBDIR%%/ensurepip/__main__.py +%%PYPY_LIBDIR%%/ensurepip/__main__.pyc +%%PYPY_LIBDIR%%/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl +%%PYPY_LIBDIR%%/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +%%PYPY_LIBDIR%%/ensurepip/_uninstall.py +%%PYPY_LIBDIR%%/ensurepip/_uninstall.pyc %%PYPY_LIBDIR%%/filecmp.py %%PYPY_LIBDIR%%/filecmp.pyc %%PYPY_LIBDIR%%/fileinput.py @@ -1148,6 +1159,8 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/test_calltips.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_config_name.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_config_name.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_configdialog.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_configdialog.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_delegator.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_delegator.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_formatparagraph.py @@ -1164,6 +1177,8 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/test_pathbrowser.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_rstrip.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_rstrip.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_searchdialogbase.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_searchdialogbase.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_searchengine.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_searchengine.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_text.py @@ -1172,6 +1187,8 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/test_textview.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_warning.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_warning.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_widgetredir.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_widgetredir.pyc %%PYPY_LIBDIR%%/idlelib/idlever.py %%PYPY_LIBDIR%%/idlelib/idlever.pyc %%PYPY_LIBDIR%%/idlelib/keybindingDialog.py @@ -1275,6 +1292,8 @@ %%PYPY_LIBDIR%%/lib-tk/test/runtktests.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/__init__.py %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/__init__.pyc +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_font.py +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_font.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_geometry_managers.py %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_geometry_managers.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_images.py @@ -1335,6 +1354,8 @@ %%PYPY_LIBDIR%%/lib2to3/fixes/__init__.pyc %%PYPY_LIBDIR%%/lib2to3/fixes/fix_apply.py %%PYPY_LIBDIR%%/lib2to3/fixes/fix_apply.pyc +%%PYPY_LIBDIR%%/lib2to3/fixes/fix_asserts.py +%%PYPY_LIBDIR%%/lib2to3/fixes/fix_asserts.pyc %%PYPY_LIBDIR%%/lib2to3/fixes/fix_basestring.py %%PYPY_LIBDIR%%/lib2to3/fixes/fix_basestring.pyc %%PYPY_LIBDIR%%/lib2to3/fixes/fix_buffer.py @@ -1520,6 +1541,7 @@ %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g29b85a97xace1544d.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g5ebcbb41x576c1bb2.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g82f9edffx359e5476.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gc44ee2dbx4b91c023.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py @@ -2493,6 +2515,8 @@ %%PYPY_LIBDIR%%/test/Sine-1000Hz-300ms.aif %%PYPY_LIBDIR%%/test/__init__.py %%PYPY_LIBDIR%%/test/__init__.pyc +%%PYPY_LIBDIR%%/test/_mock_backport.py +%%PYPY_LIBDIR%%/test/_mock_backport.pyc %%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.aiff %%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.au %%PYPY_LIBDIR%%/test/audiodata/pluck-pcm16.wav @@ -2526,6 +2550,10 @@ %%PYPY_LIBDIR%%/test/badsyntax_nocaret.py %%PYPY_LIBDIR%%/test/buffer_tests.py %%PYPY_LIBDIR%%/test/buffer_tests.pyc +%%PYPY_LIBDIR%%/test/capath/4e1295a3.0 +%%PYPY_LIBDIR%%/test/capath/5ed36f99.0 +%%PYPY_LIBDIR%%/test/capath/6e88d7b8.0 +%%PYPY_LIBDIR%%/test/capath/99d0fa06.0 %%PYPY_LIBDIR%%/test/cfgparser.1 %%PYPY_LIBDIR%%/test/check_soundcard.vbs %%PYPY_LIBDIR%%/test/cjkencodings/big5-utf8.txt @@ -2734,6 +2762,7 @@ %%PYPY_LIBDIR%%/test/decimaltestdata/tointegral.decTest %%PYPY_LIBDIR%%/test/decimaltestdata/tointegralx.decTest %%PYPY_LIBDIR%%/test/decimaltestdata/xor.decTest +%%PYPY_LIBDIR%%/test/dh512.pem %%PYPY_LIBDIR%%/test/doctest_aliases.py %%PYPY_LIBDIR%%/test/doctest_aliases.pyc %%PYPY_LIBDIR%%/test/double_const.py @@ -2766,7 +2795,11 @@ %%PYPY_LIBDIR%%/test/inspect_fodder.pyc %%PYPY_LIBDIR%%/test/inspect_fodder2.py %%PYPY_LIBDIR%%/test/inspect_fodder2.pyc +%%PYPY_LIBDIR%%/test/keycert.passwd.pem %%PYPY_LIBDIR%%/test/keycert.pem +%%PYPY_LIBDIR%%/test/keycert2.pem +%%PYPY_LIBDIR%%/test/keycert3.pem +%%PYPY_LIBDIR%%/test/keycert4.pem %%PYPY_LIBDIR%%/test/leakers/README.txt %%PYPY_LIBDIR%%/test/leakers/__init__.py %%PYPY_LIBDIR%%/test/leakers/__init__.pyc @@ -2782,6 +2815,8 @@ %%PYPY_LIBDIR%%/test/list_tests.pyc %%PYPY_LIBDIR%%/test/lock_tests.py %%PYPY_LIBDIR%%/test/lock_tests.pyc +%%PYPY_LIBDIR%%/test/make_ssl_certs.py +%%PYPY_LIBDIR%%/test/make_ssl_certs.pyc %%PYPY_LIBDIR%%/test/mapping_tests.py %%PYPY_LIBDIR%%/test/mapping_tests.pyc %%PYPY_LIBDIR%%/test/math_testcases.txt @@ -2796,6 +2831,7 @@ %%PYPY_LIBDIR%%/test/pickletester.pyc %%PYPY_LIBDIR%%/test/profilee.py %%PYPY_LIBDIR%%/test/profilee.pyc +%%PYPY_LIBDIR%%/test/pycacert.pem %%PYPY_LIBDIR%%/test/pyclbr_input.py %%PYPY_LIBDIR%%/test/pyclbr_input.pyc %%PYPY_LIBDIR%%/test/pydoc_mod.py @@ -2815,6 +2851,7 @@ %%PYPY_LIBDIR%%/test/relimport.pyc %%PYPY_LIBDIR%%/test/reperf.py %%PYPY_LIBDIR%%/test/reperf.pyc +%%PYPY_LIBDIR%%/test/revocation.crl %%PYPY_LIBDIR%%/test/sample_doctest.py %%PYPY_LIBDIR%%/test/sample_doctest.pyc %%PYPY_LIBDIR%%/test/sample_doctest_no_docstrings.py @@ -2823,12 +2860,18 @@ %%PYPY_LIBDIR%%/test/sample_doctest_no_doctests.pyc %%PYPY_LIBDIR%%/test/script_helper.py %%PYPY_LIBDIR%%/test/script_helper.pyc +%%PYPY_LIBDIR%%/test/selfsigned_pythontestdotnet.pem %%PYPY_LIBDIR%%/test/seq_tests.py %%PYPY_LIBDIR%%/test/seq_tests.pyc %%PYPY_LIBDIR%%/test/sgml_input.html %%PYPY_LIBDIR%%/test/sha256.pem %%PYPY_LIBDIR%%/test/sortperf.py %%PYPY_LIBDIR%%/test/sortperf.pyc +%%PYPY_LIBDIR%%/test/ssl_cert.pem +%%PYPY_LIBDIR%%/test/ssl_key.passwd.pem +%%PYPY_LIBDIR%%/test/ssl_key.pem +%%PYPY_LIBDIR%%/test/ssl_servers.py +%%PYPY_LIBDIR%%/test/ssl_servers.pyc %%PYPY_LIBDIR%%/test/string_tests.py %%PYPY_LIBDIR%%/test/string_tests.pyc %%PYPY_LIBDIR%%/test/subprocessdata/sigchild_ignore.py @@ -3072,6 +3115,8 @@ %%PYPY_LIBDIR%%/test/test_email_codecs.pyc %%PYPY_LIBDIR%%/test/test_email_renamed.py %%PYPY_LIBDIR%%/test/test_email_renamed.pyc +%%PYPY_LIBDIR%%/test/test_ensurepip.py +%%PYPY_LIBDIR%%/test/test_ensurepip.pyc %%PYPY_LIBDIR%%/test/test_enumerate.py %%PYPY_LIBDIR%%/test/test_enumerate.pyc %%PYPY_LIBDIR%%/test/test_eof.py @@ -3834,3 +3879,4 @@ %%PYPY_LIBDIR%%/xmlrpclib.pyc %%PYPY_LIBDIR%%/zipfile.py %%PYPY_LIBDIR%%/zipfile.pyc +lib/libpypy-c.so