Date: Sun, 11 Aug 2013 17:10:41 +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: r324601 - in head/lang: . pypy pypy-devel pypy-devel/files Message-ID: <201308111710.r7BHAf7x042096@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sun Aug 11 17:10:41 2013 New Revision: 324601 URL: http://svnweb.freebsd.org/changeset/ports/324601 Log: Add lang/pypy-devel for non-stable releases of PyPy. pypy-devel is intended as a staging ground for beta releases and - while no beta releases are available - snapshots of pypy default branch. While introducing pypy-devel to build logic has been reworked to better accomodate pypy3. The lib-python/2.7 and lib_pypy folders are not renamed after extraction (with only symbolic links used to emulate the structure). PyPy still expects the standard structure and the symbolic links satisfy this change. The devel port was requested by mva@ to better support commercial clients. Added: head/lang/pypy-devel/ - copied from r324598, head/lang/pypy/ head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__command__install.py - copied, changed from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py - copied, changed from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py head/lang/pypy-devel/files/patch-lib-python__2.7__sysconfig.py - copied, changed from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py - copied, changed from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py Deleted: head/lang/pypy-devel/files/patch-lib__pypyX.Y__distutils__command__install.py head/lang/pypy-devel/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py head/lang/pypy-devel/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py head/lang/pypy-devel/files/patch-lib__pypyX.Y__lib_pypy__ctypes_config_cache__rebuild.py head/lang/pypy-devel/files/patch-lib__pypyX.Y__sysconfig.py head/lang/pypy-devel/files/patch-pypy__tool__lib_pypy.py head/lang/pypy-devel/files/patch-rpython__translator__cli__sdk.py Modified: head/lang/Makefile head/lang/pypy-devel/Makefile head/lang/pypy-devel/distinfo head/lang/pypy-devel/files/Makefile head/lang/pypy-devel/files/bsd.pypy.inst.mk head/lang/pypy-devel/pkg-plist head/lang/pypy/Makefile Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Sun Aug 11 17:05:53 2013 (r324600) +++ head/lang/Makefile Sun Aug 11 17:10:41 2013 (r324601) @@ -269,6 +269,7 @@ SUBDIR += py-mx-base SUBDIR += py-prolog SUBDIR += pypy + SUBDIR += pypy-devel SUBDIR += python SUBDIR += python-doc-html SUBDIR += python-doc-pdf-a4 Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy/Makefile Sun Aug 11 16:42:22 2013 (r324598) +++ head/lang/pypy-devel/Makefile Sun Aug 11 17:10:41 2013 (r324601) @@ -2,10 +2,12 @@ # $FreeBSD$ PORTNAME= pypy -DISTVERSION= 2.1 +DISTVERSION= 2.2-alpha${DATE} CATEGORIES= lang python java -MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ -DISTNAME= ${PORTNAME}-${DISTVERSION}-src +MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ +PKGNAMESUFFIX= -devel +DISTNAME= ${COMMIT} +DIST_SUBDIR= pypy MAINTAINER= dbn@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language @@ -17,39 +19,44 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/ ffi:${PORTSDIR}/devel/libffi \ sqlite3:${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 -MANUAL_PACKAGE_BUILD= runaway process on pointyhat +CONFLICTS_INSTALL= pypy-[0-9]* +LATEST_LINK= ${PORTNAME}-devel ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} +COMMIT= ab7580454b32 +DATE= 20130810 USE_BZIP2= yes USES= gettext iconv MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -WRKSRC= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDIR}/pypy-pypy-${COMMIT} 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} @@ -58,7 +65,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" @@ -87,14 +94,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}" @@ -113,38 +112,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+= gc:${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). @@ -168,6 +141,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} @@ -185,25 +159,25 @@ PYPY_${inst}_OPT= 2 .if ${PYPY_ARCH:M*64} . if ${PORT_OPTIONS:MPYPY} # 64bit + pypy = 5.9 GiB -PYPY_TRANSLATION_MEMORY= 6138872 +PYPY_TRANSLATION_MEMORY= 6062436 . elif ${PORT_OPTIONS:MPYPY_MINMEM} # 64bit + pypy (minimum memory) = 3.6GiB -PYPY_TRANSLATION_MEMORY= 3855204 +PYPY_TRANSLATION_MEMORY= 3729228 . else # 64bit + python = 4.7 GiB -PYPY_TRANSLATION_MEMORY= 4957688 +PYPY_TRANSLATION_MEMORY= 4662460 . 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= 2523868 . elif ${PORT_OPTIONS:MPYPY_MINMEM} # 32bit + pypy (minimum memory) = 2.2GiB -PYPY_TRANSLATION_MEMORY= 2329256 +PYPY_TRANSLATION_MEMORY= 2246768 # 32bit + python = 2.3 GiB -PYPY_TRANSLATION_MEMORY= 2372640 +PYPY_TRANSLATION_MEMORY= 2523868 . endif # 32bit system += 168 MiB PYPY_MINIMUM_MEMORY= $$((${PYPY_TRANSLATION_MEMORY} + 171787)) @@ -218,9 +192,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+= ;\ @@ -258,10 +235,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} @@ -277,25 +255,25 @@ 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 \ +.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} ${WRKSRC}/lib -depth -type d -name tmp | ${XARGS} ${RM} -r - ${MV} ${WRKSRC}/include ${WRKSRC}/include~ - ${MKDIR} ${WRKSRC}/include - ${MV} ${WRKSRC}/include~ ${WRKSRC}/${PYPY_INCLUDEDIR} + ${FIND} ${WRKDIR}/${_path:C/.*://}/ -depth -type d -name tmp | \ + ${XARGS} ${RM} -r +.endfor do-install: -.for dir in ${PYPYDIRS} - (cd ${WRKSRC}/${dir}; ${COPYTREE_SHARE} . ${PREFIX}/${dir}) +.for _path in ${PYPYDIRS} + -${RM} ${PREFIX}/${_path:C/.*://} + (cd ${WRKSRC}/${_path:C/:.*//}; ${COPYTREE_SHARE} . ${PREFIX}/${_path:C/.*://}) .endfor .for name in ${PYPY_NAMES:O} ${STRIP_CMD} ${WRKDIR}/${name} @@ -309,25 +287,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} -i '' \ + -e -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-devel/distinfo ============================================================================== --- head/lang/pypy/distinfo Sun Aug 11 16:42:22 2013 (r324598) +++ head/lang/pypy-devel/distinfo Sun Aug 11 17:10:41 2013 (r324601) @@ -1,2 +1,2 @@ -SHA256 (pypy-2.1-src.tar.bz2) = 31b3066c9739b117d6bb1bdc485a919dc3b67370ec00437de1b74069943f7f17 -SIZE (pypy-2.1-src.tar.bz2) = 14830606 +SHA256 (pypy/ab7580454b32.tar.bz2) = 2028ee188895490a0df3e6968ce83a78e1a7188f72f51e193d0d7646d9a611fe +SIZE (pypy/ab7580454b32.tar.bz2) = 14240611 Modified: head/lang/pypy-devel/files/Makefile ============================================================================== --- head/lang/pypy/files/Makefile Sun Aug 11 16:42:22 2013 (r324598) +++ head/lang/pypy-devel/files/Makefile Sun Aug 11 17:10:41 2013 (r324601) @@ -21,7 +21,7 @@ TOUCH?= touch REINPLACE_CMD?= ${SED} -i~ -BUILDDIR= usession-release-${DISTVERSION}.x-0 +BUILDDIR= usession-default-0 .for inst in ${PYPY_INST} Modified: head/lang/pypy-devel/files/bsd.pypy.inst.mk ============================================================================== --- head/lang/pypy/files/bsd.pypy.inst.mk Sun Aug 11 16:42:22 2013 (r324598) +++ head/lang/pypy-devel/files/bsd.pypy.inst.mk Sun Aug 11 17:10:41 2013 (r324601) @@ -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?= Copied and modified: head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__command__install.py (from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py) ============================================================================== --- head/lang/pypy/files/patch-lib__pypyX.Y__distutils__command__install.py Sun Aug 11 16:42:22 2013 (r324598, copy source) +++ head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__command__install.py Sun Aug 11 17:10:41 2013 (r324601) @@ -1,5 +1,5 @@ ---- lib/pypy-2.1/distutils/command/install.py.orig 2012-07-15 10:10:18.000000000 +0200 -+++ lib/pypy-2.1/distutils/command/install.py 2012-07-15 10:13:15.000000000 +0200 +--- 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', }, Copied and modified: head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py (from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py) ============================================================================== --- head/lang/pypy/files/patch-lib__pypyX.Y__distutils__sysconfig_pypy.py Sun Aug 11 16:42:22 2013 (r324598, copy source) +++ head/lang/pypy-devel/files/patch-lib-python__2.7__distutils__sysconfig_pypy.py Sun Aug 11 17:10:41 2013 (r324601) @@ -1,5 +1,5 @@ ---- lib/pypy-2.1/distutils/sysconfig_pypy.py.orig 2012-11-22 14:52:20.000000000 +0200 -+++ lib/pypy-2.1/distutils/sysconfig_pypy.py 2012-11-27 17:59:44.000000000 +0200 +--- 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): Copied and modified: head/lang/pypy-devel/files/patch-lib-python__2.7__sysconfig.py (from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py) ============================================================================== --- head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py Sun Aug 11 16:42:22 2013 (r324598, copy source) +++ head/lang/pypy-devel/files/patch-lib-python__2.7__sysconfig.py Sun Aug 11 17:10:41 2013 (r324601) @@ -1,5 +1,5 @@ ---- lib/pypy-2.1/sysconfig.py.orig 2012-07-15 09:57:14.000000000 +0200 -+++ lib/pypy-2.1/sysconfig.py 2012-07-15 10:03:25.000000000 +0200 +--- 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}', }, @@ -14,7 +14,7 @@ + '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_version_short}', ++ 'include': '{base}/include/pypy-{pypy_version_short}', + 'platinclude': '{platbase}/include/pypy-{pypy_version_short}', 'scripts': '{base}/bin', 'data' : '{base}', Copied and modified: head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py (from r324598, head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py) ============================================================================== --- head/lang/pypy/files/patch-lib__pypyX.Y__lib_pypy___sqlite3.py Sun Aug 11 16:42:22 2013 (r324598, copy source) +++ head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py Sun Aug 11 17:10:41 2013 (r324601) @@ -1,5 +1,5 @@ ---- lib/pypy-2.1/lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200 -+++ lib/pypy-2.1/lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200 +--- lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200 ++++ lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200 @@ -270,7 +270,7 @@ _lib = _ffi.verify(""" Modified: head/lang/pypy-devel/pkg-plist ============================================================================== --- head/lang/pypy/pkg-plist Sun Aug 11 16:42:22 2013 (r324598) +++ head/lang/pypy-devel/pkg-plist Sun Aug 11 17:10:41 2013 (r324601) @@ -1450,9 +1450,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__g3b3d68b9x310af836.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g7019d5d3xad93c709.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g774d129dx1fd01a91.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 @@ -1715,6 +1715,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 +3750,7 @@ @dirrm %%PYPY_LIBDIR%%/test @dirrm %%PYPY_LIBDIR%%/sqlite3/test @dirrm %%PYPY_LIBDIR%%/sqlite3 -@dirrm %%PYPY_LIBDIR%%/site-packages +@dirrmtry %%PYPY_LIBDIR%%/site-packages @dirrm %%PYPY_LIBDIR%%/pydoc_data @dirrm %%PYPY_LIBDIR%%/plat-unixware7 @dirrm %%PYPY_LIBDIR%%/plat-sunos5 @@ -3830,5 +3831,5 @@ @dirrm %%PYPY_LIBDIR%%/compiler @dirrm %%PYPY_LIBDIR%%/bsddb/test @dirrm %%PYPY_LIBDIR%%/bsddb -@dirrm %%PYPY_LIBDIR%% -@dirrm %%PYPY_INCLUDEDIR%% +@dirrmtry %%PYPY_LIBDIR%% +@dirrmtry %%PYPY_INCLUDEDIR%% Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Sun Aug 11 17:05:53 2013 (r324600) +++ head/lang/pypy/Makefile Sun Aug 11 17:10:41 2013 (r324601) @@ -35,6 +35,7 @@ OPTIONS_DEFAULT+= PYPY_MINMEM .endif MANUAL_PACKAGE_BUILD= runaway process on pointyhat +CONFLICTS_INSTALL= pypy-devel-[0-9]* ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308111710.r7BHAf7x042096>