From owner-svn-ports-head@freebsd.org Thu May 4 19:08:38 2017 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 5430BD5B783; Thu, 4 May 2017 19:08:38 +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 26519FBF; Thu, 4 May 2017 19:08:38 +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 v44J8biE015823; Thu, 4 May 2017 19:08:37 GMT (envelope-from dbn@FreeBSD.org) Received: (from dbn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v44J8bYn015821; Thu, 4 May 2017 19:08:37 GMT (envelope-from dbn@FreeBSD.org) Message-Id: <201705041908.v44J8bYn015821@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbn set sender to dbn@FreeBSD.org using -f From: David Naylor Date: Thu, 4 May 2017 19:08:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r440114 - head/lang/pypy 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.23 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: Thu, 04 May 2017 19:08:38 -0000 Author: dbn Date: Thu May 4 19:08:36 2017 New Revision: 440114 URL: https://svnweb.freebsd.org/changeset/ports/440114 Log: bsd.pypy.cffi.mk: unbreak building of cffi ports To fix conflicting of pypy and pypy3 the PYPY_DIR value was set using ${PORTNAME}, however the same codepath is used for cffi ports who's ${PORTNAME} is not pypy or pypy3. Fix this by using an intermediate PYTHON_IMPL variable that is conditionally set to ${PORTNAME} and explicitly set to 'pypy' for cffi ports. Reported by: pkg-fallout Modified: head/lang/pypy/bsd.pypy.cffi.mk head/lang/pypy/bsd.pypy.mk Modified: head/lang/pypy/bsd.pypy.cffi.mk ============================================================================== --- head/lang/pypy/bsd.pypy.cffi.mk Thu May 4 18:56:20 2017 (r440113) +++ head/lang/pypy/bsd.pypy.cffi.mk Thu May 4 19:08:36 2017 (r440114) @@ -10,9 +10,10 @@ PLIST_FILES= %%PYPY_DIR%%/lib_pypy/${CFF CFFI_MODULE?= _${PORTNAME} +PYTHON_IMPL= pypy PYTHON_PORTVERSION?= 5.7.1 PYTHON_PKGNAMEPREFIX= pypy- -PYTHON_CMD= ${LOCALBASE}/bin/pypy +PYTHON_CMD= ${LOCALBASE}/bin/${PYTHON_IMPL} .include "${.CURDIR}/../../lang/pypy/bsd.pypy.mk" Modified: head/lang/pypy/bsd.pypy.mk ============================================================================== --- head/lang/pypy/bsd.pypy.mk Thu May 4 18:56:20 2017 (r440113) +++ head/lang/pypy/bsd.pypy.mk Thu May 4 19:08:36 2017 (r440114) @@ -7,6 +7,7 @@ LICENSE_COMB= multi USES+= compiler:c11 -PYPY_DIR= ${PORTNAME}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} +PYTHON_IMPL?= ${PORTNAME} +PYPY_DIR= ${PYTHON_IMPL}-${PORTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYPY_CFFI_VER?= pypy-41 PLIST_SUB+= PYPY_DIR=${PYPY_DIR} PYPY_CFFI_VER=${PYPY_CFFI_VER}