svn commit: r440114 - head/lang/pypy

[David Naylor]

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}