- Update to 1.9 [1]

- Detection of insufficient memory [1]
- Change %%  SUB vaes from fixed at python 27 to use any installed version of python [1]
- Fix syntax of non system include "" vs <> [2]

PR:		ports/168974 [1]
Submitted by:	David Naylor <naylor.b.david@gmail.com> (maintainer) [1]
Reviewed by:	scheidel@ (me) [2]

lang/pypy/Makefile

@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	pypy
-DISTVERSION=	1.8
-CATEGORIES=	lang python
+DISTVERSION=	1.9
+CATEGORIES=	lang python java
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/
 DISTNAME=	release-${DISTVERSION}
 DIST_SUBDIR=	pypy
@@ -21,7 +21,8 @@ LICENSE_COMB=	multi
 LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 		ffi:${PORTSDIR}/devel/libffi
 
-OPTIONS=	SANDBOX "Translate a sandboxed pypy" OFF
+OPTIONS_DEFINE=	SANDBOX
+SANDBOX_DESC=	"Translate a sandboxed pypy"
 
 BUILD_WRKSRC=	${WRKDIR}
 USE_BZIP2=	yes
@@ -29,17 +30,26 @@ USE_ICONV=	yes
 USE_GETTEXT=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-WRKSRC=		${WRKDIR}/pypy-pypy-2346207d9946
+WRKSRC=		${WRKDIR}/pypy-pypy-341e1e3821ff
 
-PYPYDIRS=	include lib-python lib_pypy site-packages
-PYPYPREFIX?=	${PREFIX}/${PORTNAME}-${DISTVERSION}
-PLIST_SUB+=	PYPYPREFIX="${PYPYPREFIX:S|^${PREFIX}/||g}" \
-		DISTVERSION="${DISTVERSION}"
+PYPY_VER=	${DISTVERSION}
+PYTHON_IMPL_VER=	2.7
+PYPY_LIBDIR=	lib/pypy${PYPY_VER}
+PYPY_INCLUDEDIR=	include/pypy${PYPY_VER}
+PYPYDIRS=	${PYPY_INCLUDEDIR} ${PYPY_LIBDIR}
+
+PLIST_SUB+=	PYPY_LIBDIR=${PYPY_LIBDIR} \
+		PYPY_INCLUDEDIR=${PYPY_INCLUDEDIR}
 
 MAKE_ENV+=	PYPY_LOCALBASE=${LOCALBASE}
+.if exists(/usr/bin/clang)
+MAKE_ARGS+=	CC=clang
+MAKE_JOBS_SAFE=	yes
+.endif
 
-.include <${.CURDIR}/files/bsd.pypy.inst.mk>
+# XXX !.include <bsd.port.pre.mk> as USE_* need to be set prior
 .include <bsd.port.options.mk>
+.include "${.CURDIR}/files/bsd.pypy.inst.mk"
 
 .if defined(PACKAGE_BUILDING)
 MANUAL_PACKAGE_BUILD=	fails to finish compilation on pointyhat, reason unknown
@@ -49,10 +59,11 @@ MANUAL_PACKAGE_BUILD=	fails to finish compilation on pointyhat, reason unknown
 .if !defined(PYPY_INST)
 PYPY_INST=	DEFAULT
 
-.if defined(WITH_SANDBOX)
+.if ${PORT_OPTIONS:MSANDBOX}
 PYPY_INST+=	SANDBOX
 .endif
-.endif
+
+.endif # !defined(PYPY_INST)
 
 PYPY_NAMES=
 .for inst in ${PYPY_INST}
@@ -60,11 +71,22 @@ PYPY_NAMES=
 PYPY_NAMES+=	${PYPY_${inst}_NAME}
 PYPY_PRIMARY?=	${PYPY_${inst}_NAME}
 
+# Check if the boehm GC will be used
 .if ${PYPY_${inst}_OPT} == 0 || ${PYPY_${inst}_OPT} == 1 || ${PYPY_${inst}_OPT} == size
 WITH_BOEHM_GC=	yes
 .endif
 
-.endfor
+# Check if the CLI (mono) backend will be used
+.if !empty(PYPY_${inst}_TRANSLATE_ARGS:M--backend=cli)
+WITH_CLI=	yes
+.endif
+
+# Check if the JVM (java) backend will be used
+.if !empty(PYPY_${inst}_TRANSLATE_ARGS:M--backend=jvm)
+WITH_JVM=	yes
+.endif
+
+.endfor # inst in ${PYPY_INST}
 
 # Use pypy if it is installed, else use python (to translate)
 .if !defined(PY)
