Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Feb 2012 09:42:38 GMT
From:      David Naylor <naylor.b.david@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/165026: [patch] update lang/pypy from 1.7 to 1.8
Message-ID:  <201202120942.q1C9gcF8032105@red.freebsd.org>
Resent-Message-ID: <201202120950.q1C9oAcI027194@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         165026
>Category:       ports
>Synopsis:       [patch] update lang/pypy from 1.7 to 1.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 12 09:50:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     David Naylor
>Release:        
>Organization:
>Environment:
>Description:
The repository used to develop this port is available at github.com/DragonSA/pypy.

Highlights
----------
 * List strategies. Now lists that contain only ints or only floats should be as efficient as storing them in a binary-packed array. It also improves the JIT performance in places that use such lists. There are also special strategies for unicode and string lists.
 * As usual, numerous performance improvements. There are many examples of python constructs that now should be faster; too many to list them.
 * Bugfixes and compatibility fixes with CPython.
 * Windows fixes.
 * NumPy effort progress; for the exact list of things that have been done, consult the numpy status page. A tentative list of things that has been done:
   - multi dimensional arrays
   - various sizes of dtypes
   - a lot of ufuncs
   - a lot of other minor changes
   Right now the numpy module is available under both numpy and numpypy names.   However, because it's incomplete, you have to import numpypy first before doing any imports from numpy.
 * New JIT hooks that allow you to hook into the JIT process from your python program. There is a brief overview of what they offer.
 * Standard library upgrade from 2.7.1 to 2.7.2.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN /usr/ports/lang/pypy/Makefile pypy/Makefile
--- /usr/ports/lang/pypy/Makefile	2011-12-13 17:37:36.000000000 +0200
+++ pypy/Makefile	2012-02-12 11:30:56.000000000 +0200
@@ -2,11 +2,11 @@
 # Date created:				2011/05/17
 # Whom:					David Naylor <naylor.b.david@gmail.com>
 #
-# $FreeBSD: ports/lang/pypy/Makefile,v 1.1 2011/12/13 15:37:36 lwhsu Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	pypy
-DISTVERSION=	1.7
+DISTVERSION=	1.8
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/
 DISTNAME=	release-${DISTVERSION}
@@ -29,7 +29,7 @@
 USE_GETTEXT=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
-WRKSRC=		${WRKDIR}/pypy-pypy-release-${DISTVERSION}
+WRKSRC=		${WRKDIR}/pypy-pypy-2346207d9946
 
 PYPYDIRS=	include lib-python lib_pypy site-packages
 PYPYPREFIX?=	${PREFIX}/${PORTNAME}-${DISTVERSION}
@@ -65,7 +65,11 @@
 # Use pypy if it is installed, else use python (to translate)
 .if !defined(PY)
 .if !defined(PYPY)
+.if ${PYPY_PRIMARY} == pypy
 PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || true
+.else
+PYPY!=		${WHICH} ${PYPY_PRIMARY} 2> /dev/null || ${WHICH} pypy 2> /dev/null || true
+.endif
 .endif
 .if exists(${PYPY})
 PY=		${PYPY}
@@ -146,8 +150,8 @@
 	${ECHO} "all: ${PYPY_NAMES}" > ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 .for inst in ${PYPY_INST}
-	${ECHO} "${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c" >> ${WRKDIR}/Makefile
-	${ECHO} "	${CP} build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c ${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
+	${ECHO} "${PYPY_${inst}_NAME}: build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c" >> ${WRKDIR}/Makefile
+	${ECHO} "	${CP} build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c ${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 	${ECHO} ".done_translate_${PYPY_${inst}_NAME}:" >> ${WRKDIR}/Makefile
 	${ECHO} "	${RM} -rf build_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
@@ -158,9 +162,9 @@
 					targetpypystandalone.py ${PYPY_${inst}_OBJSPACE_ARGS} )" >> ${WRKDIR}/Makefile
 	${ECHO} "	${TOUCH} .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
