From owner-svn-ports-head@freebsd.org Sun Dec 13 13:16:33 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 06D46A43C1A; Sun, 13 Dec 2015 13:16:33 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D19A31E73; Sun, 13 Dec 2015 13:16:32 +0000 (UTC) (envelope-from dbn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBDDGVng042881; Sun, 13 Dec 2015 13:16:31 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBDDGV3g042876; Sun, 13 Dec 2015 13:16:31 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201512131316.tBDDGV3g042876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Sun, 13 Dec 2015 13:16:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403664 - in head: databases/pypy-gdbm databases/pypy-sqlite3 lang/pypy x11-toolkits/pypy-tkinter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Dec 2015 13:16:33 -0000 Author: dbn Date: Sun Dec 13 13:16:31 2015 New Revision: 403664 URL: https://svnweb.freebsd.org/changeset/ports/403664 Log: lang/pypy: unbreak build on i386 and armv6 - Add back PYPY_BITS as it is required to define the names of two files, depending if pypy is translated for 32 or 64 bit systems [1]. - Change maintainership to python@ [2][3][4] Reported by: pkg-fallout [1] Approved by: koobs@ [2] PR: 204743 [3] Submitted by: robak@ [4] Modified: head/databases/pypy-gdbm/Makefile head/databases/pypy-sqlite3/Makefile head/lang/pypy/Makefile head/lang/pypy/pkg-plist head/x11-toolkits/pypy-tkinter/Makefile Modified: head/databases/pypy-gdbm/Makefile ============================================================================== --- head/databases/pypy-gdbm/Makefile Sun Dec 13 12:51:47 2015 (r403663) +++ head/databases/pypy-gdbm/Makefile Sun Dec 13 13:16:31 2015 (r403664) @@ -5,7 +5,7 @@ PORTNAME= gdbm PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= PyPy bindings to the GNU dbm library LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm Modified: head/databases/pypy-sqlite3/Makefile ============================================================================== --- head/databases/pypy-sqlite3/Makefile Sun Dec 13 12:51:47 2015 (r403663) +++ head/databases/pypy-sqlite3/Makefile Sun Dec 13 13:16:31 2015 (r403664) @@ -5,7 +5,7 @@ PORTNAME= sqlite3 PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= databases python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Standard PyPy binding to the SQLite3 library LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 Modified: head/lang/pypy/Makefile ============================================================================== --- head/lang/pypy/Makefile Sun Dec 13 12:51:47 2015 (r403663) +++ head/lang/pypy/Makefile Sun Dec 13 13:16:31 2015 (r403664) @@ -8,13 +8,13 @@ MASTER_SITES= https://bitbucket.org/pypy DISTNAME= release-${DISTVERSION} DIST_SUBDIR= pypy -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libffi.so:${PORTSDIR}/devel/libffi -ONLY_FOR_ARCHS= i386 amd64 armv6 +ONLY_FOR_ARCHS= i386 amd64 armv6 powerpc64 ONLY_FOR_ARCHS_REASON= PyPy JIT only supported on these architectures PYTHON_DESC= Use Python-2.7 to translate (slowest) @@ -48,6 +48,13 @@ PYTHON_CMD?= ${SETENV} PYPY_GC_MAX_DELTA USES+= python:2,build .endif +.if ${ARCH} == "i386" || ${ARCH} == "armv6" +PYPY_BITS= 32 +.elif ${ARCH} == "amd64" || ${ARCH} == "powerpc64" +PYPY_BITS= 64 +.endif +PLIST_SUB+= PYPY_BITS="${PYPY_BITS}" + pre-build: if [ ! -f ${BUILD_WRKSRC}/Makefile ]; then \ ${RM} -r ${WRKDIR}/build; \ @@ -86,6 +93,7 @@ regression-test: build pkg-plist: build ${TAR} -tf ${WRKDIR}/build/${PYPY_DIR}.tar.bz2 > ${WRKDIR}/.plist-files-gen ${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 '/\/$$/d' \ ${WRKDIR}/.plist-files-gen Modified: head/lang/pypy/pkg-plist ============================================================================== --- head/lang/pypy/pkg-plist Sun Dec 13 12:51:47 2015 (r403663) +++ head/lang/pypy/pkg-plist Sun Dec 13 13:16:31 2015 (r403664) @@ -2145,9 +2145,9 @@ bin/pypy %%PYPY_DIR%%/lib_pypy/cffi/vengine_gen.py %%PYPY_DIR%%/lib_pypy/cffi/verifier.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/__init__.py -%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_64_.py +%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_%%PYPY_BITS%%_.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_locale_cache.py -%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_64_.py +%%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_%%PYPY_BITS%%_.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/_resource_cache.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/dumpcache.py %%PYPY_DIR%%/lib_pypy/ctypes_config_cache/locale.ctc.py Modified: head/x11-toolkits/pypy-tkinter/Makefile ============================================================================== --- head/x11-toolkits/pypy-tkinter/Makefile Sun Dec 13 12:51:47 2015 (r403663) +++ head/x11-toolkits/pypy-tkinter/Makefile Sun Dec 13 13:16:31 2015 (r403664) @@ -5,7 +5,7 @@ PORTNAME= tkinter PORTVERSION= ${PYTHON_PORTVERSION} CATEGORIES= x11-toolkits python -MAINTAINER= dbn@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT= PyPy bindings to the Tk widget set USES= tk