@@ -74,19 +96,36 @@ PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || true
 .else
 PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || ${WHICH} pypy 2> /dev/null || true
 .endif
-.endif
+.endif # !defined(PYPY)
+
 .if exists(${PYPY})
 PY=		${PYPY}
 .else
 USE_PYTHON_BUILD=	2.5+
 PY=		${PYTHON_CMD}
 .endif
-.endif
+.endif # !defined(PY)
 
 .if defined(WITH_BOEHM_GC)
 LIB_DEPENDS+=	gc.1:${PORTSDIR}/devel/boehm-gc
 .endif
 
+.if defined(WITH_CLI)
+BUILD_DEPENDS+=	mono:${PORTSDIR}/lang/mono
+RUN_DEPENDS+=	mono:${PORTSDIR}/lang/mono
+ONLY_FOR_ARCHS=	i386 powerpc
+ONLY_FOR_ARCHS_REASON=	only translates on 32bit systems
+BROKEN=		CLI backend broken, unsupported upstream
+.endif
+
+.if defined(WITH_JVM)
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
+ONLY_FOR_ARCHS=	i386 powerpc
+ONLY_FOR_ARCHS_REASON=	only translates on 32bit systems
+BROKEN=		JVM backend broken, partially supported upstream
+.endif
+
 # Translate FreeBSD ARCH types to PyPy ARCH types
 # Pypy officially only supports i386 and amd64, the other platforms are
 # untested (and do not have jit support).
@@ -110,13 +149,13 @@ PLIST_SUB+=	PYPY_ARCH="${PYPY_ARCH}"
 .if ${PYPY_${inst}_OPT} == jit
 PYPY_${inst}_OPT=	2
 .endif
-.endfor
-.endif
+.endfor # inst in ${PYPY_INST}
+.endif # !defined(PYPY_JITTABLE)
 
 pre-fetch:
 	@${ECHO} "PyPy requires a large amount of free RAM and time to translate and compile."
 	@${ECHO}
-	@${ECHO} "To translate, PyPy requires on i386 3G (min 2G) free RAM and on amd64"
+	@${ECHO} "To translate, PyPy requires on 32bit 3G (min 2G) free RAM and on 64bit"
 	@${ECHO} "6G (min 4G) free RAM.  Also, to compile, PyPy on amd64 gcc requires an"
 	@${ECHO} "extra 4G however clang only requires 400M (CC=clang) but clang is slower"
 	@${ECHO} "in compiling PyPy."
@@ -126,7 +165,7 @@ pre-fetch:
 	@${ECHO} "consider forcing the build to use python (-DPYPY) however that makes the"
 	@${ECHO} "build much slower."
 	@${ECHO}
-	@${ECHO} "PyPy supports a large number of paramaters and customisations.  This port"
+	@${ECHO} "PyPy supports a large number of parameters and customisations.  This port"
 	@${ECHO} "supports building multiple instances of PyPy, for example:"
 	@${ECHO} "PYPY_INST=	SANDBOX CUSTOM"
 	@${ECHO} "PYPY_CUSTOM_NAME=		pypy-custom"
@@ -142,15 +181,32 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "On a fast machine PyPy takes around 45 minutes to translate and compile,"
 	@${ECHO} "however an average machine takes in excess of 4 hours, per instance."
+.if !defined(PYPY_IGNORE_MEM) && (${PYPY_ARCH} == "i386" || ${PYPY_ARCH} == "ppc_32")
+	@if [ $$((`sysctl -n hw.physmem` / 1024 / 1024)) -le 2000 ]; then \
+		${ECHO}; \
+		${ECHO} "err: this system has insufficient memory, expected at least 2G RAM",; \
+		${ECHO} "err: to overwrite this error define -DPYPY_IGNORE_MEM and try again"; \
+		exit 1; \
+	fi
+.elif !defined(PYPY_IGNORE_MEM)
+	@if [ $$((`sysctl -n hw.physmem` / 1024 / 1024)) -le 4000 ]; then \
+		${ECHO}; \
+		${ECHO} "err: this system has insufficient memory, expected at least 4G RAM",; \
+		${ECHO} "err: to overwrite this error define -DPYPY_IGNORE_MEM and try again"; \
+		exit 1; \
+	fi
+.endif
 	@sleep 1
 