-	${ECHO} "build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
-	${ECHO} "	${REINPLACE_CMD} -e 's|^%.o: %.c\$$\$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1/Makefile" >> ${WRKDIR}/Makefile
-	${ECHO} "	${MAKE} -C build_${PYPY_${inst}_NAME}/usession-unknown-0/testing_1 pypy-c" >> ${WRKDIR}/Makefile
+	${ECHO} "build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/pypy-c: .done_translate_${PYPY_${inst}_NAME}" >> ${WRKDIR}/Makefile
+	${ECHO} "	${REINPLACE_CMD} -e 's|^%.o: %.c\$$\$$|.c.o:|g' build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1/Makefile" >> ${WRKDIR}/Makefile
+	${ECHO} "	${MAKE} -C build_${PYPY_${inst}_NAME}/usession-release-${DISTVERSION}-0/testing_1 pypy-c" >> ${WRKDIR}/Makefile
 	${ECHO} >> ${WRKDIR}/Makefile
 .endfor
 
diff -urN /usr/ports/lang/pypy/TODO pypy/TODO
--- /usr/ports/lang/pypy/TODO	1970-01-01 02:00:00.000000000 +0200
+++ pypy/TODO	2012-02-12 11:30:56.000000000 +0200
@@ -0,0 +1,11 @@
+TODO:
+ * check for sufficient memory
+ * support CLI backend (broken in 1.5-1.7)
+ * support JVM backend (untested)
+ * support valgrind
+ * make jitviewer port (depends flask pygments simplejson Jinja2 Werkzeug)
+
+Pypy deficiencies under FreeBSD:
+ * boehm GC does not work (possibly FreeBSD specific)
+ * --gcrootfinder=asmgcc does not work (currently only works under Linux)
+ * CLI backend (all platforms)
diff -urN /usr/ports/lang/pypy/distinfo pypy/distinfo
--- /usr/ports/lang/pypy/distinfo	2011-12-13 17:37:36.000000000 +0200
+++ pypy/distinfo	2012-02-12 11:30:56.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (pypy/release-1.7.tar.bz2) = 2e0884f4696cc8617be73cb8af8da063073d685b3d3e5de3366bfae4d33fac16
-SIZE (pypy/release-1.7.tar.bz2) = 14842336
+SHA256 (pypy/release-1.8.tar.bz2) = ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287
+SIZE (pypy/release-1.8.tar.bz2) = 14927806
diff -urN /usr/ports/lang/pypy/files/bsd.pypy.inst.mk pypy/files/bsd.pypy.inst.mk
--- /usr/ports/lang/pypy/files/bsd.pypy.inst.mk	2011-12-13 17:37:36.000000000 +0200
+++ pypy/files/bsd.pypy.inst.mk	2012-02-12 11:30:56.000000000 +0200
@@ -3,7 +3,7 @@
 # options available.  --gcrootfinder=asmgcc does not work under FreeBSD/amd64.
 
 PYPY_DEFAULT_NAME?=		pypy
-PYPY_DEFAULT_TRANSLATE_ARGS?=	--thread
+PYPY_DEFAULT_TRANSLATE_ARGS?=
 PYPY_DEFAULT_OPT?=		jit
 PYPY_DEFAULT_OBJSPACE_ARGS?=
 
diff -urN /usr/ports/lang/pypy/files/patch-pypy__translator__platform__freebsd.py pypy/files/patch-pypy__translator__platform__freebsd.py
--- /usr/ports/lang/pypy/files/patch-pypy__translator__platform__freebsd.py	2011-12-13 17:37:36.000000000 +0200
+++ pypy/files/patch-pypy__translator__platform__freebsd.py	1970-01-01 02:00:00.000000000 +0200
@@ -1,34 +0,0 @@
---- pypy/translator/platform/freebsd.py	2011-08-15 17:10:35.000000000 +0200
-+++ pypy/translator/platform/freebsd.py	2011-10-05 20:49:51.000000000 +0200
-@@ -1,6 +1,7 @@
- """Support for FreeBSD."""
- 
- import os
-+import shlex
- 
- from pypy.translator.platform import posix
- 
-@@ -10,16 +11,18 @@
-     else:
-         return default
- 
--def get_env_vector(key, default):
-+def get_env_vector(key, default, required=()):
-     string = get_env(key, default)
--    # XXX: handle quotes
--    return string.split()
-+    args = shlex.split(string)
-+    args.extend(i for i in required if i not in args)
-+    return args
- 
- class Freebsd(posix.BasePosix):
-     name = "freebsd"
- 
--    link_flags = get_env_vector("LDFLAGS", '-pthread')
--    cflags = get_env_vector("CFLAGS", "-O3 -pthread -fomit-frame-pointer")
-+    # FreeBSD requires '-pthread' to be passed for successful compiling
-+    link_flags = get_env_vector("LDFLAGS", "", ("-pthread",))
-+    cflags = get_env_vector("CFLAGS", "-O3 -fomit-frame-pointer", ("-pthread",))
-     standalone_only = []
-     shared_only = []
-     so_ext = 'so'
diff -urN /usr/ports/lang/pypy/files/use.pypy pypy/files/use.pypy
--- /usr/ports/lang/pypy/files/use.pypy	2011-12-13 17:37:36.000000000 +0200
+++ pypy/files/use.pypy	2012-02-12 11:30:56.000000000 +0200
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $FreeBSD: ports/lang/pypy/files/use.pypy,v 1.1 2011/12/13 15:37:36 lwhsu Exp $
+# $FreeBSD$
 
 PREFIX=%%PREFIX%%
 PYPYPREFIX=%%PYPYPREFIX%%
