7 files changed, 14 insertions, 48 deletions

diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 38887b1bbf88..f3f2c1e1a56b 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	pypy
-DISTVERSION?=	5.4.1	# Also update bsd.pypy.cffi.mk
-PORTREVISION?=	1
+DISTVERSION?=	5.6.0	# Also update bsd.pypy.cffi.mk
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/downloads/ http://buildbot.pypy.org/mirror/
 DISTNAME?=	${PORTNAME}2-v${PORTVERSION}-src
diff --git a/lang/pypy/bsd.pypy.cffi.mk b/lang/pypy/bsd.pypy.cffi.mk
index fc5cc2e649da..612f97168d65 100644
--- a/lang/pypy/bsd.pypy.cffi.mk
+++ b/lang/pypy/bsd.pypy.cffi.mk
@@ -10,7 +10,7 @@ PLIST_FILES=	%%PYPY_DIR%%/lib_pypy/${CFFI_MODULE}_cffi.%%PYPY_CFFI_VER%%.so
 
 CFFI_MODULE?=	_${PORTNAME}
 
-PYTHON_PORTVERSION?=	5.4.1
+PYTHON_PORTVERSION?=	5.6.0
 PYTHON_PKGNAMEPREFIX=	pypy-
 PYTHON_CMD=	${LOCALBASE}/bin/pypy
 
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 2f9aad399fab..c077fd1571e0 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473534996
-SHA256 (pypy2-v5.4.1-src.tar.bz2) = 45dbc50c81498f6f1067201b8fc887074b43b84ee32cc47f15e7db17571e9352
-SIZE (pypy2-v5.4.1-src.tar.bz2) = 17412285
+TIMESTAMP = 1479534904
+SHA256 (pypy2-v5.6.0-src.tar.bz2) = 7411448045f77eb9e087afdce66fe7eafda1876c9e17aad88cf891f762b608b0
+SIZE (pypy2-v5.6.0-src.tar.bz2) = 18388539
diff --git a/lang/pypy/files/patch-rpython_jit_backend_detect__cpu.py b/lang/pypy/files/patch-rpython_jit_backend_detect__cpu.py
deleted file mode 100644
index 26dd2cb4238e..000000000000
--- a/lang/pypy/files/patch-rpython_jit_backend_detect__cpu.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpython/jit/backend/detect_cpu.py.orig	2016-06-14 07:46:04 UTC
-+++ rpython/jit/backend/detect_cpu.py
-@@ -61,6 +61,7 @@ def detect_model_from_host_platform():
-             'i86pc': MODEL_X86,    # Solaris/Intel
-             'x86': MODEL_X86,      # Apple
-             'Power Macintosh': MODEL_PPC_64,
-+            'powerpc': MODEL_PPC_64, # freebsd
-             'ppc64': MODEL_PPC_64,
-             'ppc64le': MODEL_PPC_64,
-             'x86_64': MODEL_X86,
diff --git a/lang/pypy/files/patch-rpython_translator_c_src_asm.c b/lang/pypy/files/patch-rpython_translator_c_src_asm.c
deleted file mode 100644
index 50d2c7102882..000000000000
--- a/lang/pypy/files/patch-rpython_translator_c_src_asm.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- rpython/translator/c/src/asm.c.orig	2016-06-14 07:46:04 UTC
-+++ rpython/translator/c/src/asm.c
-@@ -8,10 +8,6 @@
- /* #  include "src/asm_gcc_x86_64.c" */
- #endif
- 
--#if defined(__GNUC__) && defined(__ppc__)
--#  include "src/asm_ppc.c"
--#endif
--
- #if defined(_MSC_VER)
- #  include "src/asm_msvc.c"
- #endif
diff --git a/lang/pypy/files/patch-rpython_translator_c_src_asm.h b/lang/pypy/files/patch-rpython_translator_c_src_asm.h
deleted file mode 100644
index 352938fe7b2f..000000000000
--- a/lang/pypy/files/patch-rpython_translator_c_src_asm.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- rpython/translator/c/src/asm.h.orig	2016-06-14 07:46:04 UTC
-+++ rpython/translator/c/src/asm.h
-@@ -10,10 +10,6 @@
- #  include "src/asm_gcc_x86_64.h"
- #endif
- 
--#if defined(__GNUC__) && defined(__ppc__)
--#  include "src/asm_ppc.h"
--#endif
--
- #if defined(MS_WINDOWS) && defined(_MSC_VER)
- #  include "src/asm_msvc.h"
- #endif
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index 4c422e3379e8..0c82ef3c1e79 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -548,8 +548,8 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/encodings/zlib_codec.py
 %%PYPY_DIR%%/lib-python/2.7/ensurepip/__init__.py
 %%PYPY_DIR%%/lib-python/2.7/ensurepip/__main__.py
