Date: Sun, 11 Aug 2013 18:33:33 +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: r324604 - in head/lang: pypy pypy-devel pypy/files pypy3-devel pypy3-devel/files Message-ID: <201308111833.r7BIXX3v073073@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sun Aug 11 18:33:33 2013 New Revision: 324604 URL: http://svnweb.freebsd.org/changeset/ports/324604 Log: Backport and fix-up lang/pypy* ports. pypy: - fix sysconfig.py's include path - bump PORTREVISION due to above fix pypy-devel: - remove duplicate '-e' when creating pkg-plist - ancillary port functionality (thus no PORTREVISION bump) pypy3-devel: - add missing patch - fix pkg-plist - build fails without above patch (thus no PORTREVISION bump) Added: head/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py (contents, props changed) Modified: head/lang/pypy-devel/Makefile head/lang/pypy/Makefile head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py head/lang/pypy3-devel/pkg-plist Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy-devel/Makefile Sun Aug 11 18:13:10 2013 (r324603) +++ head/lang/pypy-devel/Makefile Sun Aug 11 18:33:33 2013 (r324604) @@ -307,8 +307,8 @@ pkg-plist: build ${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|' \ + ${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 Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Sun Aug 11 18:13:10 2013 (r324603) +++ head/lang/pypy/Makefile Sun Aug 11 18:33:33 2013 (r324604) @@ -3,6 +3,7 @@ PORTNAME= pypy DISTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= lang python java MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ DISTNAME= ${PORTNAME}-${DISTVERSION}-src Modified: head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py ============================================================================== --- head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py Sun Aug 11 18:13:10 2013 (r324603) +++ head/lang/pypy/files/patch-lib__pypyX.Y__sysconfig.py Sun Aug 11 18:33:33 2013 (r324604) @@ -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}', Added: head/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy3-devel/files/patch-pypy__module___posixsubprocess__interp_subprocess.py Sun Aug 11 18:33:33 2013 (r324604) @@ -0,0 +1,27 @@ +--- pypy/module/_posixsubprocess/interp_subprocess.py~ 2013-08-09 19:13:04.000000000 +0200 ++++ pypy/module/_posixsubprocess/interp_subprocess.py 2013-08-09 19:20:31.000000000 +0200 +@@ -12,8 +12,10 @@ + + class CConfig: + _compilation_info_ = ExternalCompilationInfo( +- includes=['unistd.h', 'sys/syscall.h']) ++ includes=['unistd.h', 'sys/stat.h', 'sys/syscall.h', 'sys/types.h']) ++ HAVE_SYS_STAT_H = platform.Has('stat') + HAVE_SYS_SYSCALL_H = platform.Has("syscall") ++ HAVE_SYS_TYPES_H = platform.Has('types') + HAVE_SETSID = platform.Has("setsid") + + config = platform.configure(CConfig) +@@ -26,8 +28,12 @@ + ]) + + compile_extra = [] ++if config['HAVE_SYS_STAT_H']: ++ compile_extra.append('-DHAVE_SYS_STAT_H') + if config['HAVE_SYS_SYSCALL_H']: + compile_extra.append("-DHAVE_SYS_SYSCALL_H") ++if config['HAVE_SYS_TYPES_H']: ++ compile_extra.append('-DHAVE_SYS_TYPES_H') + if config['HAVE_SETSID']: + compile_extra.append("-DHAVE_SETSID") + Modified: head/lang/pypy3-devel/pkg-plist ============================================================================== --- head/lang/pypy3-devel/pkg-plist Sun Aug 11 18:13:10 2013 (r324603) +++ head/lang/pypy3-devel/pkg-plist Sun Aug 11 18:33:33 2013 (r324604) @@ -1409,9 +1409,9 @@ %%PYPY_LIBDIR%%/lib_pypy/__init__.py %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc %%PYPY_LIBDIR%%/lib_pypy/__pycache__/__init__.pypy-%%PYPY_VER%%.pyc -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb56459ffx310af836.pypy-21.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb61d9cdcx1fd01a91.pypy-21.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gd9aba7e0xad93c709.pypy-21.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb56459ffx310af836.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gb61d9cdcx1fd01a91.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__gd9aba7e0xad93c709.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_cn.pypy-%%PYPY_VER%%.pyc %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_hk.pypy-%%PYPY_VER%%.pyc %%PYPY_LIBDIR%%/lib_pypy/__pycache__/_codecs_iso2022.pypy-%%PYPY_VER%%.pyc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308111833.r7BIXX3v073073>