diff -urN /usr/ports/lang/pypy/pkg-plist pypy/pkg-plist
--- /usr/ports/lang/pypy/pkg-plist	2011-12-13 17:37:36.000000000 +0200
+++ pypy/pkg-plist	2012-02-12 11:30:56.000000000 +0200
@@ -1252,6 +1252,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/PatternGrammar.txt
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/__init__.py
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/__init__.pyc
+%%PYPYPREFIX%%/lib-python/2.7/lib2to3/__main__.py
+%%PYPYPREFIX%%/lib-python/2.7/lib2to3/__main__.pyc
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_matcher.py
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_matcher.pyc
 %%PYPYPREFIX%%/lib-python/2.7/lib2to3/btm_utils.py
@@ -2182,8 +2184,32 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/buffer_tests.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/cfgparser.1
 %%PYPYPREFIX%%/lib-python/2.7/test/check_soundcard.vbs
-%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings_test.py
-%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings_test.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5hkscs-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/big5hkscs.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/cp949-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/cp949.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jisx0213-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jisx0213.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jp-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_jp.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_kr-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/euc_kr.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb18030-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb18030.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb2312-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gb2312.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gbk-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/gbk.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/hz-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/hz.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/johab-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/johab.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jis-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jis.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jisx0213-utf8.txt
+%%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings/shift_jisx0213.txt
 %%PYPYPREFIX%%/lib-python/2.7/test/cmath_testcases.txt
 %%PYPYPREFIX%%/lib-python/2.7/test/crashers/README
 %%PYPYPREFIX%%/lib-python/2.7/test/crashers/bogus_code_obj.py
@@ -2438,6 +2464,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/ssl_key.pem
 %%PYPYPREFIX%%/lib-python/2.7/test/string_tests.py
 %%PYPYPREFIX%%/lib-python/2.7/test/string_tests.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata/sigchild_ignore.py
+%%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata/sigchild_ignore.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/svn_python_org_https_cert.pem
 %%PYPYPREFIX%%/lib-python/2.7/test/test_MimeWriter.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_MimeWriter.pyc
@@ -2872,6 +2900,8 @@
 %%PYPYPREFIX%%/lib-python/2.7/test/test_module.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_modulefinder.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_modulefinder.pyc
+%%PYPYPREFIX%%/lib-python/2.7/test/test_msilib.py
+%%PYPYPREFIX%%/lib-python/2.7/test/test_msilib.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec.py
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec.pyc
 %%PYPYPREFIX%%/lib-python/2.7/test/test_multibytecodec_support.py
