Date: Wed, 14 Jan 2015 18:28:28 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377034 - in head/lang: pypy pypy-devel pypy/files Message-ID: <201501141828.t0EISS2i034627@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Wed Jan 14 18:28:28 2015 New Revision: 377034 URL: https://svnweb.freebsd.org/changeset/ports/377034 QAT: https://qat.redports.org/buildarchive/r377034/ Log: Backport lang/pypy-devel to lang/pypy. Changes: - Update memory requires (less for pypy, more for python). Modified: head/lang/pypy-devel/Makefile head/lang/pypy/Makefile head/lang/pypy/distinfo head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py head/lang/pypy/pkg-plist Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy-devel/Makefile Wed Jan 14 18:19:32 2015 (r377033) +++ head/lang/pypy-devel/Makefile Wed Jan 14 18:28:28 2015 (r377034) @@ -143,26 +143,27 @@ PYPY_${inst}_OPT= 2 # .if ${PYPY_ARCH:M*64} . if ${PORT_OPTIONS:MPYPY} -# 64bit + pypy = 5.5 GiB -PYPY_TRANSLATION_MEMORY= 5803684 +# 64bit + pypy = 5.1 GiB +PYPY_TRANSLATION_MEMORY= 5347737 . elif ${PORT_OPTIONS:MPYPY_MINMEM} -# 64bit + pypy (minimum memory) = 3.3 GiB -PYPY_TRANSLATION_MEMORY= 3452308 +# 64bit + pypy (minimum memory) = 3.2 GiB +PYPY_TRANSLATION_MEMORY= 3355443 . else -# 64bit + python = 4.5 GiB -PYPY_TRANSLATION_MEMORY= 4716500 +# 64bit + python = 4.8 GiB +PYPY_TRANSLATION_MEMORY= 5033164 . endif # 64bit system += 366 MiB PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 374784)) .else . if ${PORT_OPTIONS:MPYPY} -# 32bit + pypy = 2.3GiB -PYPY_TRANSLATION_MEMORY= 2438856 +# 32bit + pypy = 2.2GiB +PYPY_TRANSLATION_MEMORY= 2306867 . elif ${PORT_OPTIONS:MPYPY_MINMEM} -# 32bit + pypy (minimum memory) = 2.0GiB -PYPY_TRANSLATION_MEMORY= 2120844 -# 32bit + python = 2.2 GiB -PYPY_TRANSLATION_MEMORY= 2286764 +# 32bit + pypy (minimum memory) = 1.9GiB +PYPY_TRANSLATION_MEMORY= 1992294 +. else +# 32bit + python = 2.5 GiB +PYPY_TRANSLATION_MEMORY= 2558588 . endif # 32bit system += 168 MiB PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 171787)) Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Wed Jan 14 18:19:32 2015 (r377033) +++ head/lang/pypy/Makefile Wed Jan 14 18:28:28 2015 (r377034) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pypy -DISTVERSION= 2.3.1 +DISTVERSION= 2.4.0 CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy DISTNAME= release-${DISTVERSION} @@ -43,7 +43,7 @@ USES= compiler:c11 gettext iconv tar:bz MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -WRKSRC= ${WRKDIR}/pypy-pypy-32f35069a16d +WRKSRC= ${WRKDIR}/pypy-pypy-c6ad44ecf5d8 PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYTHON_IMPL_VER= 2.7 @@ -142,26 +142,27 @@ PYPY_${inst}_OPT= 2 # .if ${PYPY_ARCH:M*64} . if ${PORT_OPTIONS:MPYPY} -# 64bit + pypy = 5.5 GiB -PYPY_TRANSLATION_MEMORY= 5803684 +# 64bit + pypy = 5.1 GiB +PYPY_TRANSLATION_MEMORY= 5347737 . elif ${PORT_OPTIONS:MPYPY_MINMEM} -# 64bit + pypy (minimum memory) = 3.3 GiB -PYPY_TRANSLATION_MEMORY= 3452308 +# 64bit + pypy (minimum memory) = 3.2 GiB +PYPY_TRANSLATION_MEMORY= 3355443 . else -# 64bit + python = 4.5 GiB -PYPY_TRANSLATION_MEMORY= 4716500 +# 64bit + python = 4.8 GiB +PYPY_TRANSLATION_MEMORY= 5033164 . endif # 64bit system += 366 MiB PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 374784)) .else . if ${PORT_OPTIONS:MPYPY} -# 32bit + pypy = 2.3GiB -PYPY_TRANSLATION_MEMORY= 2438856 +# 32bit + pypy = 2.2GiB +PYPY_TRANSLATION_MEMORY= 2306867 . elif ${PORT_OPTIONS:MPYPY_MINMEM} -# 32bit + pypy (minimum memory) = 2.0GiB -PYPY_TRANSLATION_MEMORY= 2120844 -# 32bit + python = 2.2 GiB -PYPY_TRANSLATION_MEMORY= 2286764 +# 32bit + pypy (minimum memory) = 1.9GiB +PYPY_TRANSLATION_MEMORY= 1992294 +. else +# 32bit + python = 2.5 GiB +PYPY_TRANSLATION_MEMORY= 2558588 . endif # 32bit system += 168 MiB PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 171787)) @@ -272,7 +273,6 @@ pkg-plist: build ${RM} -f ${WRKDIR}/.plist-files-gen ${WRKDIR}/.plist-dirs-gen .for path in ${PYPYDIRS} cd ${WRKDIR} && ${FIND} ${path:C/.*://}/ -type f >> ${WRKDIR}/.plist-files-gen - cd ${WRKDIR} && ${FIND} ${path:C/.*://}/ -type d | ${SED} 's|/$$||' >> ${WRKDIR}/.plist-dirs-gen .endfor ${REINPLACE_CMD} -e 's|^${PYPY_LIBDIR}|%%PYPY_LIBDIR%%|g' \ -e 's|^${PYPY_INCLUDEDIR}|%%PYPY_INCLUDEDIR%%|g' \ @@ -280,16 +280,7 @@ pkg-plist: build -e 's|_${PYPY_BITS}_|_%%PYPY_BITS%%_|g' \ -e 's|-${PYPY_VER:C/\.//}\.|-%%PYPY_VER%%.|g' \ ${WRKDIR}/.plist-files-gen - ${REINPLACE_CMD} -e 's|^${PYPY_LIBDIR}|@dirrm %%PYPY_LIBDIR%%|g' \ - -e 's|^${PYPY_INCLUDEDIR}|@dirrm %%PYPY_INCLUDEDIR%%|g' \ - ${WRKDIR}/.plist-dirs-gen ${SORT} ${WRKDIR}/.plist-files-gen > ${WRKDIR}/pkg-plist - ${SORT} -r ${WRKDIR}/.plist-dirs-gen >> ${WRKDIR}/pkg-plist - ${REINPLACE_CMD} \ - -e 's|^@dirrm %%PYPY_LIBDIR%%/site-packages$$|@dirrmtry %%PYPY_LIBDIR%%/site-packages|' \ - -e 's|^@dirrm %%PYPY_LIBDIR%%$$|@dirrmtry %%PYPY_LIBDIR%%|' \ - -e 's|^@dirrm %%PYPY_INCLUDEDIR%%$$|@dirrmtry %%PYPY_INCLUDEDIR%%|' \ - ${WRKDIR}/pkg-plist ${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist .include <bsd.port.mk> Modified: head/lang/pypy/distinfo ============================================================================== --- head/lang/pypy/distinfo Wed Jan 14 18:19:32 2015 (r377033) +++ head/lang/pypy/distinfo Wed Jan 14 18:28:28 2015 (r377034) @@ -1,2 +1,2 @@ -SHA256 (pypy/release-2.3.1.tar.bz2) = 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 -SIZE (pypy/release-2.3.1.tar.bz2) = 15225332 +SHA256 (pypy/release-2.4.0.tar.bz2) = 7e0dec2c40106f20f002121bdabb71939915254fb91bd55b01434e4b994113d2 +SIZE (pypy/release-2.4.0.tar.bz2) = 15390145 Modified: head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py ============================================================================== --- head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py Wed Jan 14 18:19:32 2015 (r377033) +++ head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py Wed Jan 14 18:28:28 2015 (r377034) @@ -4,10 +4,10 @@ 'data' : '{base}', }, 'pypy': { -- 'stdlib': '{base}/lib-python/{py_version_short}', -- 'platstdlib': '{base}/lib-python/{py_version_short}', -- 'purelib': '{base}/lib-python/{py_version_short}', -- 'platlib': '{base}/lib-python/{py_version_short}', +- 'stdlib': '{base}/lib-{implementation_lower}/{py_version_short}', +- 'platstdlib': '{base}/lib-{implementation_lower}/{py_version_short}', +- 'purelib': '{base}/lib-{implementation_lower}/{py_version_short}', +- 'platlib': '{base}/lib-{implementation_lower}/{py_version_short}', - 'include': '{base}/include', - 'platinclude': '{base}/include', + 'stdlib': '{base}/lib/pypy-{pypy_version_short}', Modified: head/lang/pypy/pkg-plist ============================================================================== --- head/lang/pypy/pkg-plist Wed Jan 14 18:19:32 2015 (r377033) +++ head/lang/pypy/pkg-plist Wed Jan 14 18:28:28 2015 (r377034) @@ -296,8 +296,6 @@ %%PYPY_LIBDIR%%/ctypes/test/test_checkretval.pyc %%PYPY_LIBDIR%%/ctypes/test/test_delattr.py %%PYPY_LIBDIR%%/ctypes/test/test_delattr.pyc -%%PYPY_LIBDIR%%/ctypes/test/test_errcheck.py -%%PYPY_LIBDIR%%/ctypes/test/test_errcheck.pyc %%PYPY_LIBDIR%%/ctypes/test/test_errno.py %%PYPY_LIBDIR%%/ctypes/test/test_errno.pyc %%PYPY_LIBDIR%%/ctypes/test/test_find.py @@ -312,8 +310,6 @@ %%PYPY_LIBDIR%%/ctypes/test/test_incomplete.pyc %%PYPY_LIBDIR%%/ctypes/test/test_init.py %%PYPY_LIBDIR%%/ctypes/test/test_init.pyc -%%PYPY_LIBDIR%%/ctypes/test/test_integers.py -%%PYPY_LIBDIR%%/ctypes/test/test_integers.pyc %%PYPY_LIBDIR%%/ctypes/test/test_internals.py %%PYPY_LIBDIR%%/ctypes/test/test_internals.pyc %%PYPY_LIBDIR%%/ctypes/test/test_keeprefs.py @@ -1044,6 +1040,13 @@ %%PYPY_LIBDIR%%/idlelib/IOBinding.pyc %%PYPY_LIBDIR%%/idlelib/Icons/folder.gif %%PYPY_LIBDIR%%/idlelib/Icons/idle.icns +%%PYPY_LIBDIR%%/idlelib/Icons/idle.ico +%%PYPY_LIBDIR%%/idlelib/Icons/idle_16.gif +%%PYPY_LIBDIR%%/idlelib/Icons/idle_16.png +%%PYPY_LIBDIR%%/idlelib/Icons/idle_32.gif +%%PYPY_LIBDIR%%/idlelib/Icons/idle_32.png +%%PYPY_LIBDIR%%/idlelib/Icons/idle_48.gif +%%PYPY_LIBDIR%%/idlelib/Icons/idle_48.png %%PYPY_LIBDIR%%/idlelib/Icons/minusnode.gif %%PYPY_LIBDIR%%/idlelib/Icons/openfolder.gif %%PYPY_LIBDIR%%/idlelib/Icons/plusnode.gif @@ -1131,10 +1134,16 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/README.txt %%PYPY_LIBDIR%%/idlelib/idle_test/__init__.py %%PYPY_LIBDIR%%/idlelib/idle_test/__init__.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/htest.py +%%PYPY_LIBDIR%%/idlelib/idle_test/htest.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/mock_idle.py %%PYPY_LIBDIR%%/idlelib/idle_test/mock_idle.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/mock_tk.py %%PYPY_LIBDIR%%/idlelib/idle_test/mock_tk.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_autocomplete.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_autocomplete.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_autoexpand.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_autoexpand.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_calltips.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_calltips.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_config_name.py @@ -1145,8 +1154,12 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/test_formatparagraph.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_grep.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_grep.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_hyperparser.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_hyperparser.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_idlehistory.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_idlehistory.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_parenmatch.py +%%PYPY_LIBDIR%%/idlelib/idle_test/test_parenmatch.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_pathbrowser.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_pathbrowser.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_rstrip.py @@ -1155,6 +1168,8 @@ %%PYPY_LIBDIR%%/idlelib/idle_test/test_searchengine.pyc %%PYPY_LIBDIR%%/idlelib/idle_test/test_text.py %%PYPY_LIBDIR%%/idlelib/idle_test/test_text.pyc +%%PYPY_LIBDIR%%/idlelib/idle_test/test_textview.py +%%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/idlever.py @@ -1260,10 +1275,18 @@ %%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_geometry_managers.py +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_geometry_managers.pyc +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_images.py +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_images.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.py %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_text.py %%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_text.pyc +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_variables.py +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_variables.pyc +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_widgets.py +%%PYPY_LIBDIR%%/lib-tk/test/test_tkinter/test_widgets.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/__init__.py %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/__init__.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/support.py @@ -1276,6 +1299,8 @@ %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/test_style.pyc %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/test_widgets.py %%PYPY_LIBDIR%%/lib-tk/test/test_ttk/test_widgets.pyc +%%PYPY_LIBDIR%%/lib-tk/test/widget_tests.py +%%PYPY_LIBDIR%%/lib-tk/test/widget_tests.pyc %%PYPY_LIBDIR%%/lib-tk/tkColorChooser.py %%PYPY_LIBDIR%%/lib-tk/tkColorChooser.pyc %%PYPY_LIBDIR%%/lib-tk/tkCommonDialog.py @@ -1492,9 +1517,9 @@ %%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc %%PYPY_LIBDIR%%/lib_pypy/__init__.py %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb0420b02x359e5476.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb1f15f1ex576c1bb2.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gf5132b8x39a3fadd.pypy-%%PYPY_VER%%.so +%%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/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py @@ -2488,6 +2513,7 @@ %%PYPY_LIBDIR%%/test/autotest.pyc %%PYPY_LIBDIR%%/test/bad_coding.py %%PYPY_LIBDIR%%/test/bad_coding2.py +%%PYPY_LIBDIR%%/test/bad_coding3.py %%PYPY_LIBDIR%%/test/badcert.pem %%PYPY_LIBDIR%%/test/badkey.pem %%PYPY_LIBDIR%%/test/badsyntax_future3.py @@ -2723,6 +2749,17 @@ %%PYPY_LIBDIR%%/test/greyrgb.uue %%PYPY_LIBDIR%%/test/https_svn_python_org_root.pem %%PYPY_LIBDIR%%/test/ieee754.txt +%%PYPY_LIBDIR%%/test/imghdrdata/python.bmp +%%PYPY_LIBDIR%%/test/imghdrdata/python.gif +%%PYPY_LIBDIR%%/test/imghdrdata/python.jpg +%%PYPY_LIBDIR%%/test/imghdrdata/python.pbm +%%PYPY_LIBDIR%%/test/imghdrdata/python.pgm +%%PYPY_LIBDIR%%/test/imghdrdata/python.png +%%PYPY_LIBDIR%%/test/imghdrdata/python.ppm +%%PYPY_LIBDIR%%/test/imghdrdata/python.ras +%%PYPY_LIBDIR%%/test/imghdrdata/python.sgi +%%PYPY_LIBDIR%%/test/imghdrdata/python.tiff +%%PYPY_LIBDIR%%/test/imghdrdata/python.xbm %%PYPY_LIBDIR%%/test/infinite_reload.py %%PYPY_LIBDIR%%/test/infinite_reload.pyc %%PYPY_LIBDIR%%/test/inspect_fodder.py @@ -3155,6 +3192,8 @@ %%PYPY_LIBDIR%%/test/test_imaplib.pyc %%PYPY_LIBDIR%%/test/test_imgfile.py %%PYPY_LIBDIR%%/test/test_imgfile.pyc +%%PYPY_LIBDIR%%/test/test_imghdr.py +%%PYPY_LIBDIR%%/test/test_imghdr.pyc %%PYPY_LIBDIR%%/test/test_imp.py %%PYPY_LIBDIR%%/test/test_imp.pyc %%PYPY_LIBDIR%%/test/test_import.py @@ -3417,6 +3456,8 @@ %%PYPY_LIBDIR%%/test/test_softspace.pyc %%PYPY_LIBDIR%%/test/test_sort.py %%PYPY_LIBDIR%%/test/test_sort.pyc +%%PYPY_LIBDIR%%/test/test_spwd.py +%%PYPY_LIBDIR%%/test/test_spwd.pyc %%PYPY_LIBDIR%%/test/test_sqlite.py %%PYPY_LIBDIR%%/test/test_sqlite.pyc %%PYPY_LIBDIR%%/test/test_ssl.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501141828.t0EISS2i034627>