-%%PYPY_DIR%%/lib-python/2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
-%%PYPY_DIR%%/lib-python/2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+%%PYPY_DIR%%/lib-python/2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
+%%PYPY_DIR%%/lib-python/2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
 %%PYPY_DIR%%/lib-python/2.7/ensurepip/_uninstall.py
 %%PYPY_DIR%%/lib-python/2.7/filecmp.py
 %%PYPY_DIR%%/lib-python/2.7/fileinput.py
@@ -650,6 +650,8 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/idlelib/configSectionNameDialog.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/dynOptionMenuWidget.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/extend.txt
+%%PYPY_DIR%%/lib-python/2.7/idlelib/help.html
+%%PYPY_DIR%%/lib-python/2.7/idlelib/help.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/help.txt
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle.bat
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle.py
@@ -665,8 +667,10 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_config_name.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_configdialog.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_delegator.py
+%%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_editmenu.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_formatparagraph.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_grep.py
+%%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_helpabout.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_hyperparser.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_idlehistory.py
 %%PYPY_DIR%%/lib-python/2.7/idlelib/idle_test/test_io.py
@@ -1259,7 +1263,6 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/test/badsyntax_future8.py
 %%PYPY_DIR%%/lib-python/2.7/test/badsyntax_future9.py
 %%PYPY_DIR%%/lib-python/2.7/test/badsyntax_nocaret.py
-%%PYPY_DIR%%/lib-python/2.7/test/buffer_tests.py
 %%PYPY_DIR%%/lib-python/2.7/test/capath/0e4015b9.0
 %%PYPY_DIR%%/lib-python/2.7/test/capath/4e1295a3.0
 %%PYPY_DIR%%/lib-python/2.7/test/capath/5ed36f99.0
@@ -1604,7 +1607,6 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/test/test_codecmaps_tw.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_codecs.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_codeop.py
-%%PYPY_DIR%%/lib-python/2.7/test/test_coding.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_coercion.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_collections.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_colorsys.py
@@ -1780,15 +1782,14 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/test/test_openpty.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_operator.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_optparse.py
+%%PYPY_DIR%%/lib-python/2.7/test/test_ordered_dict.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_os.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_ossaudiodev.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_parser.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pdb.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_peepholer.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pep247.py
-%%PYPY_DIR%%/lib-python/2.7/test/test_pep263.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pep277.py
-%%PYPY_DIR%%/lib-python/2.7/test/test_pep292.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pep352.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pickle.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_pickletools.py
@@ -1850,6 +1851,7 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/test/test_socketserver.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_softspace.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_sort.py
+%%PYPY_DIR%%/lib-python/2.7/test/test_source_encoding.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_spwd.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_sqlite.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_ssl.py
@@ -1899,6 +1901,7 @@ bin/pypy
 %%PYPY_DIR%%/lib-python/2.7/test/test_ttk_guionly.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_ttk_textonly.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_tuple.py
+%%PYPY_DIR%%/lib-python/2.7/test/test_turtle.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_typechecks.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_types.py
 %%PYPY_DIR%%/lib-python/2.7/test/test_ucn.py