Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Aug 2015 09:07:23 +0000 (UTC)
From:      David Naylor <dbn@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r393390 - in head/lang/pypy: . files
Message-ID:  <201508010907.t7197NGl048438@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbn
Date: Sat Aug  1 09:07:22 2015
New Revision: 393390
URL: https://svnweb.freebsd.org/changeset/ports/393390

Log:
  lang/pypy: simplify port
  
   - Use upstreams directory layout instead of FreeBSD's preferred directory
     layout [1]
   - Move the pypy installation into $PREFIX/pypy-x.y
   - Remove the ability to build multiple instances (i.e. default to just
     the JIT instance)
   - Install the binary as pypy (instead of pypy-2.6 with a symlink to pypy)
   - Remove the creation of cffi modules (will be outsourced to other ports,
     a la cpython)
   - Remove sqlite3 and gdbm dependencies (i.e. cffi modules)
  
  PR:             183795
  Differential Revision:  https://reviews.freebsd.org/D3209

Added:
  head/lang/pypy/files/patch-pypy_tool_release_package.py   (contents, props changed)
  head/lang/pypy/files/patch-rpython_config_support.py
     - copied, changed from r393388, head/lang/pypy/files/patch-rpython__config__support.py
  head/lang/pypy/files/patch-rpython_rtyper_tool_rffi__platform.py
     - copied, changed from r388667, head/lang/pypy/files/patch-rpython__rtyper__tool__rffi_platform.py
Deleted:
  head/lang/pypy/files/Makefile
  head/lang/pypy/files/bsd.pypy.inst.mk
  head/lang/pypy/files/compile_cffi.py
  head/lang/pypy/files/patch-lib-python__2.7__distutils__command__install.py
  head/lang/pypy/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py
  head/lang/pypy/files/patch-lib-python__2.7__sysconfig.py
  head/lang/pypy/files/patch-pypy__module__sys__initpath.py
  head/lang/pypy/files/patch-pypy__sandbox__pypy_interactive.py
  head/lang/pypy/files/patch-rpython__config__support.py
  head/lang/pypy/files/patch-rpython__rtyper__tool__rffi_platform.py
  head/lang/pypy/files/use.pypy
Modified:
  head/lang/pypy/Makefile
  head/lang/pypy/pkg-plist

Modified: head/lang/pypy/Makefile
==============================================================================
--- head/lang/pypy/Makefile	Sat Aug  1 09:04:27 2015	(r393389)
+++ head/lang/pypy/Makefile	Sat Aug  1 09:07:22 2015	(r393390)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	pypy
-DISTVERSION=	2.6.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
+PORTREVISION=	2
 CATEGORIES=	lang python
 MASTER_SITES=	https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/pypy
 DISTNAME=	release-${DISTVERSION}
@@ -16,20 +16,12 @@ LICENSE=	MIT PSFL
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libffi.so:${PORTSDIR}/devel/libffi \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libgdbm.so:${PORTSDIR}/databases/gdbm
+		libffi.so:${PORTSDIR}/devel/libffi
 
 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=		PyPy instances
-SANDBOX_DESC=	Translate a sandboxed pypy
 TRANS_DESC=	Translation method
-.if !defined(PYPY_INST)
-OPTIONS_GROUP=	PYINST
-OPTIONS_GROUP_PYINST=	SANDBOX
-.endif
 LOCALBASE?=	/usr/local
 .if exists(${LOCALBASE}/bin/pypy)
 OPTIONS_SINGLE=	TRANS
@@ -37,35 +29,20 @@ OPTIONS_SINGLE_TRANS=	PYTHON PYPY PYPY_M
 OPTIONS_DEFAULT+=	PYPY_MINMEM
 .endif
 
-# Disable CFFI compilation and shared libraries temporarily
-PLIST_SUB+=	CFFI="@comment "
+CONFLICTS_INSTALL=	pypy3-[0-9]*
 
-CONFLICTS_INSTALL=	pypy-[0-9]*
+ALL_TARGET=	pypy-c
+BUILD_WRKSRC=	${WRKDIR}/build/usession-release-${DISTVERSION}-0/testing_1
+MAKE_ENV+=	PYPY_LOCALBASE=${LOCALBASE}
 
-ALL_TARGET=	${PYPY_NAMES}
-BUILD_WRKSRC=	${WRKDIR}
-USES=		compiler:c11 gettext iconv tar:bzip2
-MAKEFILE=	${FILESDIR}/Makefile
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+USE_LDCONFIG=	${PREFIX}/${PYPY_DIR}/bin
+USES=		compiler:c11 gettext-runtime tar:bzip2
 WRKSRC=		${WRKDIR}/pypy-pypy-295ee98b6928
 
-PYPY_VER=	${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
-PYTHON_IMPL_VER=	2.7
-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}
-
-MAKE_ENV+=	DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \
-		WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE}
+PYPY_DIR=	pypy-${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|}
+PLIST_SUB+=	PYPY_DIR=${PYPY_DIR}
 
 .include <bsd.port.options.mk>
-.include "${MASTERDIR}/files/bsd.pypy.inst.mk"
 
 .if ${PORT_OPTIONS:MPYPY} || defined(PYTHON_CMD)
 PYTHON_CMD?=	${LOCALBASE}/bin/pypy
@@ -75,48 +52,14 @@ PYTHON_CMD?=	"${SETENV} PYPY_GC_MAX_DELT
 USES+=		python:2,build
 .endif
 
-# List of PyPy instances
-.if !defined(PYPY_INST)
-PYPY_INST=	DEFAULT
-
-.if ${PORT_OPTIONS:MSANDBOX}
-PYPY_INST+=	SANDBOX
-.endif
-
-.endif # !defined(PYPY_INST)
-
-MAKE_ENV+=	PYPY_INST="${PYPY_INST}"
-
-.for inst in ${PYPY_INST}
-
-PYPY_NAMES+=	${PYPY_${inst}_NAME}
-PYPY_PRIMARY?=	${PYPY_${inst}_NAME}
-MAKE_ENV+=	PYPY_${inst}_NAME="${PYPY_${inst}_NAME}" \
-		PYPY_${inst}_OBJSPACE_ARGS="${PYPY_${inst}_OBJSPACE_ARGS}" \
-		PYPY_${inst}_OPT="${PYPY_${inst}_OPT}" \
-		PYPY_${inst}_TRANSLATE_ARGS="${PYPY_${inst}_TRANSLATE_ARGS}"
-
-# 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 # inst in ${PYPY_INST}
-
-.if defined(WITH_BOEHM_GC)
-LIB_DEPENDS+=	libgc.so:${PORTSDIR}/devel/boehm-gc
-.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).
 .if ${ARCH} == "i386"
 PYPY_ARCH=	x86_32
-PYPY_JITTABLE=	YES
 PYPY_BITS=	32
 .elif ${ARCH} == "amd64"
 PYPY_ARCH=	x86_64
-PYPY_JITTABLE=	YES
 PYPY_BITS=	64
 .elif ${ARCH} == "powerpc"
 PYPY_ARCH=	ppc_32