-post-patch:
-	@${RM} -f ${WRKSRC}/lib-python/2.7/SimpleXMLRPCServer.py.orig
+post-extract:
+	${MKDIR} ${WRKSRC}/lib
+	${MV} ${WRKSRC}/lib-python/${PYTHON_IMPL_VER} ${WRKSRC}/${PYPY_LIBDIR}
+	${MV} ${WRKSRC}/lib_pypy ${WRKSRC}/${PYPY_LIBDIR}/
 
 do-configure:
 	${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		-e 's|%%PYPYPREFIX%%|${PYPYPREFIX}|g' \
 		-e 's|%%PYPY_NAMES%%|${PYPY_NAMES}|g' \
+		-e 's|%%PYPY_VER%%|${PYPY_VER}|g' \
 		${FILESDIR}/use.pypy > ${WRKDIR}/use.pypy
 	${CP} ${WRKDIR}/use.pypy ${PKGINSTALL}
 	${CP} ${WRKDIR}/use.pypy ${PKGDEINSTALL}
@@ -176,26 +232,21 @@ do-configure:
 .endfor
 
 post-build:
-	-${FIND} ${PYPYDIRS:S|^|${WRKSRC}/|g} -type d | ${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
+	-${FIND} ${WRKSRC}/${PYPY_LIBDIR} -type d | \
+		${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} \
+		${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
+	${MV} ${WRKSRC}/include ${WRKSRC}/include~
+	${MKDIR} ${WRKSRC}/include
+	${MV} ${WRKSRC}/include~ ${WRKSRC}/${PYPY_INCLUDEDIR}
 
 do-install:
-	${MKDIR} ${PYPYPREFIX} ${PYPYPREFIX}/bin
 .for dir in ${PYPYDIRS}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${PYPYPREFIX}
-.endfor
-.for f in LICENSE README
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PYPYPREFIX}/${f}
+	(cd ${WRKSRC}/${dir}; ${COPYTREE_SHARE} . ${PREFIX}/${dir})
 .endfor
 .for name in ${PYPY_NAMES:O}
-	${INSTALL_PROGRAM} ${WRKDIR}/${name} ${PYPYPREFIX}/bin/${name}
-	${LN} -fs ${PYPYPREFIX}/bin/${name} ${PREFIX}/bin/${name}${DISTVERSION}
-	${ECHO} bin/${name}${DISTVERSION} >> ${TMPPLIST}.prefix
+	${INSTALL_PROGRAM} ${WRKDIR}/${name} ${PREFIX}/bin/${name}${PYPY_VER}
+	${ECHO} bin/${name}${DISTVERSION} >> ${TMPPLIST}
 .endfor
-.for name in ${PYPY_NAMES:O}
-	${ECHO} ${PYPYPREFIX:S|${PREFIX}/||}/bin/${name} >> ${TMPPLIST}.prefix
-.endfor
-	${CAT} ${TMPPLIST} >> ${TMPPLIST}.prefix
-	${MV} ${TMPPLIST}.prefix ${TMPPLIST}
 
 post-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@@ -203,7 +254,7 @@ post-install:
 test: patch
 .for inst in ${PYPY_INST}
 	@${WHICH} ${PYPY_${inst}_NAME} > /dev/null 2>&1 || (${ECHO} "Unable to find ${PYPY_${inst}_NAME}, please install port first!"; exit 1)
-	(${CD} ${WRKSRC}/lib-python; ${PYPY_${inst}_NAME} ../pypy/test_all.py)
+	(${CD} ${PYPY_LIBDIR}; ${PYPY_${inst}_NAME} ../../pypy/test_all.py)
 .endfor
 
 pkg-plist: build
@@ -212,13 +263,13 @@ pkg-plist: build
 	cd ${WRKSRC} && ${FIND} ${dir} -type f >> ${WRKDIR}/.plist-files-gen
 	cd ${WRKSRC} && ${FIND} ${dir} -type d >> ${WRKDIR}/.plist-dirs-gen
 .endfor
-.for f in LICENSE README
-	${ECHO} ${f} >> ${WRKDIR}/.plist-files-gen
-.endfor
-	${ECHO} 'bin' >> ${WRKDIR}/.plist-dirs-gen
-	${REINPLACE_CMD} -e 's|^|%%PYPYPREFIX%%/|g' -e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|g' ${WRKDIR}/.plist-files-gen
-	${REINPLACE_CMD} -e 's|^|@dirrm %%PYPYPREFIX%%/|g' ${WRKDIR}/.plist-dirs-gen
-	${ECHO} '@dirrm %%PYPYPREFIX%%' >> ${WRKDIR}/.plist-dirs-gen
+	${REINPLACE_CMD} -e 's|^${PYPY_LIBDIR}|%%PYPY_LIBDIR%%|g' \
+		-e 's|^${PYPY_INCLUDEDIR}|%%PYPY_INCLUDEDIR%%|g' \
+		-e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|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
 	${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist

lang/pypy/TODO

@@ -0,0 +1,8 @@
+TODO:
+ * support valgrind
+ * make jitviewer port (depends flask pygments simplejson Jinja2 Werkzeug)
+ * integrate into bsd.python.mk
+
+Pypy deficiencies under FreeBSD:
+ * boehm GC does not work (possibly FreeBSD specific)
+ * --gcrootfinder=asmgcc does not work (currently only works under Linux)

lang/pypy/distinfo

@@ -1,2 +1,2 @@
-SHA256 (pypy/release-1.8.tar.bz2) = ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
-SIZE (pypy/release-1.8.tar.bz2) = 14927806
+SHA256 (pypy/release-1.9.tar.bz2) = 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68
+SIZE (pypy/release-1.9.tar.bz2) = 13466551

lang/pypy/files/bsd.pypy.inst.mk

@@ -17,3 +17,8 @@ PYPY_CLI_NAME?=			pypy-cli
 PYPY_CLI_TRANSLATE_ARGS?=	--backend=cli
 PYPY_CLI_OPT?=			2
 PYPY_CLI_OBJSPACE_ARGS?=
+
+PYPY_JVM_NAME?=                 pypy-jvm
+PYPY_JVM_TRANSLATE_ARGS?=       --backend=jvm
+PYPY_JVM_OPT?=                  2
+PYPY_JVM_OBJSPACE_ARGS?=

lang/pypy/files/patch-CVE-2012-0845

@@ -1,14 +0,0 @@
---- lib-python/2.7/SimpleXMLRPCServer.py.orig	2012-02-19 02:22:59.736459292 +0800
-+++ lib-python/2.7/SimpleXMLRPCServer.py	2012-02-19 02:24:04.434444259 +0800
-@@ -486,7 +486,10 @@
-             L = []
-             while size_remaining:
-                 chunk_size = min(size_remaining, max_chunk_size)
--                L.append(self.rfile.read(chunk_size))
-+                chunk = self.rfile.read(chunk_size)
-+                if not chunk:
-+                    break
-+                L.append(chunk)
-                 size_remaining -= len(L[-1])
-             data = ''.join(L)
- 

lang/pypy/files/patch-lib__pypy1.9__lib_pypy__ctypes_config_cache__rebuild.py

@@ -0,0 +1,11 @@
+--- lib/pypy1.9/lib_pypy/ctypes_config_cache/rebuild.py~	2012-06-22 11:42:55.000000000 +0200
++++ lib/pypy1.9/lib_pypy/ctypes_config_cache/rebuild.py	2012-06-22 11:43:12.000000000 +0200
+@@ -6,7 +6,7 @@
+ # get the correct path
+ import os.path
+ this_dir = os.path.dirname(__file__)
+-autopath_py = os.path.join(this_dir, '../../pypy/tool/autopath.py')
++autopath_py = os.path.join(this_dir, '../../../../pypy/tool/autopath.py')
+ autopath_py = os.path.abspath(autopath_py)
+ execfile(autopath_py, dict(__name__='autopath', __file__=autopath_py))
+ 

lang/pypy/files/patch-lib__pypy1.9__site.py

@@ -0,0 +1,17 @@
+--- lib/pypy1.9/site.py.orig	2012-06-07 14:24:48.000000000 +0200
++++ lib/pypy1.9/site.py	2012-06-22 15:47:31.000000000 +0200
+@@ -302,13 +302,9 @@
+ 
+         if sys.platform in ('os2emx', 'riscos'):
+             sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
+-        elif is_pypy:
+-            from distutils.sysconfig import get_python_lib
+-            sitedir = get_python_lib(standard_lib=False, prefix=prefix)
+-            sitepackages.append(sitedir)
+         elif os.sep == '/':
+             sitepackages.append(os.path.join(prefix, "lib",
+-                                        "python" + sys.version[:3],
++                                        "pypy" + sys.version[:3],
+                                         "site-packages"))
+             sitepackages.append(os.path.join(prefix, "lib", "site-python"))
+         else:

lang/pypy/files/patch-py___path__local.py

@@ -0,0 +1,12 @@
+--- py/_path/local.py~	2012-06-22 12:20:36.000000000 +0200
++++ py/_path/local.py	2012-06-22 12:21:45.000000000 +0200
+@@ -516,6 +516,9 @@
+             pkgpath = self.pypkgpath()
+             if pkgpath is not None:
+                 if ensuresyspath:
++                    import sys
++                    if pkgpath.basename in sys.modules:
++                        del sys.modules[pkgpath.basename]
+                     self._prependsyspath(pkgpath.dirpath())
+                 pkg = __import__(pkgpath.basename, None, None, [])
+                 names = self.new(ext='').relto(pkgpath.dirpath())

lang/pypy/files/patch-pypy__ctypes_configure__cbuild.py

@@ -1,57 +0,0 @@
---- ctypes_configure/cbuild.py~	2011-11-19 09:44:54.000000000 +0200
-+++ ctypes_configure/cbuild.py	2011-11-23 21:47:02.000000000 +0200
-@@ -199,13 +199,14 @@
-     #except ImportError:
-     #    print "ERROR IMPORTING"
-     #    pass
-+    from pypy.translator.platform import platform
-     cfiles = [py.path.local(f) for f in cfiles]
-     if tmpdir is None:
-         tmpdir = configdir.join("module_cache").ensure(dir=1)
-     num = 0
-     cfiles += eci.separate_module_files
--    include_dirs = list(eci.include_dirs)
--    library_dirs = list(eci.library_dirs)
-+    include_dirs = platform.preprocess_include_dirs(eci.include_dirs)
-+    library_dirs = platform.preprocess_library_dirs(eci.library_dirs)
-     if sys.platform == 'darwin':    # support Fink & Darwinports
-         for s in ('/sw/', '/opt/local/'):
-             if s + 'include' not in include_dirs and \
-@@ -362,13 +363,14 @@
- 
-     def __init__(self, cfilenames, eci, outputfilename=None,
-                  compiler_exe=None, profbased=None):
-+        from pypy.translator.platform import platform
-         self.cfilenames = cfilenames
-         ext = ''
-         self.compile_extra = []
-         self.link_extra = []
-         self.libraries = list(eci.libraries)
--        self.include_dirs = list(eci.include_dirs)
--        self.library_dirs = list(eci.library_dirs)
-+        self.include_dirs = platform.preprocess_include_dirs(eci.include_dirs)
-+        self.library_dirs = platform.preprocess_library_dirs(eci.library_dirs)
-         self.compiler_exe = compiler_exe
-         self.profbased = profbased
-         if not sys.platform in ('win32', 'darwin'): # xxx
-@@ -436,7 +438,7 @@
-             old = cfile.dirpath().chdir() 
-             try: 
-                 res = compiler.compile([cfile.basename], 
--                                       include_dirs=self.eci.include_dirs,
-+                                       include_dirs=self.include_dirs,
-                                        extra_preargs=self.compile_extra)
-                 assert len(res) == 1
-                 cobjfile = py.path.local(res[0]) 
-@@ -445,9 +447,9 @@
-             finally: 
-                 old.chdir() 
-         compiler.link_executable(objects, str(self.outputfilename),
--                                 libraries=self.eci.libraries,
-+                                 libraries=self.libraries,
-                                  extra_preargs=self.link_extra,
--                                 library_dirs=self.eci.library_dirs)
-+                                 library_dirs=self.library_dirs)
- 
- def build_executable(*args, **kwds):
-     noerr = kwds.pop('noerr', False)

lang/pypy/files/patch-pypy__module__sys__state.py

@@ -0,0 +1,21 @@
+--- pypy/module/sys/state.py.orig	2012-06-07 14:24:48.000000000 +0200
++++ pypy/module/sys/state.py	2012-06-22 14:45:23.000000000 +0200
+@@ -36,14 +36,12 @@
+ platform = sys.platform
+ 
+ def getinitialpath(state, prefix):
+-    from pypy.module.sys.version import CPYTHON_VERSION
+-    dirname = '%d.%d' % (CPYTHON_VERSION[0],
+-                         CPYTHON_VERSION[1])
+-    lib_python = os.path.join(prefix, 'lib-python')
+-    python_std_lib = os.path.join(lib_python, dirname)
++    from pypy.module.sys.version import PYPY_VERSION
++    libpath = os.path.join(prefix, 'lib')
++    python_std_lib = os.path.join(libpath, 'pypy%d.%d' % PYPY_VERSION[:2])
+     checkdir(python_std_lib)
+     
+-    lib_pypy = os.path.join(prefix, 'lib_pypy')
++    lib_pypy = os.path.join(python_std_lib, 'lib_pypy')
+     checkdir(lib_pypy)
+ 
+     importlist = []

lang/pypy/files/patch-pypy__rpython__tool__rffi_platform.py

@@ -1,6 +1,6 @@
 --- pypy/rpython/tool/rffi_platform.py~	2011-11-19 09:44:54.000000000 +0200
 +++ pypy/rpython/tool/rffi_platform.py	2011-11-23 20:17:30.000000000 +0200
-@@ -789,7 +789,9 @@
+@@ -805,7 +805,9 @@
          includes=['gc.h']
      else:
          library_dir = ''

lang/pypy/files/patch-pypy__tool__lib_pypy.py

@@ -0,0 +1,18 @@
+--- pypy/tool/lib_pypy.py.orig	2012-06-07 14:24:48.000000000 +0200
++++ pypy/tool/lib_pypy.py	2012-06-22 14:46:42.000000000 +0200
+@@ -1,12 +1,11 @@
+ import py
+ import pypy
+ import pypy.module
+-from pypy.module.sys.version import CPYTHON_VERSION
++from pypy.module.sys.version import PYPY_VERSION
+ 
+ LIB_ROOT = py.path.local(pypy.__path__[0]).dirpath()
+-LIB_PYPY =  LIB_ROOT.join('lib_pypy')
+-LIB_PYTHON = LIB_ROOT.join('lib-python', '%d.%d' % CPYTHON_VERSION[:2])
+-
++LIB_PYTHON =  LIB_ROOT.join('lib', 'pypy%d.%d' % PYPY_VERSION[:2])
++LIB_PYPY = LIB_PYTHON.join('lib_pypy')
+ 
+ def import_from_lib_pypy(modname):
+     modname = LIB_PYPY.join(modname+'.py')

lang/pypy/files/patch-pypy__translator__cli__sdk.py

@@ -0,0 +1,11 @@
+--- pypy/translator/cli/sdk.py~	2012-06-11 12:24:05.000000000 +0200
++++ pypy/translator/cli/sdk.py	2012-06-11 12:24:42.000000000 +0200
+@@ -47,7 +47,7 @@
+ 
+ class MonoSDK(AbstractSDK):
+     RUNTIME = ['mono']
+-    ILASM = 'ilasm2'
++    ILASM = 'ilasm'
+     CSC = 'gmcs'
+     PEVERIFY = 'peverify' # it's not part of mono, but we get a meaningful skip message
+ 

lang/pypy/files/use.pypy

@@ -3,8 +3,8 @@
 # $FreeBSD$
 
 PREFIX=%%PREFIX%%
-PYPYPREFIX=%%PYPYPREFIX%%
 PYPY_NAMES="%%PYPY_NAMES%%"
+PYPY_VER=%%PYPY_VER%%
 
 if [ "$2" = "POST-INSTALL" ]
 then
@@ -12,13 +12,13 @@ then
 	do
 		if [ ! -L $PREFIX/bin/$name ]
 		then
-			ln -s $PYPYPREFIX/bin/$name $PREFIX/bin/$name
+			ln -s $name$PYPY_VER $PREFIX/bin/$name
 		fi
 	done
 elif [ "$2" = "POST-DEINSTALL" ] ; then
 	for name in $PYPY_NAMES
 	do
-		if [ -L $PREFIX/bin/$name ] && [ `readlink $PREFIX/bin/$name` = $PYPYPREFIX/bin/$name ]
+		if [ -L $PREFIX/bin/$name ] && [ `readlink $PREFIX/bin/$name` = $name ]
 		then
 			rm $PREFIX/bin/$name
 		fi