6 files changed, 60 insertions, 29 deletions

diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index a5f5636f5213..90a51e543a95 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -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:bzip2
 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' \
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 3f9e414d9cfc..59b79128cc98 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -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
diff --git a/lang/pypy/files/Makefile b/lang/pypy/files/Makefile
index 72864a68e029..a8fa30d2bb5c 100644
--- a/lang/pypy/files/Makefile
+++ b/lang/pypy/files/Makefile
@@ -28,6 +28,7 @@ BUILDDIR=	usession-release-${DISTVERSION}-0
 ${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}
diff --git a/lang/pypy/files/patch-lib_pypy___sqlite3.py b/lang/pypy/files/patch-lib_pypy___sqlite3.py
deleted file mode 100644
index 5a8650d0f7b6..000000000000
--- a/lang/pypy/files/patch-lib_pypy___sqlite3.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib_pypy/_sqlite3.py.bak	2013-12-15 23:45:52.000000000 +0200
-+++ lib_pypy/_sqlite3.py	2013-12-16 12:07:57.000000000 +0200
-@@ -269,11 +269,14 @@
-     _ffi.cdef("int sqlite3_enable_load_extension(sqlite3 *db, int onoff);")
- 
- if sys.platform.startswith('freebsd'):
-+    import os
-+    import os.path
-+    _localbase = os.environ.get('LOCALBASE', '/usr/local')
-     _lib = _ffi.verify("""
-     #include <sqlite3.h>
-     """, libraries=['sqlite3'],
--         include_dirs=['/usr/local/include'],
--         library_dirs=['/usr/local/lib']
-+         include_dirs=[os.path.join(_localbase, 'include')],
-+         library_dirs=[os.path.join(_localbase, 'lib')]
-     )
- else:
-     _lib = _ffi.verify("""
diff --git a/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py b/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
index 3775d6ac9e59..981305aacd57 100644
--- a/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
+++ b/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
@@ -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'),
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index abb86693fc65..c20b4d54e16c 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -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