@@ -130,162 +73,40 @@ 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}
-.if ${PYPY_${inst}_OPT} == jit
-PYPY_${inst}_OPT=	2
-.endif
-.endfor # inst in ${PYPY_INST}
-.endif # !defined(PYPY_JITTABLE)
 
-# Translating requires a large amount of memory, with a two by two matrix
-# requirement (bitness vs PYTHON_CMD).  A more refined matrix is possible based
-# on optimisation level however this assumes "jit" is the preferred optimisation
-# level.
-#
-.if ${PYPY_ARCH:M*64}
-.  if ${PORT_OPTIONS:MPYPY}
-# 64bit + pypy = 5.1 GiB
-PYPY_TRANSLATION_MEMORY=	5347737
-.  elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 64bit + pypy (minimum memory) = 3.2 GiB
-PYPY_TRANSLATION_MEMORY=	3355443
-.  else
-# 64bit + python = 4.8 GiB
-PYPY_TRANSLATION_MEMORY=	5033164
-.  endif
-# 64bit system += 366 MiB
-PYPY_MINIMUM_MEMORY=	$$((${PYPY_TRANSLATION_MEMORY} + 374784))
-.else
-.  if ${PORT_OPTIONS:MPYPY}
-# 32bit + pypy = 2.2GiB
-PYPY_TRANSLATION_MEMORY=	2306867
-.  elif ${PORT_OPTIONS:MPYPY_MINMEM}
-# 32bit + pypy (minimum memory) = 1.9GiB
-PYPY_TRANSLATION_MEMORY=	1992294
-.  else
-# 32bit + python = 2.5 GiB
-PYPY_TRANSLATION_MEMORY=	2558588
-.  endif
-# 32bit system += 168 MiB
-PYPY_MINIMUM_MEMORY=	$$((${PYPY_TRANSLATION_MEMORY} + 171787))
-.endif
-
-.if !defined(DISABLE_MAKE_JOBS) && ${PYPY_PRIMARY} != ${PYPY_NAMES}
-PYPY_MEMORY_MULTIPLY=	`echo ${PYPY_NAMES} | wc -w`
-.else
-PYPY_MEMORY_MULTIPLY=	1
-.endif
-
-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 ${PORT_OPTIONS:MPYPY}
-PYPY_MEM_WARNING+=	;\
-	${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+=	;\
-	${ECHO} "warn: consider using -DDISABLE_MAKE_JOBS to serialise builds and to conserve memory"
-.endif
-.if !defined(PYPY_IGNORE_MEMORY)
-PYPY_MEM_WARNING+=	;\
-	${ECHO} "err: memory warnings are terminal, to overwrite this error define -DPYPY_IGNORE_MEMORY and try again"; \
-	exit 1
-.else
-PYPY_MEM_WARNING+=	;\
-	${ECHO} "warn: THIS SYSTEM MAY END UP SWAP THRASHING AD INFINITUM"
-.endif
+pre-build: ${BUILD_WRKSRC}/Makefile
 
-usage:
-	@${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"
-	@${ECHO} "PYPY_CUSTOM_TRANSLATE_ARGS=	--gcrootfinder=shadowstack --gc=generation"
-	@${ECHO} "PYPY_CUSTOM_OPT=		0"
-	@${ECHO} "PYPY_CUSTOM_OBJSPACE_ARGS=	--no-objspace-usepycfiles --objspace=thunk"
-	@${ECHO} "will produce two binaries named 'pypy-sandbox' (SANDBOX instance) and"
-	@${ECHO} "'pypy-custom' (CUSTOM instance)."
-	@${ECHO} "See for a list of parameters:"
-	@${ECHO} "	http://readthedocs.org/docs/pypy/latest/config/index.html"
-	@${ECHO} "See for predefined instances:"
-	@${ECHO} "	${FILESDIR}/bsd.pypy.inst.mk"
-	@${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."
-
-pre-fetch:
-	@${ECHO} Please see http://wiki.FreeBSD.org/PyPy for more details on the port or 'make usage' for a summary
-	@if [ $$((`sysctl -n hw.physmem` / 1024)) -le $$((${PYPY_MINIMUM_MEMORY} * ${PYPY_MEMORY_MULTIPLY})) ]; then ${PYPY_MEM_WARNING}; fi
-
-post-extract:
-.for _path in ${PYPYDIRS}
-	${MKDIR} ${WRKDIR}/`${DIRNAME} ${_path:C/.*://}`
-	${LN} -s ${WRKSRC}/${_path:C/:.*//} ${WRKDIR}/${_path:C/.*://}
-.endfor
-	${LN} -s ${WRKDIR}/lib ${WRKSRC}/lib
-
-do-configure:
-	${SED} -e 's|%%PREFIX%%|${PREFIX}|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}
+${BUILD_WRKSRC}/Makefile:
+	${RM} -r ${WRKDIR}/build
+	${MKDIR} ${WRKDIR}/build
+	(cd ${WRKSRC}/pypy/goal; \
+		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \
+		${PYTHON_CMD} ../../rpython/bin/rpython --source -Ojit targetpypystandalone.py)
+	${REINPLACE_CMD} -e 's|^%.o: %.c$$|.c.o:|g' ${BUILD_WRKSRC}/Makefile
 
 post-build:
-# Disable CFFI compilation and shared libraries temporarily
-#	${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
-	${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
-.endfor
+	${CP} ${BUILD_WRKSRC}/pypy-c ${BUILD_WRKSRC}/libpypy-c.so ${WRKSRC}/pypy/goal/
 
 do-install:
-.for _path in ${PYPYDIRS}
-	${RM} -r ${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}
-	${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}
-	@${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 lib_pypy/pypy_test pypy/module)
-.endfor
+	${SETENV} TMPDIR=${WRKDIR}/build \
+		${PYTHON_CMD} ${WRKSRC}/pypy/tool/release/package.py --without-cffi --builddir ${WRKDIR}/build --archive-name ${PYPY_DIR}
+	${EXTRACT_CMD} -C ${STAGEDIR}${PREFIX} -xf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2
+	${LN} -s ../${PYPY_DIR}/bin/pypy ${STAGEDIR}${PREFIX}/bin/pypy
+
+regression-test: build
+	(cd ${WRKSRC}; \
+		${SETENV} ${MAKE_ENV} TMPDIR=${WRKDIR}/build \
+		${WRKSRC}/pypy/goal/pypy-c pypy/test_all.py --basetemp ${WRKDIR}/build pypy lib-python)
 
 pkg-plist: build
-	${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' \
+	${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen
+	${REINPLACE_CMD} -e 's|^${PYPY_DIR}|%%PYPY_DIR%%|g' \
 		-e 's|${PYPY_ARCH}|%%PYPY_ARCH%%|g' \
 		-e 's|_${PYPY_BITS}_|_%%PYPY_BITS%%_|g' \
-		-e 's|-${PYPY_VER:C/\.//}\.|-%%PYPY_VER%%.|g' \
+		-e '/\/$$/d' \
 			${WRKDIR}/.plist-files-gen
-	${SORT} ${WRKDIR}/.plist-files-gen > ${WRKDIR}/pkg-plist
+	${ECHO} bin/pypy > ${WRKDIR}/pkg-plist
+	${SORT} ${WRKDIR}/.plist-files-gen >> ${WRKDIR}/pkg-plist
 	${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist
 
 .include <bsd.port.mk>

Added: head/lang/pypy/files/patch-pypy_tool_release_package.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/pypy/files/patch-pypy_tool_release_package.py	Sat Aug  1 09:07:22 2015	(r393390)
@@ -0,0 +1,11 @@
+--- pypy/tool/release/package.py.orig	2015-05-31 07:19:51 UTC
++++ pypy/tool/release/package.py
+@@ -135,7 +135,7 @@ def create_package(basedir, options, _fa
+                                 'not find it' % (str(libpypy_c),))
+         binaries.append((libpypy_c, libpypy_name))
+     #
+-    builddir = options.builddir
++    builddir = py.path.local(options.builddir)
+     pypydir = builddir.ensure(name, dir=True)
+     includedir = basedir.join('include')
+     # Recursively copy all headers, shutil has only ignore

Copied and modified: head/lang/pypy/files/patch-rpython_config_support.py (from r393388, head/lang/pypy/files/patch-rpython__config__support.py)
==============================================================================
--- head/lang/pypy/files/patch-rpython__config__support.py	Sat Aug  1 07:46:22 2015	(r393388, copy source)
+++ head/lang/pypy/files/patch-rpython_config_support.py	Sat Aug  1 09:07:22 2015	(r393390)
@@ -1,6 +1,6 @@
---- ./rpython/config/support.py~	2013-12-16 12:34:17.000000000 +0200
-+++ ./rpython/config/support.py	2013-12-16 12:33:52.000000000 +0200
-@@ -8,7 +8,9 @@
+--- rpython/config/support.py.orig	2015-05-31 07:19:51 UTC
++++ rpython/config/support.py
+@@ -8,7 +8,9 @@ def detect_number_of_processors(filename
      if os.environ.get('MAKEFLAGS'):
          return 1    # don't override MAKEFLAGS.  This will call 'make' without any '-j' option
      if sys.platform == 'darwin':
@@ -11,7 +11,7 @@
      elif not sys.platform.startswith('linux'):
          return 1    # implement me
      try:
-@@ -26,11 +28,10 @@
+@@ -26,11 +28,10 @@ def detect_number_of_processors(filename
      except:
          return 1 # we really don't want to explode here, at worst we have 1
  

Copied and modified: head/lang/pypy/files/patch-rpython_rtyper_tool_rffi__platform.py (from r388667, head/lang/pypy/files/patch-rpython__rtyper__tool__rffi_platform.py)
==============================================================================
--- head/lang/pypy/files/patch-rpython__rtyper__tool__rffi_platform.py	Sat Jun  6 14:24:46 2015	(r388667, copy source)
+++ head/lang/pypy/files/patch-rpython_rtyper_tool_rffi__platform.py	Sat Aug  1 09:07:22 2015	(r393390)
@@ -1,7 +1,7 @@
---- rpython/rtyper/tool/rffi_platform.py~	2011-11-19 09:44:54.000000000 +0200
-+++ rpython/rtyper/tool/rffi_platform.py	2011-11-23 20:17:30.000000000 +0200
-@@ -805,7 +805,9 @@
-         includes=['gc.h']
+--- rpython/rtyper/tool/rffi_platform.py.orig	2015-05-31 07:19:51 UTC
++++ rpython/rtyper/tool/rffi_platform.py
+@@ -854,7 +854,9 @@ def configure_boehm(platform=None):
+         platform = None
      else:
          library_dir = ''
 -        libraries = ['gc', 'dl']

Modified: head/lang/pypy/pkg-plist
==============================================================================
--- head/lang/pypy/pkg-plist	Sat Aug  1 09:04:27 2015	(r393389)
+++ head/lang/pypy/pkg-plist	Sat Aug  1 09:07:22 2015	(r393390)
@@ -1,3915 +1,2193 @@
-%%PYPY_INCLUDEDIR%%/PyPy.h
-%%PYPY_INCLUDEDIR%%/Python.h
-%%PYPY_INCLUDEDIR%%/README
-%%PYPY_INCLUDEDIR%%/abstract.h
-%%PYPY_INCLUDEDIR%%/boolobject.h
-%%PYPY_INCLUDEDIR%%/bufferobject.h
-%%PYPY_INCLUDEDIR%%/bytesobject.h
-%%PYPY_INCLUDEDIR%%/ceval.h
-%%PYPY_INCLUDEDIR%%/code.h
-%%PYPY_INCLUDEDIR%%/compile.h
-%%PYPY_INCLUDEDIR%%/complexobject.h
-%%PYPY_INCLUDEDIR%%/datetime.h
-%%PYPY_INCLUDEDIR%%/descrobject.h
-%%PYPY_INCLUDEDIR%%/dictobject.h
-%%PYPY_INCLUDEDIR%%/eval.h
-%%PYPY_INCLUDEDIR%%/fileobject.h
-%%PYPY_INCLUDEDIR%%/floatobject.h
-%%PYPY_INCLUDEDIR%%/frameobject.h
-%%PYPY_INCLUDEDIR%%/funcobject.h
-%%PYPY_INCLUDEDIR%%/import.h
-%%PYPY_INCLUDEDIR%%/intobject.h
-%%PYPY_INCLUDEDIR%%/listobject.h
-%%PYPY_INCLUDEDIR%%/longintrepr.h
-%%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
-%%PYPY_INCLUDEDIR%%/pycapsule.h
-%%PYPY_INCLUDEDIR%%/pycobject.h
-%%PYPY_INCLUDEDIR%%/pyconfig.h
-%%PYPY_INCLUDEDIR%%/pyerrors.h
-%%PYPY_INCLUDEDIR%%/pymath.h
-%%PYPY_INCLUDEDIR%%/pymem.h
-%%PYPY_INCLUDEDIR%%/pyport.h
-%%PYPY_INCLUDEDIR%%/pypy_decl.h
-%%PYPY_INCLUDEDIR%%/pypy_macros.h
-%%PYPY_INCLUDEDIR%%/pysignals.h
-%%PYPY_INCLUDEDIR%%/pystate.h
-%%PYPY_INCLUDEDIR%%/pythonrun.h
-%%PYPY_INCLUDEDIR%%/pythread.h
-%%PYPY_INCLUDEDIR%%/sliceobject.h
-%%PYPY_INCLUDEDIR%%/stringobject.h
-%%PYPY_INCLUDEDIR%%/structmember.h
-%%PYPY_INCLUDEDIR%%/structseq.h
-%%PYPY_INCLUDEDIR%%/sysmodule.h
-%%PYPY_INCLUDEDIR%%/traceback.h
-%%PYPY_INCLUDEDIR%%/tupleobject.h
-%%PYPY_INCLUDEDIR%%/unicodeobject.h
-%%PYPY_INCLUDEDIR%%/warnings.h
-%%PYPY_LIBDIR%%/BaseHTTPServer.py
-%%PYPY_LIBDIR%%/BaseHTTPServer.pyc
-%%PYPY_LIBDIR%%/Bastion.py
-%%PYPY_LIBDIR%%/Bastion.pyc
-%%PYPY_LIBDIR%%/CGIHTTPServer.py
-%%PYPY_LIBDIR%%/CGIHTTPServer.pyc
-%%PYPY_LIBDIR%%/ConfigParser.py
-%%PYPY_LIBDIR%%/ConfigParser.pyc
-%%PYPY_LIBDIR%%/Cookie.py
-%%PYPY_LIBDIR%%/Cookie.pyc
-%%PYPY_LIBDIR%%/DocXMLRPCServer.py
-%%PYPY_LIBDIR%%/DocXMLRPCServer.pyc
-%%PYPY_LIBDIR%%/HTMLParser.py
-%%PYPY_LIBDIR%%/HTMLParser.pyc
-%%PYPY_LIBDIR%%/MimeWriter.py
-%%PYPY_LIBDIR%%/MimeWriter.pyc
-%%PYPY_LIBDIR%%/Queue.py
-%%PYPY_LIBDIR%%/Queue.pyc
-%%PYPY_LIBDIR%%/SimpleHTTPServer.py
-%%PYPY_LIBDIR%%/SimpleHTTPServer.pyc
-%%PYPY_LIBDIR%%/SimpleXMLRPCServer.py
-%%PYPY_LIBDIR%%/SimpleXMLRPCServer.pyc
-%%PYPY_LIBDIR%%/SocketServer.py
-%%PYPY_LIBDIR%%/SocketServer.pyc
-%%PYPY_LIBDIR%%/StringIO.py
-%%PYPY_LIBDIR%%/StringIO.pyc
-%%PYPY_LIBDIR%%/UserDict.py
-%%PYPY_LIBDIR%%/UserDict.pyc
-%%PYPY_LIBDIR%%/UserList.py
-%%PYPY_LIBDIR%%/UserList.pyc
-%%PYPY_LIBDIR%%/UserString.py
-%%PYPY_LIBDIR%%/UserString.pyc
-%%PYPY_LIBDIR%%/_LWPCookieJar.py
-%%PYPY_LIBDIR%%/_LWPCookieJar.pyc
-%%PYPY_LIBDIR%%/_MozillaCookieJar.py
-%%PYPY_LIBDIR%%/_MozillaCookieJar.pyc
-%%PYPY_LIBDIR%%/__future__.py
-%%PYPY_LIBDIR%%/__future__.pyc
-%%PYPY_LIBDIR%%/__phello__.foo.py
-%%PYPY_LIBDIR%%/__phello__.foo.pyc
-%%PYPY_LIBDIR%%/_abcoll.py
-%%PYPY_LIBDIR%%/_abcoll.pyc
-%%PYPY_LIBDIR%%/_osx_support.py
-%%PYPY_LIBDIR%%/_osx_support.pyc
-%%PYPY_LIBDIR%%/_pyio.py
-%%PYPY_LIBDIR%%/_pyio.pyc
-%%PYPY_LIBDIR%%/_strptime.py
-%%PYPY_LIBDIR%%/_strptime.pyc
-%%PYPY_LIBDIR%%/_threading_local.py
-%%PYPY_LIBDIR%%/_threading_local.pyc
-%%PYPY_LIBDIR%%/_weakrefset.py
-%%PYPY_LIBDIR%%/_weakrefset.pyc
-%%PYPY_LIBDIR%%/abc.py
-%%PYPY_LIBDIR%%/abc.pyc
-%%PYPY_LIBDIR%%/aifc.py
-%%PYPY_LIBDIR%%/aifc.pyc
-%%PYPY_LIBDIR%%/antigravity.py
-%%PYPY_LIBDIR%%/antigravity.pyc
-%%PYPY_LIBDIR%%/anydbm.py
-%%PYPY_LIBDIR%%/anydbm.pyc
-%%PYPY_LIBDIR%%/argparse.py
-%%PYPY_LIBDIR%%/argparse.pyc
-%%PYPY_LIBDIR%%/ast.py
-%%PYPY_LIBDIR%%/ast.pyc
-%%PYPY_LIBDIR%%/asynchat.py
-%%PYPY_LIBDIR%%/asynchat.pyc
-%%PYPY_LIBDIR%%/asyncore.py
-%%PYPY_LIBDIR%%/asyncore.pyc
-%%PYPY_LIBDIR%%/atexit.py
-%%PYPY_LIBDIR%%/atexit.pyc
-%%PYPY_LIBDIR%%/audiodev.py
-%%PYPY_LIBDIR%%/audiodev.pyc
-%%PYPY_LIBDIR%%/base64.py
-%%PYPY_LIBDIR%%/base64.pyc
-%%PYPY_LIBDIR%%/bdb.py
-%%PYPY_LIBDIR%%/bdb.pyc
-%%PYPY_LIBDIR%%/binhex.py
-%%PYPY_LIBDIR%%/binhex.pyc
-%%PYPY_LIBDIR%%/bisect.py
-%%PYPY_LIBDIR%%/bisect.pyc
-%%PYPY_LIBDIR%%/bsddb/__init__.py
-%%PYPY_LIBDIR%%/bsddb/__init__.pyc
-%%PYPY_LIBDIR%%/bsddb/db.py
-%%PYPY_LIBDIR%%/bsddb/db.pyc
-%%PYPY_LIBDIR%%/bsddb/dbobj.py
-%%PYPY_LIBDIR%%/bsddb/dbobj.pyc
-%%PYPY_LIBDIR%%/bsddb/dbrecio.py
-%%PYPY_LIBDIR%%/bsddb/dbrecio.pyc
-%%PYPY_LIBDIR%%/bsddb/dbshelve.py
-%%PYPY_LIBDIR%%/bsddb/dbshelve.pyc
-%%PYPY_LIBDIR%%/bsddb/dbtables.py
-%%PYPY_LIBDIR%%/bsddb/dbtables.pyc
-%%PYPY_LIBDIR%%/bsddb/dbutils.py
-%%PYPY_LIBDIR%%/bsddb/dbutils.pyc
-%%PYPY_LIBDIR%%/bsddb/test/__init__.py
-%%PYPY_LIBDIR%%/bsddb/test/__init__.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_all.py
-%%PYPY_LIBDIR%%/bsddb/test/test_all.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_associate.py
-%%PYPY_LIBDIR%%/bsddb/test/test_associate.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_basics.py
-%%PYPY_LIBDIR%%/bsddb/test/test_basics.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_compare.py
-%%PYPY_LIBDIR%%/bsddb/test/test_compare.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_compat.py
-%%PYPY_LIBDIR%%/bsddb/test/test_compat.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_cursor_pget_bug.py
-%%PYPY_LIBDIR%%/bsddb/test/test_cursor_pget_bug.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_db.py
-%%PYPY_LIBDIR%%/bsddb/test/test_db.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_dbenv.py
-%%PYPY_LIBDIR%%/bsddb/test/test_dbenv.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_dbobj.py
-%%PYPY_LIBDIR%%/bsddb/test/test_dbobj.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_dbshelve.py
-%%PYPY_LIBDIR%%/bsddb/test/test_dbshelve.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_dbtables.py
-%%PYPY_LIBDIR%%/bsddb/test/test_dbtables.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_distributed_transactions.py
-%%PYPY_LIBDIR%%/bsddb/test/test_distributed_transactions.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_early_close.py
-%%PYPY_LIBDIR%%/bsddb/test/test_early_close.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_fileid.py
-%%PYPY_LIBDIR%%/bsddb/test/test_fileid.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_get_none.py
-%%PYPY_LIBDIR%%/bsddb/test/test_get_none.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_join.py
-%%PYPY_LIBDIR%%/bsddb/test/test_join.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_lock.py
-%%PYPY_LIBDIR%%/bsddb/test/test_lock.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_misc.py
-%%PYPY_LIBDIR%%/bsddb/test/test_misc.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_pickle.py
-%%PYPY_LIBDIR%%/bsddb/test/test_pickle.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_queue.py
-%%PYPY_LIBDIR%%/bsddb/test/test_queue.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_recno.py
-%%PYPY_LIBDIR%%/bsddb/test/test_recno.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_replication.py
-%%PYPY_LIBDIR%%/bsddb/test/test_replication.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_sequence.py
-%%PYPY_LIBDIR%%/bsddb/test/test_sequence.pyc
-%%PYPY_LIBDIR%%/bsddb/test/test_thread.py
-%%PYPY_LIBDIR%%/bsddb/test/test_thread.pyc
-%%PYPY_LIBDIR%%/cProfile.py
-%%PYPY_LIBDIR%%/cProfile.pyc
-%%PYPY_LIBDIR%%/calendar.py
-%%PYPY_LIBDIR%%/calendar.pyc
-%%PYPY_LIBDIR%%/cgi.py
-%%PYPY_LIBDIR%%/cgi.pyc
-%%PYPY_LIBDIR%%/cgitb.py
-%%PYPY_LIBDIR%%/cgitb.pyc
-%%PYPY_LIBDIR%%/chunk.py
-%%PYPY_LIBDIR%%/chunk.pyc
-%%PYPY_LIBDIR%%/cmd.py
-%%PYPY_LIBDIR%%/cmd.pyc
-%%PYPY_LIBDIR%%/code.py
-%%PYPY_LIBDIR%%/code.pyc
-%%PYPY_LIBDIR%%/codecs.py
-%%PYPY_LIBDIR%%/codecs.pyc
-%%PYPY_LIBDIR%%/codeop.py
-%%PYPY_LIBDIR%%/codeop.pyc
-%%PYPY_LIBDIR%%/collections.py
-%%PYPY_LIBDIR%%/collections.pyc
-%%PYPY_LIBDIR%%/colorsys.py
-%%PYPY_LIBDIR%%/colorsys.pyc
-%%PYPY_LIBDIR%%/commands.py
-%%PYPY_LIBDIR%%/commands.pyc
-%%PYPY_LIBDIR%%/compileall.py
-%%PYPY_LIBDIR%%/compileall.pyc
-%%PYPY_LIBDIR%%/compiler/__init__.py
-%%PYPY_LIBDIR%%/compiler/__init__.pyc
-%%PYPY_LIBDIR%%/compiler/ast.py
-%%PYPY_LIBDIR%%/compiler/ast.pyc
-%%PYPY_LIBDIR%%/compiler/consts.py
-%%PYPY_LIBDIR%%/compiler/consts.pyc
-%%PYPY_LIBDIR%%/compiler/future.py
-%%PYPY_LIBDIR%%/compiler/future.pyc
-%%PYPY_LIBDIR%%/compiler/misc.py
-%%PYPY_LIBDIR%%/compiler/misc.pyc
-%%PYPY_LIBDIR%%/compiler/pyassem.py
-%%PYPY_LIBDIR%%/compiler/pyassem.pyc
-%%PYPY_LIBDIR%%/compiler/pycodegen.py
-%%PYPY_LIBDIR%%/compiler/pycodegen.pyc
-%%PYPY_LIBDIR%%/compiler/symbols.py
-%%PYPY_LIBDIR%%/compiler/symbols.pyc
-%%PYPY_LIBDIR%%/compiler/syntax.py
-%%PYPY_LIBDIR%%/compiler/syntax.pyc
-%%PYPY_LIBDIR%%/compiler/transformer.py
-%%PYPY_LIBDIR%%/compiler/transformer.pyc
-%%PYPY_LIBDIR%%/compiler/visitor.py
-%%PYPY_LIBDIR%%/compiler/visitor.pyc
-%%PYPY_LIBDIR%%/contextlib.py
-%%PYPY_LIBDIR%%/contextlib.pyc
-%%PYPY_LIBDIR%%/cookielib.py
-%%PYPY_LIBDIR%%/cookielib.pyc
-%%PYPY_LIBDIR%%/copy.py
-%%PYPY_LIBDIR%%/copy.pyc
-%%PYPY_LIBDIR%%/copy_reg.py
-%%PYPY_LIBDIR%%/copy_reg.pyc
-%%PYPY_LIBDIR%%/csv.py
-%%PYPY_LIBDIR%%/csv.pyc
-%%PYPY_LIBDIR%%/ctypes/__init__.py
-%%PYPY_LIBDIR%%/ctypes/__init__.pyc
-%%PYPY_LIBDIR%%/ctypes/_endian.py
-%%PYPY_LIBDIR%%/ctypes/_endian.pyc
-%%PYPY_LIBDIR%%/ctypes/macholib/README.ctypes
-%%PYPY_LIBDIR%%/ctypes/macholib/__init__.py
-%%PYPY_LIBDIR%%/ctypes/macholib/__init__.pyc
-%%PYPY_LIBDIR%%/ctypes/macholib/dyld.py
-%%PYPY_LIBDIR%%/ctypes/macholib/dyld.pyc
-%%PYPY_LIBDIR%%/ctypes/macholib/dylib.py
-%%PYPY_LIBDIR%%/ctypes/macholib/dylib.pyc
-%%PYPY_LIBDIR%%/ctypes/macholib/fetch_macholib
-%%PYPY_LIBDIR%%/ctypes/macholib/fetch_macholib.bat
-%%PYPY_LIBDIR%%/ctypes/macholib/framework.py
-%%PYPY_LIBDIR%%/ctypes/macholib/framework.pyc
-%%PYPY_LIBDIR%%/ctypes/test/__init__.py
-%%PYPY_LIBDIR%%/ctypes/test/__init__.pyc
-%%PYPY_LIBDIR%%/ctypes/test/runtests.py
-%%PYPY_LIBDIR%%/ctypes/test/runtests.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_anon.py
-%%PYPY_LIBDIR%%/ctypes/test/test_anon.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_array_in_pointer.py
-%%PYPY_LIBDIR%%/ctypes/test/test_array_in_pointer.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_arrays.py
-%%PYPY_LIBDIR%%/ctypes/test/test_arrays.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_as_parameter.py
-%%PYPY_LIBDIR%%/ctypes/test/test_as_parameter.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_bitfields.py
-%%PYPY_LIBDIR%%/ctypes/test/test_bitfields.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_buffers.py
-%%PYPY_LIBDIR%%/ctypes/test/test_buffers.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_byteswap.py
-%%PYPY_LIBDIR%%/ctypes/test/test_byteswap.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_callbacks.py
-%%PYPY_LIBDIR%%/ctypes/test/test_callbacks.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_cast.py
-%%PYPY_LIBDIR%%/ctypes/test/test_cast.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_cfuncs.py
-%%PYPY_LIBDIR%%/ctypes/test/test_cfuncs.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_checkretval.py
-%%PYPY_LIBDIR%%/ctypes/test/test_checkretval.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_delattr.py
-%%PYPY_LIBDIR%%/ctypes/test/test_delattr.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_errno.py
-%%PYPY_LIBDIR%%/ctypes/test/test_errno.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_find.py
-%%PYPY_LIBDIR%%/ctypes/test/test_find.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_frombuffer.py
-%%PYPY_LIBDIR%%/ctypes/test/test_frombuffer.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_funcptr.py
-%%PYPY_LIBDIR%%/ctypes/test/test_funcptr.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_functions.py
-%%PYPY_LIBDIR%%/ctypes/test/test_functions.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_incomplete.py
-%%PYPY_LIBDIR%%/ctypes/test/test_incomplete.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_init.py
-%%PYPY_LIBDIR%%/ctypes/test/test_init.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_internals.py
-%%PYPY_LIBDIR%%/ctypes/test/test_internals.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_keeprefs.py
-%%PYPY_LIBDIR%%/ctypes/test/test_keeprefs.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_libc.py
-%%PYPY_LIBDIR%%/ctypes/test/test_libc.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_loading.py
-%%PYPY_LIBDIR%%/ctypes/test/test_loading.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_macholib.py
-%%PYPY_LIBDIR%%/ctypes/test/test_macholib.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_memfunctions.py
-%%PYPY_LIBDIR%%/ctypes/test/test_memfunctions.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_numbers.py
-%%PYPY_LIBDIR%%/ctypes/test/test_numbers.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_objects.py
-%%PYPY_LIBDIR%%/ctypes/test/test_objects.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_parameters.py
-%%PYPY_LIBDIR%%/ctypes/test/test_parameters.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_pep3118.py
-%%PYPY_LIBDIR%%/ctypes/test/test_pep3118.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_pickling.py
-%%PYPY_LIBDIR%%/ctypes/test/test_pickling.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_pointers.py
-%%PYPY_LIBDIR%%/ctypes/test/test_pointers.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_prototypes.py
-%%PYPY_LIBDIR%%/ctypes/test/test_prototypes.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_python_api.py
-%%PYPY_LIBDIR%%/ctypes/test/test_python_api.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_random_things.py
-%%PYPY_LIBDIR%%/ctypes/test/test_random_things.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_refcounts.py
-%%PYPY_LIBDIR%%/ctypes/test/test_refcounts.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_repr.py
-%%PYPY_LIBDIR%%/ctypes/test/test_repr.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_returnfuncptrs.py
-%%PYPY_LIBDIR%%/ctypes/test/test_returnfuncptrs.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_simplesubclasses.py
-%%PYPY_LIBDIR%%/ctypes/test/test_simplesubclasses.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_sizes.py
-%%PYPY_LIBDIR%%/ctypes/test/test_sizes.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_slicing.py
-%%PYPY_LIBDIR%%/ctypes/test/test_slicing.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_stringptr.py
-%%PYPY_LIBDIR%%/ctypes/test/test_stringptr.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_strings.py
-%%PYPY_LIBDIR%%/ctypes/test/test_strings.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_struct_fields.py
-%%PYPY_LIBDIR%%/ctypes/test/test_struct_fields.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_structures.py
-%%PYPY_LIBDIR%%/ctypes/test/test_structures.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_unaligned_structures.py
-%%PYPY_LIBDIR%%/ctypes/test/test_unaligned_structures.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_unicode.py
-%%PYPY_LIBDIR%%/ctypes/test/test_unicode.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_values.py
-%%PYPY_LIBDIR%%/ctypes/test/test_values.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_varsize_struct.py
-%%PYPY_LIBDIR%%/ctypes/test/test_varsize_struct.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_win32.py
-%%PYPY_LIBDIR%%/ctypes/test/test_win32.pyc
-%%PYPY_LIBDIR%%/ctypes/test/test_wintypes.py
-%%PYPY_LIBDIR%%/ctypes/test/test_wintypes.pyc
-%%PYPY_LIBDIR%%/ctypes/util.py
-%%PYPY_LIBDIR%%/ctypes/util.pyc
-%%PYPY_LIBDIR%%/ctypes/wintypes.py
-%%PYPY_LIBDIR%%/ctypes/wintypes.pyc
-%%PYPY_LIBDIR%%/curses/__init__.py
-%%PYPY_LIBDIR%%/curses/__init__.pyc
-%%PYPY_LIBDIR%%/curses/ascii.py
-%%PYPY_LIBDIR%%/curses/ascii.pyc
-%%PYPY_LIBDIR%%/curses/has_key.py
-%%PYPY_LIBDIR%%/curses/has_key.pyc
-%%PYPY_LIBDIR%%/curses/panel.py
-%%PYPY_LIBDIR%%/curses/panel.pyc
-%%PYPY_LIBDIR%%/curses/textpad.py
-%%PYPY_LIBDIR%%/curses/textpad.pyc
-%%PYPY_LIBDIR%%/curses/wrapper.py
-%%PYPY_LIBDIR%%/curses/wrapper.pyc
-%%PYPY_LIBDIR%%/dbhash.py
-%%PYPY_LIBDIR%%/dbhash.pyc
-%%PYPY_LIBDIR%%/decimal.py
-%%PYPY_LIBDIR%%/decimal.pyc
-%%PYPY_LIBDIR%%/difflib.py
-%%PYPY_LIBDIR%%/difflib.pyc
-%%PYPY_LIBDIR%%/dircache.py
-%%PYPY_LIBDIR%%/dircache.pyc
-%%PYPY_LIBDIR%%/dis.py
-%%PYPY_LIBDIR%%/dis.pyc
-%%PYPY_LIBDIR%%/distutils/README
-%%PYPY_LIBDIR%%/distutils/__init__.py
-%%PYPY_LIBDIR%%/distutils/__init__.pyc
-%%PYPY_LIBDIR%%/distutils/archive_util.py
-%%PYPY_LIBDIR%%/distutils/archive_util.pyc
-%%PYPY_LIBDIR%%/distutils/bcppcompiler.py
-%%PYPY_LIBDIR%%/distutils/bcppcompiler.pyc
-%%PYPY_LIBDIR%%/distutils/ccompiler.py
-%%PYPY_LIBDIR%%/distutils/ccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/cmd.py
-%%PYPY_LIBDIR%%/distutils/cmd.pyc
-%%PYPY_LIBDIR%%/distutils/command/__init__.py
-%%PYPY_LIBDIR%%/distutils/command/__init__.pyc
-%%PYPY_LIBDIR%%/distutils/command/bdist.py
-%%PYPY_LIBDIR%%/distutils/command/bdist.pyc
-%%PYPY_LIBDIR%%/distutils/command/bdist_dumb.py
-%%PYPY_LIBDIR%%/distutils/command/bdist_dumb.pyc
-%%PYPY_LIBDIR%%/distutils/command/bdist_msi.py
-%%PYPY_LIBDIR%%/distutils/command/bdist_msi.pyc
-%%PYPY_LIBDIR%%/distutils/command/bdist_rpm.py
-%%PYPY_LIBDIR%%/distutils/command/bdist_rpm.pyc
-%%PYPY_LIBDIR%%/distutils/command/bdist_wininst.py
-%%PYPY_LIBDIR%%/distutils/command/bdist_wininst.pyc
-%%PYPY_LIBDIR%%/distutils/command/build.py
-%%PYPY_LIBDIR%%/distutils/command/build.pyc
-%%PYPY_LIBDIR%%/distutils/command/build_clib.py
-%%PYPY_LIBDIR%%/distutils/command/build_clib.pyc
-%%PYPY_LIBDIR%%/distutils/command/build_ext.py
-%%PYPY_LIBDIR%%/distutils/command/build_ext.pyc
-%%PYPY_LIBDIR%%/distutils/command/build_py.py
-%%PYPY_LIBDIR%%/distutils/command/build_py.pyc
-%%PYPY_LIBDIR%%/distutils/command/build_scripts.py
-%%PYPY_LIBDIR%%/distutils/command/build_scripts.pyc
-%%PYPY_LIBDIR%%/distutils/command/check.py
-%%PYPY_LIBDIR%%/distutils/command/check.pyc
-%%PYPY_LIBDIR%%/distutils/command/clean.py
-%%PYPY_LIBDIR%%/distutils/command/clean.pyc
-%%PYPY_LIBDIR%%/distutils/command/command_template
-%%PYPY_LIBDIR%%/distutils/command/config.py
-%%PYPY_LIBDIR%%/distutils/command/config.pyc
-%%PYPY_LIBDIR%%/distutils/command/install.py
-%%PYPY_LIBDIR%%/distutils/command/install.pyc
-%%PYPY_LIBDIR%%/distutils/command/install_data.py
-%%PYPY_LIBDIR%%/distutils/command/install_data.pyc
-%%PYPY_LIBDIR%%/distutils/command/install_egg_info.py
-%%PYPY_LIBDIR%%/distutils/command/install_egg_info.pyc
-%%PYPY_LIBDIR%%/distutils/command/install_headers.py
-%%PYPY_LIBDIR%%/distutils/command/install_headers.pyc
-%%PYPY_LIBDIR%%/distutils/command/install_lib.py
-%%PYPY_LIBDIR%%/distutils/command/install_lib.pyc
-%%PYPY_LIBDIR%%/distutils/command/install_scripts.py
-%%PYPY_LIBDIR%%/distutils/command/install_scripts.pyc
-%%PYPY_LIBDIR%%/distutils/command/register.py
-%%PYPY_LIBDIR%%/distutils/command/register.pyc
-%%PYPY_LIBDIR%%/distutils/command/sdist.py
-%%PYPY_LIBDIR%%/distutils/command/sdist.pyc
-%%PYPY_LIBDIR%%/distutils/command/upload.py
-%%PYPY_LIBDIR%%/distutils/command/upload.pyc
-%%PYPY_LIBDIR%%/distutils/command/wininst-6.0.exe
-%%PYPY_LIBDIR%%/distutils/command/wininst-7.1.exe
-%%PYPY_LIBDIR%%/distutils/command/wininst-8.0.exe
-%%PYPY_LIBDIR%%/distutils/command/wininst-9.0-amd64.exe
-%%PYPY_LIBDIR%%/distutils/command/wininst-9.0.exe
-%%PYPY_LIBDIR%%/distutils/config.py
-%%PYPY_LIBDIR%%/distutils/config.pyc
-%%PYPY_LIBDIR%%/distutils/core.py
-%%PYPY_LIBDIR%%/distutils/core.pyc
-%%PYPY_LIBDIR%%/distutils/cygwinccompiler.py
-%%PYPY_LIBDIR%%/distutils/cygwinccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/debug.py
-%%PYPY_LIBDIR%%/distutils/debug.pyc
-%%PYPY_LIBDIR%%/distutils/dep_util.py
-%%PYPY_LIBDIR%%/distutils/dep_util.pyc
-%%PYPY_LIBDIR%%/distutils/dir_util.py
-%%PYPY_LIBDIR%%/distutils/dir_util.pyc
-%%PYPY_LIBDIR%%/distutils/dist.py
-%%PYPY_LIBDIR%%/distutils/dist.pyc
-%%PYPY_LIBDIR%%/distutils/emxccompiler.py
-%%PYPY_LIBDIR%%/distutils/emxccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/errors.py
-%%PYPY_LIBDIR%%/distutils/errors.pyc
-%%PYPY_LIBDIR%%/distutils/extension.py
-%%PYPY_LIBDIR%%/distutils/extension.pyc
-%%PYPY_LIBDIR%%/distutils/fancy_getopt.py
-%%PYPY_LIBDIR%%/distutils/fancy_getopt.pyc
-%%PYPY_LIBDIR%%/distutils/file_util.py
-%%PYPY_LIBDIR%%/distutils/file_util.pyc
-%%PYPY_LIBDIR%%/distutils/filelist.py
-%%PYPY_LIBDIR%%/distutils/filelist.pyc
-%%PYPY_LIBDIR%%/distutils/log.py
-%%PYPY_LIBDIR%%/distutils/log.pyc
-%%PYPY_LIBDIR%%/distutils/msvc9compiler.py
-%%PYPY_LIBDIR%%/distutils/msvc9compiler.pyc
-%%PYPY_LIBDIR%%/distutils/msvccompiler.py
-%%PYPY_LIBDIR%%/distutils/msvccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/spawn.py
-%%PYPY_LIBDIR%%/distutils/spawn.pyc
-%%PYPY_LIBDIR%%/distutils/sysconfig.py
-%%PYPY_LIBDIR%%/distutils/sysconfig.pyc
-%%PYPY_LIBDIR%%/distutils/sysconfig_cpython.py
-%%PYPY_LIBDIR%%/distutils/sysconfig_cpython.pyc
-%%PYPY_LIBDIR%%/distutils/sysconfig_pypy.py
-%%PYPY_LIBDIR%%/distutils/sysconfig_pypy.pyc
-%%PYPY_LIBDIR%%/distutils/tests/Setup.sample
-%%PYPY_LIBDIR%%/distutils/tests/__init__.py
-%%PYPY_LIBDIR%%/distutils/tests/__init__.pyc
-%%PYPY_LIBDIR%%/distutils/tests/setuptools_build_ext.py
-%%PYPY_LIBDIR%%/distutils/tests/setuptools_build_ext.pyc
-%%PYPY_LIBDIR%%/distutils/tests/setuptools_extension.py
-%%PYPY_LIBDIR%%/distutils/tests/setuptools_extension.pyc
-%%PYPY_LIBDIR%%/distutils/tests/support.py
-%%PYPY_LIBDIR%%/distutils/tests/support.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_archive_util.py
-%%PYPY_LIBDIR%%/distutils/tests/test_archive_util.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist.py
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_dumb.py
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_dumb.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_msi.py
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_msi.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_rpm.py
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_rpm.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_wininst.py
-%%PYPY_LIBDIR%%/distutils/tests/test_bdist_wininst.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_build.py
-%%PYPY_LIBDIR%%/distutils/tests/test_build.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_build_clib.py
-%%PYPY_LIBDIR%%/distutils/tests/test_build_clib.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_build_ext.py
-%%PYPY_LIBDIR%%/distutils/tests/test_build_ext.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_build_py.py
-%%PYPY_LIBDIR%%/distutils/tests/test_build_py.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_build_scripts.py
-%%PYPY_LIBDIR%%/distutils/tests/test_build_scripts.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_ccompiler.py
-%%PYPY_LIBDIR%%/distutils/tests/test_ccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_check.py
-%%PYPY_LIBDIR%%/distutils/tests/test_check.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_clean.py
-%%PYPY_LIBDIR%%/distutils/tests/test_clean.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_cmd.py
-%%PYPY_LIBDIR%%/distutils/tests/test_cmd.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_config.py
-%%PYPY_LIBDIR%%/distutils/tests/test_config.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_config_cmd.py
-%%PYPY_LIBDIR%%/distutils/tests/test_config_cmd.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_core.py
-%%PYPY_LIBDIR%%/distutils/tests/test_core.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_dep_util.py
-%%PYPY_LIBDIR%%/distutils/tests/test_dep_util.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_dir_util.py
-%%PYPY_LIBDIR%%/distutils/tests/test_dir_util.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_dist.py
-%%PYPY_LIBDIR%%/distutils/tests/test_dist.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_file_util.py
-%%PYPY_LIBDIR%%/distutils/tests/test_file_util.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_filelist.py
-%%PYPY_LIBDIR%%/distutils/tests/test_filelist.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_install.py
-%%PYPY_LIBDIR%%/distutils/tests/test_install.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_install_data.py
-%%PYPY_LIBDIR%%/distutils/tests/test_install_data.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_install_headers.py
-%%PYPY_LIBDIR%%/distutils/tests/test_install_headers.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_install_lib.py
-%%PYPY_LIBDIR%%/distutils/tests/test_install_lib.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_install_scripts.py
-%%PYPY_LIBDIR%%/distutils/tests/test_install_scripts.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_msvc9compiler.py
-%%PYPY_LIBDIR%%/distutils/tests/test_msvc9compiler.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_register.py
-%%PYPY_LIBDIR%%/distutils/tests/test_register.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_sdist.py
-%%PYPY_LIBDIR%%/distutils/tests/test_sdist.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_spawn.py
-%%PYPY_LIBDIR%%/distutils/tests/test_spawn.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_sysconfig.py
-%%PYPY_LIBDIR%%/distutils/tests/test_sysconfig.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_text_file.py
-%%PYPY_LIBDIR%%/distutils/tests/test_text_file.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_unixccompiler.py
-%%PYPY_LIBDIR%%/distutils/tests/test_unixccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_upload.py
-%%PYPY_LIBDIR%%/distutils/tests/test_upload.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_util.py
-%%PYPY_LIBDIR%%/distutils/tests/test_util.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_version.py
-%%PYPY_LIBDIR%%/distutils/tests/test_version.pyc
-%%PYPY_LIBDIR%%/distutils/tests/test_versionpredicate.py
-%%PYPY_LIBDIR%%/distutils/tests/test_versionpredicate.pyc
-%%PYPY_LIBDIR%%/distutils/text_file.py
-%%PYPY_LIBDIR%%/distutils/text_file.pyc
-%%PYPY_LIBDIR%%/distutils/unixccompiler.py
-%%PYPY_LIBDIR%%/distutils/unixccompiler.pyc
-%%PYPY_LIBDIR%%/distutils/util.py
-%%PYPY_LIBDIR%%/distutils/util.pyc
-%%PYPY_LIBDIR%%/distutils/version.py
-%%PYPY_LIBDIR%%/distutils/version.pyc
-%%PYPY_LIBDIR%%/distutils/versionpredicate.py
-%%PYPY_LIBDIR%%/distutils/versionpredicate.pyc
-%%PYPY_LIBDIR%%/doctest.py
-%%PYPY_LIBDIR%%/doctest.pyc
-%%PYPY_LIBDIR%%/dumbdbm.py
-%%PYPY_LIBDIR%%/dumbdbm.pyc
-%%PYPY_LIBDIR%%/dummy_thread.py
-%%PYPY_LIBDIR%%/dummy_thread.pyc
-%%PYPY_LIBDIR%%/dummy_threading.py
-%%PYPY_LIBDIR%%/dummy_threading.pyc
-%%PYPY_LIBDIR%%/email/__init__.py
-%%PYPY_LIBDIR%%/email/__init__.pyc
-%%PYPY_LIBDIR%%/email/_parseaddr.py
-%%PYPY_LIBDIR%%/email/_parseaddr.pyc
-%%PYPY_LIBDIR%%/email/base64mime.py
-%%PYPY_LIBDIR%%/email/base64mime.pyc
-%%PYPY_LIBDIR%%/email/charset.py
-%%PYPY_LIBDIR%%/email/charset.pyc
-%%PYPY_LIBDIR%%/email/encoders.py
-%%PYPY_LIBDIR%%/email/encoders.pyc
-%%PYPY_LIBDIR%%/email/errors.py
-%%PYPY_LIBDIR%%/email/errors.pyc
-%%PYPY_LIBDIR%%/email/feedparser.py
-%%PYPY_LIBDIR%%/email/feedparser.pyc
-%%PYPY_LIBDIR%%/email/generator.py
-%%PYPY_LIBDIR%%/email/generator.pyc
-%%PYPY_LIBDIR%%/email/header.py
-%%PYPY_LIBDIR%%/email/header.pyc
-%%PYPY_LIBDIR%%/email/iterators.py
-%%PYPY_LIBDIR%%/email/iterators.pyc
-%%PYPY_LIBDIR%%/email/message.py
-%%PYPY_LIBDIR%%/email/message.pyc
-%%PYPY_LIBDIR%%/email/mime/__init__.py

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



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