@@ -3743,113 +3773,6 @@
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/version.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/versionpredicate.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/versionpredicate.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/_parseaddr.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/_parseaddr.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/base64mime.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/base64mime.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/charset.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/charset.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/encoders.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/encoders.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/errors.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/errors.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/feedparser.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/feedparser.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/generator.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/generator.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/header.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/header.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/iterators.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/iterators.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/message.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/message.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/application.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/application.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/audio.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/audio.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/base.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/base.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/image.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/image.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/message.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/message.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/multipart.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/multipart.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/nonmultipart.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/nonmultipart.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/text.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/mime/text.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/parser.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/parser.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/quoprimime.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/quoprimime.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/__init__.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/__init__.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/PyBanner048.gif
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/audiotest.au
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_01.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_02.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_03.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_04.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_05.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_06.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_07.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_08.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_09.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_10.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_11.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_12.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_12a.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_13.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_14.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_15.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_16.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_17.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_18.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_19.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_20.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_21.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_22.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_23.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_24.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_25.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_26.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_27.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_28.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_29.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_30.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_31.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_32.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_33.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_34.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_35.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_36.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_37.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_38.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_39.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_40.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_41.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_42.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_43.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_44.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_45.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data/msg_46.txt
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs_renamed.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_codecs_renamed.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_renamed.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_renamed.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_torture.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/test/test_email_torture.pyc
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/utils.py
-%%PYPYPREFIX%%/lib-python/modified-2.7/email/utils.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/heapq.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/heapq.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/httplib.py
@@ -4469,6 +4392,8 @@
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_sort.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_ssl.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_ssl.pyc
+%%PYPYPREFIX%%/lib-python/modified-2.7/test/test_str.py
+%%PYPYPREFIX%%/lib-python/modified-2.7/test/test_str.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_struct.py
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_struct.pyc
 %%PYPYPREFIX%%/lib-python/modified-2.7/test/test_subprocess.py
@@ -4677,6 +4602,7 @@
 %%PYPYPREFIX%%/lib_pypy/distributed/protocol.py
 %%PYPYPREFIX%%/lib_pypy/distributed/protocol.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/socklayer.py
+%%PYPYPREFIX%%/lib_pypy/distributed/socklayer.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/support.py
 %%PYPYPREFIX%%/lib_pypy/distributed/support.pyc
 %%PYPYPREFIX%%/lib_pypy/distributed/test/__init__.py
@@ -4701,6 +4627,20 @@
 %%PYPYPREFIX%%/lib_pypy/marshal.pyc
 %%PYPYPREFIX%%/lib_pypy/msvcrt.py
 %%PYPYPREFIX%%/lib_pypy/msvcrt.pyc
+%%PYPYPREFIX%%/lib_pypy/numpy.py
+%%PYPYPREFIX%%/lib_pypy/numpy.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/__init__.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/__init__.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/__init__.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/__init__.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/_methods.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/_methods.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/arrayprint.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/arrayprint.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/fromnumeric.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/fromnumeric.pyc
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/numeric.py
+%%PYPYPREFIX%%/lib_pypy/numpypy/core/numeric.pyc
 %%PYPYPREFIX%%/lib_pypy/pwd.py
 %%PYPYPREFIX%%/lib_pypy/pwd.pyc
 %%PYPYPREFIX%%/lib_pypy/pyexpat.py
@@ -4840,6 +4780,8 @@
 @dirrm %%PYPYPREFIX%%/lib_pypy/pyrepl/test
 @dirrm %%PYPYPREFIX%%/lib_pypy/pyrepl
 @dirrm %%PYPYPREFIX%%/lib_pypy/pypy_test
+@dirrm %%PYPYPREFIX%%/lib_pypy/numpypy/core
+@dirrm %%PYPYPREFIX%%/lib_pypy/numpypy
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed/test
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed/demo
 @dirrm %%PYPYPREFIX%%/lib_pypy/distributed
@@ -4863,10 +4805,6 @@
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/json
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/idlelib/Icons
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/idlelib
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/test/data
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/test
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email/mime
-@dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/email
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/tests
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils/command
 @dirrm %%PYPYPREFIX%%/lib-python/modified-2.7/distutils
@@ -4884,10 +4822,12 @@
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/unittest
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/xmltestdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/tracedmodules
+@dirrm %%PYPYPREFIX%%/lib-python/2.7/test/subprocessdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/leakers
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/decimaltestdata
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/data
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test/crashers
+@dirrm %%PYPYPREFIX%%/lib-python/2.7/test/cjkencodings
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/test
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/sqlite3/test
 @dirrm %%PYPYPREFIX%%/lib-python/2.7/sqlite3


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202120942.q1C9gcF8032105>