Date: Fri, 14 Apr 2017 12:37:52 +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: r438508 - in head/lang: pypy pypy3 Message-ID: <201704141237.v3ECbq8s020355@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Fri Apr 14 12:37:51 2017 New Revision: 438508 URL: https://svnweb.freebsd.org/changeset/ports/438508 Log: lang/pypy(3): unbreak build, fix shebang - Fix shebang references to pypy(3) - pypy3i [1]: - Correctly set ONLY_FOR_ARCHS - Remove '.swn' files from pkg-plist Reported by: pkg-fallout [1] Modified: head/lang/pypy/Makefile head/lang/pypy3/Makefile head/lang/pypy3/pkg-plist Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Fri Apr 14 12:29:38 2017 (r438507) +++ head/lang/pypy/Makefile Fri Apr 14 12:37:51 2017 (r438508) @@ -3,6 +3,7 @@ PORTNAME?= pypy DISTVERSION?= 5.7.1 # Also update bsd.pypy.cffi.mk +PORTREVISION= 1 CATEGORIES= lang python MASTER_SITES= https://bitbucket.org/pypy/pypy/downloads/ http://buildbot.pypy.org/mirror/ DISTNAME?= ${PORTNAME}2-v${PORTVERSION}-src @@ -20,8 +21,8 @@ TEST_DEPENDS= ${LOCALBASE}/${PYPY_DIR}/l ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_sqlite3_cffi.${PYPY_CFFI_VER}.so:databases/pypy-sqlite3 \ ${LOCALBASE}/${PYPY_DIR}/lib_pypy/_tkinter/tklib_cffi.${PYPY_CFFI_VER}.so:x11-toolkits/pypy-tkinter -ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64 -ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures +ONLY_FOR_ARCHS?=i386 amd64 armv6 powerpc64 +ONLY_FOR_ARCHS_REASON?= PyPy JIT only supported on these architectures OPTIONS_SINGLE= TRANS OPTIONS_SINGLE_TRANS= PYTHON @@ -46,7 +47,42 @@ BUILD_WRKSRC?= ${WRKDIR}/build/usession- MAKE_ENV+= PYPY_LOCALBASE=${LOCALBASE} LDSHARED="${CC} -shared" PACKAGE_ARGS?= --without-gdbm --without-sqlite3 --without-tk USE_LDCONFIG= ${PREFIX}/${PYPY_DIR}/bin -USES= gettext-runtime gmake ssl tar:bzip2 +USES= gettext-runtime gmake shebangfix ssl tar:bzip2 +SHEBANG_FILES?= lib-python/2.7/plat-mac/appletrunner.py \ + lib-python/2.7/plat-mac/bundlebuilder.py \ + lib-python/2.7/keyword.py \ + lib-python/2.7/test/regrtest.py \ + lib-python/2.7/test/pystone.py \ + lib-python/2.7/test/curses_tests.py \ + lib-python/2.7/test/re_tests.py \ + lib-python/2.7/test/crashers/recursive_call.py \ + lib-python/2.7/UserString.py \ + lib-python/2.7/pdb.py \ + lib-python/2.7/mimify.py \ + lib-python/2.7/pydoc.py \ + lib-python/2.7/uu.py \ + lib-python/2.7/trace.py \ + lib-python/2.7/platform.py \ + lib-python/2.7/profile.py \ + lib-python/2.7/tabnanny.py \ + lib-python/2.7/lib2to3/tests/pytree_idempotency.py \ + lib-python/2.7/lib2to3/tests/data/false_encoding.py \ + lib-python/2.7/lib2to3/tests/data/different_encoding.py \ + lib-python/2.7/lib2to3/pgen2/token.py \ + lib-python/2.7/encodings/rot_13.py \ + lib-python/2.7/base64.py \ + lib-python/2.7/webbrowser.py \ + lib-python/2.7/idlelib/PyShell.py \ + lib-python/2.7/cgi.py \ + lib-python/2.7/symbol.py \ + lib-python/2.7/cProfile.py \ + lib-python/2.7/smtpd.py \ + lib-python/2.7/quopri.py \ + lib-python/2.7/timeit.py \ + lib-python/2.7/smtplib.py + +python_OLD_CMD= /usr/local/bin/python +python_CMD= ${PREFIX}/bin/${PORTNAME} .if ${PORTNAME} != pypy PYPY_BUILD_DEPENDS= pypy:lang/pypy @@ -116,10 +152,11 @@ pkg-plist: stage ${REINPLACE_CMD} -e 's|^${PYPY_DIR}|%%PYPY_DIR%%|g' \ -e 's|_${PYPY_BITS}_|_%%PYPY_BITS%%_|g' \ -e 's|${PYPY_CFFI_VER}|%%PYPY_CFFI_VER%%|g' \ + -e 's/\(.*\/__pycache__\)\/$$/@dir \1/g' \ -e '/\/$$/d' \ ${WRKDIR}/.plist-files-gen ${ECHO} bin/${PORTNAME} > ${WRKDIR}/pkg-plist - ${SORT} ${WRKDIR}/.plist-files-gen >> ${WRKDIR}/pkg-plist + ${SORT} ${WRKDIR}/.plist-files-gen | ${GREP} -v '\.swn$$\|\.orig' >> ${WRKDIR}/pkg-plist ${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist .include <bsd.port.post.mk> Modified: head/lang/pypy3/Makefile ============================================================================== --- head/lang/pypy3/Makefile Fri Apr 14 12:29:38 2017 (r438507) +++ head/lang/pypy3/Makefile Fri Apr 14 12:37:51 2017 (r438508) @@ -8,10 +8,16 @@ DISTNAME= ${PORTNAME}-v${DISTVERSION}-sr MASTERDIR= ${.CURDIR}/../pypy ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= pypy3 is in beta development and upstream only supported amd64 for now WRKSRC= ${WRKDIR}/${PORTNAME}-v${DISTVERSION:C/-.*//}-src BUILD_WRKSRC?= ${WRKDIR}/build/usession-release-${PORTNAME}.5-v${DISTVERSION:C/-.*//}-0/testing_1 +SHEBANG_FILES= lib-python/3/encodings/rot_13.py \ + lib-python/3/lib2to3/tests/data/different_encoding.py \ + lib-python/3/lib2to3/tests/data/false_encoding.py \ + lib-python/3/cgi.py + PACKAGE_ARGS= --without-_gdbm --without-sqlite3 --without-tk PYPY_CFFI_VER= ${PORTNAME}-${DISTVERSION:C/.[^.]+$//:S/.//}-${ARCH}-${OPSYS:tl}${OSREL:C/\..*//} Modified: head/lang/pypy3/pkg-plist ============================================================================== --- head/lang/pypy3/pkg-plist Fri Apr 14 12:29:38 2017 (r438507) +++ head/lang/pypy3/pkg-plist Fri Apr 14 12:37:51 2017 (r438508) @@ -2033,7 +2033,6 @@ bin/pypy3 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/.gitignore %%PYPY_DIR%%/lib_pypy/_cffi_ssl/LICENSE %%PYPY_DIR%%/lib_pypy/_cffi_ssl/README.md -%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/.build_openssl.py.swn %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/__init__.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_commoncrypto.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_constant_time.py @@ -2098,7 +2097,6 @@ bin/pypy3 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509v3.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/utils.py -%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/.__init__.py.swn %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/__init__.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/certificate.py %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/error.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704141237.v3ECbq8s020355>