4 files changed, 61 insertions, 16 deletions

diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 90a51e543a95..77fcfaee28a8 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pypy
-DISTVERSION=	2.5.1
+DISTVERSION=	2.6.0
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy
 DISTNAME=	release-${DISTVERSION}
@@ -44,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-e3d046c43451
+WRKSRC=		${WRKDIR}/pypy-pypy-295ee98b6928
 
 PYPY_VER=	${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
 PYTHON_IMPL_VER=	2.7
@@ -236,11 +236,8 @@ do-configure:
 	${CP} ${WRKDIR}/use.pypy ${PKGDEINSTALL}
 
 post-build:
-# UPDATING: check pypy/tool/release/package.py for list of cffi modules
-.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
+	${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKDIR}:${LD_LIBRARY_PATH} ${WRKDIR}/${PYPY_PRIMARY} ${FILESDIR}/compile_cffi.py 
+	${FIND} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/ -name "*.pypy-${PYPY_VER:C/\.//}.so" | ${XARGS} ${STRIP_CMD}
 .for _path in ${PYPYDIRS}
 	-${FIND} ${WRKDIR}/${_path:C/.*://}/ -type d | \
 		${XARGS} -n1 ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
diff --git a/lang/pypy/distinfo b/lang/pypy/distinfo
index 59b79128cc98..2f77baac95fc 100644
--- a/lang/pypy/distinfo
+++ b/lang/pypy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pypy/release-2.5.1.tar.bz2) = 32b33d407797f78d9453c81f2066c981501beddc17eaf8f7bcdc1798017bf03f
-SIZE (pypy/release-2.5.1.tar.bz2) = 16509234
+SHA256 (pypy/release-2.6.0.tar.bz2) = 70c5feff73a6f9002b6a156488fe5e0b3981297da5766464bfd2327290bcd577
+SIZE (pypy/release-2.6.0.tar.bz2) = 16682327
diff --git a/lang/pypy/files/compile_cffi.py b/lang/pypy/files/compile_cffi.py
new file mode 100644
index 000000000000..c39bbcec66d8
--- /dev/null
+++ b/lang/pypy/files/compile_cffi.py
@@ -0,0 +1,15 @@
+import os
+import sys
+
+basedir = os.environ["WRKSRC"]
+sys.path.append(basedir)
+
+import py.path
+from pypy.tool.release.package import create_cffi_import_libraries, cffi_build_scripts
+
+class Options(object):
+    def __init__(self, options):
+        for opt in options:
+            setattr(self, 'no_' + opt, False)
+
+create_cffi_import_libraries(sys.executable, Options(cffi_build_scripts), py.path.local(basedir))
diff --git a/lang/pypy/pkg-plist b/lang/pypy/pkg-plist
index c20b4d54e16c..b97c45ee9561 100644
--- a/lang/pypy/pkg-plist
+++ b/lang/pypy/pkg-plist
@@ -1538,10 +1538,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__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/_audioop_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_audioop_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_audioop_cffi.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
@@ -1585,6 +1584,9 @@
 %%PYPY_LIBDIR%%/lib_pypy/_ctypes_test.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_curses.py
 %%PYPY_LIBDIR%%/lib_pypy/_curses.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_curses_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_curses_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_curses_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_curses_panel.py
 %%PYPY_LIBDIR%%/lib_pypy/_curses_panel.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_elementtree.py
@@ -1593,10 +1595,16 @@
 %%PYPY_LIBDIR%%/lib_pypy/_ffi.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_functools.py
 %%PYPY_LIBDIR%%/lib_pypy/_functools.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_gdbm_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_gdbm_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_gdbm_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_marshal.py
 %%PYPY_LIBDIR%%/lib_pypy/_marshal.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_md5.py
 %%PYPY_LIBDIR%%/lib_pypy/_md5.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_pwdgrp_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.py
 %%PYPY_LIBDIR%%/lib_pypy/_pypy_interact.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_pypy_irc_topic.py
@@ -1615,10 +1623,16 @@
 %%PYPY_LIBDIR%%/lib_pypy/_sha512.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_sqlite3.py
 %%PYPY_LIBDIR%%/lib_pypy/_sqlite3.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_sqlite3_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_sqlite3_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_sqlite3_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_structseq.py
 %%PYPY_LIBDIR%%/lib_pypy/_structseq.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_subprocess.py
 %%PYPY_LIBDIR%%/lib_pypy/_subprocess.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_syslog_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_syslog_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_syslog_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/_testcapi.py
 %%PYPY_LIBDIR%%/lib_pypy/_testcapi.pyc
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/__init__.py
@@ -1628,17 +1642,25 @@
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/license.terms
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.py
 %%PYPY_LIBDIR%%/lib_pypy/_tkinter/tclobj.pyc
-%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.py
-%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_build.py
+%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_build.pyc
+%%PYPY_LIBDIR%%/lib_pypy/_tkinter/tklib_cffi.pypy-%%PYPY_VER%%.so
 %%PYPY_LIBDIR%%/lib_pypy/audioop.py
 %%PYPY_LIBDIR%%/lib_pypy/audioop.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cPickle.py
 %%PYPY_LIBDIR%%/lib_pypy/cPickle.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cStringIO.py
 %%PYPY_LIBDIR%%/lib_pypy/cStringIO.pyc
-%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/PKG-INFO
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/SOURCES.txt
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/dependency_links.txt
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/entry_points.txt
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/not-zip-safe
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/requires.txt
+%%PYPY_LIBDIR%%/lib_pypy/cffi.egg-info/top_level.txt
 %%PYPY_LIBDIR%%/lib_pypy/cffi/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/__init__.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/_cffi_include.h
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/README
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/__init__.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/__init__.pyc
@@ -1677,6 +1699,8 @@
 %%PYPY_LIBDIR%%/lib_pypy/cffi/api.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/backend_ctypes.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/backend_ctypes.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/cffi_opcode.py
+%%PYPY_LIBDIR%%/lib_pypy/cffi/cffi_opcode.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/commontypes.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/commontypes.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/cparser.py
@@ -1689,6 +1713,15 @@
 %%PYPY_LIBDIR%%/lib_pypy/cffi/lock.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/model.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/model.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/parse_c_type.h
+%%PYPY_LIBDIR%%/lib_pypy/cffi/recompiler.py
+%%PYPY_LIBDIR%%/lib_pypy/cffi/recompiler.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/setuptools_ext.py
+%%PYPY_LIBDIR%%/lib_pypy/cffi/setuptools_ext.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/testing/__init__.py
+%%PYPY_LIBDIR%%/lib_pypy/cffi/testing/__init__.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/testing/udir.py
+%%PYPY_LIBDIR%%/lib_pypy/cffi/testing/udir.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/vengine_cpy.py
 %%PYPY_LIBDIR%%/lib_pypy/cffi/vengine_cpy.pyc
 %%PYPY_LIBDIR%%/lib_pypy/cffi/vengine_gen.py