Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Nov 2020 04:45:21 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r554167 - in branches/2020Q4/math/cantor: . files
Message-ID:  <202011060445.0A64jLUw044652@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Fri Nov  6 04:45:20 2020
New Revision: 554167
URL: https://svnweb.freebsd.org/changeset/ports/554167

Log:
  MFH: r554148
  
  math/cantor: Support ptyhon3.9
  
  - instead of adding 'python3.9' to the list, simply patch in
    python-${PYTHON_VER} -- this way, this should fix two issues
  
    1) make it work with python
    2) help cmake find the "wanted" python version in unclean environments
  
  PR:		250884
  Reported by:	Oleg Sidorkin <osidorkin@gmail.com>, fluffy (previously)
  
  Approved by:	ports-secteam (implicit)

Added:
  branches/2020Q4/math/cantor/files/
     - copied from r554148, head/math/cantor/files/
Modified:
  branches/2020Q4/math/cantor/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/math/cantor/Makefile
==============================================================================
--- branches/2020Q4/math/cantor/Makefile	Fri Nov  6 04:27:31 2020	(r554166)
+++ branches/2020Q4/math/cantor/Makefile	Fri Nov  6 04:45:20 2020	(r554167)
@@ -58,8 +58,7 @@ CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_PythonLibs
 post-patch:
 	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \
 		${WRKSRC}/cmake/FindR.cmake
-	${REINPLACE_CMD} -e '/find_library(PYTHONLIBS3_LIBRARY/s,python3.5m,python3.5m python3.6m,' \
-			 -e '/pkg_check_modules/s,python3,python-${PYTHON_VER},' \
+	${REINPLACE_CMD} -e 's|%%PYTHON_VER%%|${PYTHON_VER}|g' \
 		${WRKSRC}/cmake/FindPythonLibs3.cmake
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011060445.0A64jLUw044652>