svn commit: r336050 - in head/lang/pypy: . files
David Naylor
dbn at FreeBSD.org
Tue Dec 10 07:57:48 UTC 2013
Author: dbn
Date: Tue Dec 10 07:57:46 2013
New Revision: 336050
URL: http://svnweb.freebsd.org/changeset/ports/336050
Log:
Update lang/pypy to 2.2.1 (back-ported from lang/pypy-devel r336049).
Added:
head/lang/pypy/files/patch-lib-python__2.7__distutils__command__install.py (contents, props changed)
head/lang/pypy/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py (contents, props changed)
head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py (contents, props changed)
Deleted:
head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py
head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py
head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py
head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py
head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py
head/lang/pypy/files/patch-pypy__tool__lib_pypy.py
head/lang/pypy/files/patch-rpython__translator__cli__sdk.py
Modified:
head/lang/pypy/Makefile
head/lang/pypy/distinfo
head/lang/pypy/files/Makefile
head/lang/pypy/files/bsd.pypy.inst.mk
head/lang/pypy/pkg-plist
Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile Tue Dec 10 07:36:09 2013 (r336049)
+++ head/lang/pypy/Makefile Tue Dec 10 07:57:46 2013 (r336050)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= pypy
-DISTVERSION= 2.1
-PORTREVISION= 1
-CATEGORIES= lang python java
-MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/
+DISTVERSION= 2.2.1
+CATEGORIES= lang python
+MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ https://bitbucket.org/pypy/pypy/downloads/
DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= dbn at FreeBSD.org
@@ -18,39 +17,42 @@ LIB_DEPENDS= libexpat.so:${PORTSDIR}/tex
libffi.so:${PORTSDIR}/devel/libffi \
libsqlite3.so:${PORTSDIR}/databases/sqlite3
-CLI_DESC= (BROKEN) Translate a CLI (.NET) based pypy
-JVM_DESC= (BROKEN) Translate a JVM (Java) based pypy
PYTHON_DESC= Use Python-2.7 to translate (slowest)
PYPY_DESC= Use PyPy to translate (fastest, highest memory usage)
PYPY_MINMEM_DESC= Use PyPy to translate (lowest memory usage)
-PYINST_DESC= Translation method
+PYINST= PyPy instances
SANDBOX_DESC= Translate a sandboxed pypy
+TRANS_DESC= Translation method
.if !defined(PYPY_INST)
-OPTIONS_DEFINE+= CLI JVM SANDBOX
+OPTIONS_GROUP= PYINST
+OPTIONS_GROUP_PYINST= SANDBOX
.endif
LOCALBASE?= /usr/local
.if exists(${LOCALBASE}/bin/pypy)
-OPTIONS_SINGLE= PYINST
-OPTIONS_SINGLE_PYINST= PYTHON PYPY PYPY_MINMEM
+OPTIONS_SINGLE= TRANS
+OPTIONS_SINGLE_TRANS= PYTHON PYPY PYPY_MINMEM
OPTIONS_DEFAULT+= PYPY_MINMEM
.endif
-CONFLICTS_INSTALL= pypy-devel-[0-9]*
+CONFLICTS_INSTALL= pypy-[0-9]*
+LATEST_LINK= ${PORTNAME}-devel
ALL_TARGET= ${PYPY_NAMES}
BUILD_WRKSRC= ${WRKDIR}
+DATE= 20130810
USE_BZIP2= yes
USES= compiler:c11 gettext iconv
MAKEFILE= ${FILESDIR}/Makefile
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-deinstall
-WRKSRC= ${WRKDIR}/${DISTNAME}
PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
PYTHON_IMPL_VER= 2.7
-PYPY_LIBDIR= lib/pypy-${PYPY_VER}
-PYPY_INCLUDEDIR= include/pypy-${PYPY_VER}
-PYPYDIRS= ${PYPY_INCLUDEDIR} ${PYPY_LIBDIR}
+PYPY_LIBDIR= lib/${PORTNAME}-${PYPY_VER}
+PYPY_INCLUDEDIR= include/${PORTNAME}-${PYPY_VER}
+PYPYDIRS= lib-python/${PYTHON_IMPL_VER}:${PYPY_LIBDIR} \
+ lib_pypy:${PYPY_LIBDIR}/lib_pypy \
+ include:${PYPY_INCLUDEDIR}
PLIST_SUB+= PYPY_LIBDIR=${PYPY_LIBDIR} \
PYPY_INCLUDEDIR=${PYPY_INCLUDEDIR}
@@ -59,7 +61,7 @@ MAKE_ENV+= DISTVERSION=${DISTVERSION} PY
WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
LOCALBASE_REFIX= \
- ${PYPY_LIBDIR}/lib_pypy/_sqlite3.py
+ lib_pypy/_sqlite3.py
.include <bsd.port.options.mk>
.include "${MASTERDIR}/files/bsd.pypy.inst.mk"
@@ -80,14 +82,6 @@ PYPY_INST= DEFAULT
PYPY_INST+= SANDBOX
.endif
-.if ${PORT_OPTIONS:MCLI}
-PYPY_INST+= CLI
-.endif
-
-.if ${PORT_OPTIONS:MJVM}
-PYPY_INST+= JVM
-.endif
-
.endif # !defined(PYPY_INST)
MAKE_ENV+= PYPY_INST="${PYPY_INST}"
@@ -106,38 +100,12 @@ MAKE_ENV+= PYPY_${inst}_NAME="${PYPY_${i
WITH_BOEHM_GC= yes
.endif
-# 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}
.if defined(WITH_BOEHM_GC)
LIB_DEPENDS+= libgc.so:${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).
@@ -161,6 +129,7 @@ PYPY_BITS= 32
.endif
PLIST_SUB+= PYPY_ARCH="${PYPY_ARCH}"
PLIST_SUB+= PYPY_BITS="${PYPY_BITS}"
+PLIST_SUB+= PYPY_VER="${PYPY_VER:C/\.//}"
.if !defined(PYPY_JITTABLE)
.for inst in ${PYPY_INST}
@@ -177,26 +146,26 @@ PYPY_${inst}_OPT= 2
#
.if ${PYPY_ARCH:M*64}
. if ${PORT_OPTIONS:MPYPY}
-# 64bit + pypy = 5.9 GiB
-PYPY_TRANSLATION_MEMORY= 6138872
+# 64bit + pypy = 5.5 GiB
+PYPY_TRANSLATION_MEMORY= 5803684
. elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 64bit + pypy (minimum memory) = 3.6GiB
-PYPY_TRANSLATION_MEMORY= 3855204
+# 64bit + pypy (minimum memory) = 3.3 GiB
+PYPY_TRANSLATION_MEMORY= 3452308
. else
-# 64bit + python = 4.7 GiB
-PYPY_TRANSLATION_MEMORY= 4957688
+# 64bit + python = 4.5 GiB
+PYPY_TRANSLATION_MEMORY= 4716500
. endif
# 64bit system += 366 MiB
PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 374784))
.else
. if ${PORT_OPTIONS:MPYPY}
# 32bit + pypy = 2.3GiB
-PYPY_TRANSLATION_MEMORY= 2689508
+PYPY_TRANSLATION_MEMORY= 2438856
. elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 32bit + pypy (minimum memory) = 2.2GiB
-PYPY_TRANSLATION_MEMORY= 2329256
-# 32bit + python = 2.3 GiB
-PYPY_TRANSLATION_MEMORY= 2372640
+# 32bit + pypy (minimum memory) = 2.0GiB
+PYPY_TRANSLATION_MEMORY= 2120844
+# 32bit + python = 2.2 GiB
+PYPY_TRANSLATION_MEMORY= 2286764
. endif
# 32bit system += 168 MiB
PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 171787))
@@ -211,9 +180,12 @@ PYPY_MEMORY_MULTIPLY= 1
PYPY_IGNORE_MEMORY= Memory checks non-fatal until revised figures are obtained.
PYPY_MEM_WARNING= \
${ECHO} "warn: this system has insufficient memory, expected at least $$((${PYPY_MINIMUM_MEMORY} / 1024 * ${PYPY_MEMORY_MULTIPLY} + 1))MiB RAM"
-.if defined(PYTHON_CMD) && ${PYTHON_CMD:M*pypy*}
+.if ${PORT_OPTIONS:MPYPY}
PYPY_MEM_WARNING+= ;\
- ${ECHO} "warn: pypy is being used for translation, consider using cpython as it uses less memory"
+ ${ECHO} "warn: PyPy is being used for translation, consider using Python or PyPy (minimum memory) as it uses less memory"
+.elif ${PORT_OPTIONS:MPYTHON}
+PYPY_MEM_WARNING+= ;\
+ ${ECHO} "warn: Python is being used for translation, consider using PyPy (minimum memory) as it uses less memory"
.endif
.if ${PYPY_MEMORY_MULTIPLY} != 1
PYPY_MEM_WARNING+= ;\
@@ -251,10 +223,11 @@ pre-fetch:
@if [ $$((`sysctl -n hw.physmem` / 1024)) -le $$((${PYPY_MINIMUM_MEMORY} * ${PYPY_MEMORY_MULTIPLY})) ]; then ${PYPY_MEM_WARNING}; fi
post-extract:
- ${MKDIR} ${WRKSRC}/lib
- ${LN} -s ${WRKSRC}/lib ${WRKDIR}/lib
- ${MV} ${WRKSRC}/lib-python/${PYTHON_IMPL_VER} ${WRKSRC}/${PYPY_LIBDIR}
- ${MV} ${WRKSRC}/lib_pypy ${WRKSRC}/${PYPY_LIBDIR}/
+.for _path in ${PYPYDIRS}
+ ${MKDIR} ${WRKDIR}/`${DIRNAME} ${_path:C/.*://}`
+ ${LN} -s ${WRKSRC}/${_path:C/:.*//} ${WRKDIR}/${_path:C/.*://}
+.endfor
+ ${LN} -s ${WRKDIR}/lib ${WRKSRC}/lib
post-patch:
.for file in ${LOCALBASE_REFIX}
@@ -270,27 +243,27 @@ do-configure:
${CP} ${WRKDIR}/use.pypy ${PKGDEINSTALL}
post-build:
- -${FIND} ${WRKSRC}/${PYPY_LIBDIR} -type d | \
- ${SETENV} PYTHON_PATH=${WRKSRC} ${XARGS} \
- ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
# UPDATING: check pypy/tool/release/package.py for list of cffi modules
.for mod in _sqlite3 _curses syslog
${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}'
.endfor
- ${FIND} ${WRKSRC}/lib -name '*.orig' -delete -or \
+ ${STRIP_CMD} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/__pycache__/_cffi__*.pypy-${PYPY_VER:C/\.//}.so
+.for _path in ${PYPYDIRS}
+ -${FIND} ${WRKDIR}/${_path:C/.*://}/ -type d | \
+ ${XARGS} -n1 ${WRKDIR}/${PYPY_PRIMARY} -m compileall -fl
+ ${FIND} ${WRKDIR}/${_path:C/.*://}/ -name '*.orig' -delete -or \
-name '*.bak' -delete -or \
-name '*.c' -delete -or \
-name '*.o' -delete
${FIND} ${WRKDIR}/${_path:C/.*://}/ -name __pycache__ | \
${XARGS} -n1 -I {} ${FIND} {} -depth 1 -type d | \
${XARGS} ${RM} -r
- ${MV} ${WRKSRC}/include ${WRKSRC}/include~
- ${MKDIR} ${WRKSRC}/include
- ${MV} ${WRKSRC}/include~ ${WRKSRC}/${PYPY_INCLUDEDIR}
+.endfor
do-install:
-.for dir in ${PYPYDIRS}
- (cd ${WRKSRC}/${dir}; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${dir})
+.for _path in ${PYPYDIRS}
+ ${RM} -f ${STAGEDIR}${PREFIX}/${_path:C/.*://}
+ (cd ${WRKSRC}/${_path:C/:.*//}; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${_path:C/.*://})
.endfor
.for name in ${PYPY_NAMES:O}
${STRIP_CMD} ${WRKDIR}/${name}
@@ -304,25 +277,31 @@ 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}; ${PYPY_${inst}_NAME} pypy/test_all.py ${PYPY_LIBDIR}/lib_pypy/pypy_test pypy/module)
+ (cd ${WRKSRC}; ${PYPY_${inst}_NAME} pypy/test_all.py lib_pypy/pypy_test pypy/module)
.endfor
pkg-plist: build
${RM} -f ${WRKDIR}/.plist-files-gen ${WRKDIR}/.plist-dirs-gen
-.for dir in ${PYPYDIRS}
- cd ${WRKSRC} && ${FIND} ${dir} -type f >> ${WRKDIR}/.plist-files-gen
- cd ${WRKSRC} && ${FIND} ${dir} -type d >> ${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' \
-e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|g' \
-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 Tue Dec 10 07:36:09 2013 (r336049)
+++ head/lang/pypy/distinfo Tue Dec 10 07:57:46 2013 (r336050)
@@ -1,2 +1,2 @@
-SHA256 (pypy-2.1-src.tar.bz2) = 31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17
-SIZE (pypy-2.1-src.tar.bz2) = 14830606
+SHA256 (pypy-2.2.1-src.tar.bz2) = 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f
+SIZE (pypy-2.2.1-src.tar.bz2) = 14439822
Modified: head/lang/pypy/files/Makefile
==============================================================================
--- head/lang/pypy/files/Makefile Tue Dec 10 07:36:09 2013 (r336049)
+++ head/lang/pypy/files/Makefile Tue Dec 10 07:57:46 2013 (r336050)
@@ -21,7 +21,7 @@ TOUCH?= touch
REINPLACE_CMD?= ${SED} -i~
-BUILDDIR= usession-release-${DISTVERSION}.x-0
+BUILDDIR= usession-release-${DISTVERSION:C/.[0-9]*$//}.x-0
.for inst in ${PYPY_INST}
Modified: head/lang/pypy/files/bsd.pypy.inst.mk
==============================================================================
--- head/lang/pypy/files/bsd.pypy.inst.mk Tue Dec 10 07:36:09 2013 (r336049)
+++ head/lang/pypy/files/bsd.pypy.inst.mk Tue Dec 10 07:57:46 2013 (r336050)
@@ -11,14 +11,3 @@ PYPY_SANDBOX_NAME?= pypy-sandbox
PYPY_SANDBOX_TRANSLATE_ARGS?= --sandbox
PYPY_SANDBOX_OPT?= jit
PYPY_SANDBOX_OBJSPACE_ARGS?=
-
-# Currently does not work
-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?=
Added: head/lang/pypy/files/patch-lib-python__2.7__distutils__command__install.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/pypy/files/patch-lib-python__2.7__distutils__command__install.py Tue Dec 10 07:57:46 2013 (r336050)
@@ -0,0 +1,33 @@
+--- lib-python/2.7/distutils/command/install.py.orig 2012-07-15 10:10:18.000000000 +0200
++++ lib-python/2.7/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200
+@@ -84,9 +84,9 @@
+ 'data' : '$userbase',
+ },
+ 'pypy': {
+- 'purelib': '$base/site-packages',
+- 'platlib': '$base/site-packages',
+- 'headers': '$base/include',
++ 'purelib': '$base/lib/pypy-$pypy_version_short/site-packages',
++ 'platlib': '$platbase/lib/pypy-$pypy_version_short/site-packages',
++ 'headers': '$base/include/pypy-$pypy_version_short/$dist_name',
+ 'scripts': '$base/bin',
+ 'data' : '$base',
+ },
+@@ -304,6 +304,7 @@
+ # about needing recursive variable expansion (shudder).
+
+ py_version = (string.split(sys.version))[0]
++ pypy_version = '%s.%s.%s' % sys.pypy_version_info[:3]
+ (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix')
+ self.config_vars = {'dist_name': self.distribution.get_name(),
+ 'dist_version': self.distribution.get_version(),
+@@ -311,6 +312,9 @@
+ 'py_version': py_version,
+ 'py_version_short': py_version[0:3],
+ 'py_version_nodot': py_version[0] + py_version[2],
++ 'pypy_version': pypy_version,
++ 'pypy_version_short': pypy_version[0:3],
++ 'pypy_version_nodot': pypy_version[0] + pypy_version[2],
+ 'sys_prefix': prefix,
+ 'prefix': prefix,
+ 'sys_exec_prefix': exec_prefix,
Added: head/lang/pypy/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/pypy/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py Tue Dec 10 07:57:46 2013 (r336050)
@@ -0,0 +1,22 @@
+--- lib-python/2.7/distutils/sysconfig_pypy.py.orig 2012-11-22 14:52:20.000000000 +0200
++++ lib-python/2.7/distutils/sysconfig_pypy.py 2012-11-27 17:59:44.000000000 +0200
+@@ -15,7 +15,7 @@
+
+ def get_python_inc(plat_specific=0, prefix=None):
+ from os.path import join as j
+- return j(sys.prefix, 'include')
++ return j(sys.prefix, 'include', 'pypy-%s.%s' % sys.pypy_version_info[:2])
+
+ def get_python_version():
+ """Return a string containing the major and minor Python version,
+@@ -42,8 +42,8 @@
+ if prefix is None:
+ prefix = PREFIX
+ if standard_lib:
+- return os.path.join(prefix, "lib-python", get_python_version())
+- return os.path.join(prefix, 'site-packages')
++ return os.path.join(prefix, 'lib', 'pypy-%s.%s' % sys.pypy_version_info[:2])
++ return os.path.join(prefix, 'lib', 'pypy-%s.%s' % sys.pypy_version_info[:2], 'site-packages')
+
+
+ _config_vars = None
Added: head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py Tue Dec 10 07:57:46 2013 (r336050)
@@ -0,0 +1,40 @@
+--- lib-python/2.7/sysconfig.py.orig 2012-07-15 09:57:14.000000000 +0200
++++ lib-python/2.7/sysconfig.py 2012-07-15 10:03:25.000000000 +0200
+@@ -27,12 +27,12 @@
+ '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}',
+- 'include': '{base}/include',
+- 'platinclude': '{base}/include',
++ 'stdlib': '{base}/lib/pypy-{pypy_version_short}',
++ 'platstdlib': '{platbase}/lib/pypy-{pypy_version_short}',
++ 'purelib': '{base}/lib/pypy-{pypy_version_short}',
++ 'platlib': '{platbase}/lib/pypy-{pypy_version_short}',
++ 'include': '{base}/include/pypy-{pypy_version_short}',
++ 'platinclude': '{platbase}/include/pypy-{pypy_version_short}',
+ 'scripts': '{base}/bin',
+ 'data' : '{base}',
+ },
+@@ -98,6 +98,8 @@
+ 'scripts', 'data')
+ _PY_VERSION = sys.version.split()[0]
+ _PY_VERSION_SHORT = sys.version[:3]
++_PYPY_VERSION = '%s.%s.%s' % sys.pypy_version_info[:3]
++_PYPY_VERSION_SHORT = _PYPY_VERSION[:3]
+ _PY_VERSION_SHORT_NO_DOT = _PY_VERSION[0] + _PY_VERSION[2]
+ _PREFIX = os.path.normpath(sys.prefix)
+ _EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+@@ -304,6 +306,9 @@
+ _CONFIG_VARS['py_version'] = _PY_VERSION
+ _CONFIG_VARS['py_version_short'] = _PY_VERSION_SHORT
+ _CONFIG_VARS['py_version_nodot'] = _PY_VERSION[0] + _PY_VERSION[2]
++ _CONFIG_VARS['py_version'] = _PYPY_VERSION
++ _CONFIG_VARS['pypy_version_short'] = _PYPY_VERSION_SHORT
++ _CONFIG_VARS['pypy_version_nodot'] = _PYPY_VERSION[0] + _PYPY_VERSION[2]
+ _CONFIG_VARS['base'] = _PREFIX
+ _CONFIG_VARS['platbase'] = _EXEC_PREFIX
+ _CONFIG_VARS['projectbase'] = _PROJECT_BASE
Modified: head/lang/pypy/pkg-plist
==============================================================================
--- head/lang/pypy/pkg-plist Tue Dec 10 07:36:09 2013 (r336049)
+++ head/lang/pypy/pkg-plist Tue Dec 10 07:57:46 2013 (r336050)
@@ -21,7 +21,11 @@
%%PYPY_INCLUDEDIR%%/listobject.h
%%PYPY_INCLUDEDIR%%/longintrepr.h
%%PYPY_INCLUDEDIR%%/methodobject.h
+%%PYPY_INCLUDEDIR%%/missing.h
%%PYPY_INCLUDEDIR%%/modsupport.h
+%%PYPY_INCLUDEDIR%%/numpy/arrayobject.h
+%%PYPY_INCLUDEDIR%%/numpy/npy_3kcompat.h
+%%PYPY_INCLUDEDIR%%/numpy/old_defines.h
%%PYPY_INCLUDEDIR%%/object.h
%%PYPY_INCLUDEDIR%%/patchlevel.h
%%PYPY_INCLUDEDIR%%/pycapsule.h
@@ -1450,9 +1454,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__g3b3d68b9x310af836.pypy-21.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g7019d5d3xad93c709.pypy-21.so
-%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g774d129dx1fd01a91.pypy-21.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3e8f69b6x1fd01a91.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g45f34413x310af836.pypy-%%PYPY_VER%%.so
+%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__ga01735dbxad93c709.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
@@ -1590,6 +1594,8 @@
%%PYPY_LIBDIR%%/lib_pypy/cffi/ffiplatform.pyc
%%PYPY_LIBDIR%%/lib_pypy/cffi/gc_weakref.py
%%PYPY_LIBDIR%%/lib_pypy/cffi/gc_weakref.pyc
+%%PYPY_LIBDIR%%/lib_pypy/cffi/lock.py
+%%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/vengine_cpy.py
@@ -1637,36 +1643,6 @@
%%PYPY_LIBDIR%%/lib_pypy/marshal.pyc
%%PYPY_LIBDIR%%/lib_pypy/msvcrt.py
%%PYPY_LIBDIR%%/lib_pypy/msvcrt.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpy.py
-%%PYPY_LIBDIR%%/lib_pypy/numpy.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/__init__.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/__init__.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/__init__.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/__init__.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/_methods.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/_methods.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/arrayprint.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/arrayprint.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/fromnumeric.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/fromnumeric.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/multiarray.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/multiarray.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numeric.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numeric.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numerictypes.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/numerictypes.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/shape_base.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/shape_base.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/umath.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/core/umath.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/__init__.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/__init__.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/function_base.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/function_base.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/shape_base.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/shape_base.pyc
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/twodim_base.py
-%%PYPY_LIBDIR%%/lib_pypy/numpypy/lib/twodim_base.pyc
%%PYPY_LIBDIR%%/lib_pypy/pwd.py
%%PYPY_LIBDIR%%/lib_pypy/pwd.pyc
%%PYPY_LIBDIR%%/lib_pypy/pyrepl/__init__.py
@@ -1715,6 +1691,7 @@
%%PYPY_LIBDIR%%/lib_pypy/pyrepl/unix_console.pyc
%%PYPY_LIBDIR%%/lib_pypy/pyrepl/unix_eventqueue.py
%%PYPY_LIBDIR%%/lib_pypy/pyrepl/unix_eventqueue.pyc
+%%PYPY_LIBDIR%%/lib_pypy/readline.egg-info
%%PYPY_LIBDIR%%/lib_pypy/readline.py
%%PYPY_LIBDIR%%/lib_pypy/readline.pyc
%%PYPY_LIBDIR%%/lib_pypy/resource.py
@@ -3749,7 +3726,7 @@
@dirrm %%PYPY_LIBDIR%%/test
@dirrm %%PYPY_LIBDIR%%/sqlite3/test
@dirrm %%PYPY_LIBDIR%%/sqlite3
- at dirrm %%PYPY_LIBDIR%%/site-packages
+ at dirrmtry %%PYPY_LIBDIR%%/site-packages
@dirrm %%PYPY_LIBDIR%%/pydoc_data
@dirrm %%PYPY_LIBDIR%%/plat-unixware7
@dirrm %%PYPY_LIBDIR%%/plat-sunos5
@@ -3787,9 +3764,6 @@
@dirrm %%PYPY_LIBDIR%%/msilib
@dirrm %%PYPY_LIBDIR%%/logging
@dirrm %%PYPY_LIBDIR%%/lib_pypy/pyrepl
- at dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy/lib
- at dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy/core
- at dirrm %%PYPY_LIBDIR%%/lib_pypy/numpypy
@dirrm %%PYPY_LIBDIR%%/lib_pypy/ctypes_config_cache
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser/ply
@dirrm %%PYPY_LIBDIR%%/lib_pypy/cffi/_pycparser
@@ -3830,5 +3804,6 @@
@dirrm %%PYPY_LIBDIR%%/compiler
@dirrm %%PYPY_LIBDIR%%/bsddb/test
@dirrm %%PYPY_LIBDIR%%/bsddb
- at dirrm %%PYPY_LIBDIR%%
- at dirrm %%PYPY_INCLUDEDIR%%
+ at dirrmtry %%PYPY_LIBDIR%%
+ at dirrm %%PYPY_INCLUDEDIR%%/numpy
+ at dirrmtry %%PYPY_INCLUDEDIR%%
More information about the svn-ports-head
mailing list