svn commit: r491311 - in head/math/py-gau2grid: . files
Yuri Victorovich
yuri at FreeBSD.org
Sat Jan 26 20:29:31 UTC 2019
Author: yuri
Date: Sat Jan 26 20:29:29 2019
New Revision: 491311
URL: https://svnweb.freebsd.org/changeset/ports/491311
Log:
math/py-gau2grid: Update 1.3.0 -> 1.3.1
Switch to cmake based on the upstream recommendation.
Reported by: repology
Added:
head/math/py-gau2grid/files/
head/math/py-gau2grid/files/patch-CMakeLists.txt (contents, props changed)
head/math/py-gau2grid/pkg-plist (contents, props changed)
Modified:
head/math/py-gau2grid/Makefile
head/math/py-gau2grid/distinfo
Modified: head/math/py-gau2grid/Makefile
==============================================================================
--- head/math/py-gau2grid/Makefile Sat Jan 26 20:22:37 2019 (r491310)
+++ head/math/py-gau2grid/Makefile Sat Jan 26 20:29:29 2019 (r491311)
@@ -2,14 +2,10 @@
PORTNAME= gau2grid
DISTVERSIONPREFIX= v
-DISTVERSION= 1.3.0
-PORTREVISION= 1
+DISTVERSION= 1.3.1
CATEGORIES= math python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= 0deace28eaad3359a595e384daf7bb9dd157c0d6.patch:-p1
-
MAINTAINER= yuri at FreeBSD.org
COMMENT= Fast computation of a gaussian and its derivative on a grid
@@ -21,12 +17,16 @@ BUILD_DEPENDS= ${PYNUMPY} \
RUN_DEPENDS= ${PYNUMPY}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
-USES= compiler:c11 python
+USES= cmake compiler:c11 python
USE_GITHUB= yes
GH_ACCOUNT= dgasmith
-USE_PYTHON= distutils autoplist
+USE_PYTHON= flavors
-PLIST_FILES= ${PYTHON_SITELIBDIR}/gau2grid/libgg.so.1 # https://github.com/dgasmith/gau2grid/issues/33
+CMAKE_ON= INSTALL_PYMOD
+CMAKE_ARGS= -DPYMOD_INSTALL_LIBDIR:STRING=${PYTHON_SITELIBDIR} -DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER}
+
+post-install:
+ @${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/gau2grid/__pycache__
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest
Modified: head/math/py-gau2grid/distinfo
==============================================================================
--- head/math/py-gau2grid/distinfo Sat Jan 26 20:22:37 2019 (r491310)
+++ head/math/py-gau2grid/distinfo Sat Jan 26 20:29:29 2019 (r491311)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1543900549
-SHA256 (dgasmith-gau2grid-v1.3.0_GH0.tar.gz) = 3e93304cb6b6871811f43c5491fe7d597dcf6432bd09cb1f70e6c41fa20ab1a2
-SIZE (dgasmith-gau2grid-v1.3.0_GH0.tar.gz) = 208146
-SHA256 (0deace28eaad3359a595e384daf7bb9dd157c0d6.patch) = 1f689856c9c691e9106e66365d5da337c7abcd1edb645c7ddfe9d6e39fb2e074
-SIZE (0deace28eaad3359a595e384daf7bb9dd157c0d6.patch) = 1051
+TIMESTAMP = 1548483208
+SHA256 (dgasmith-gau2grid-v1.3.1_GH0.tar.gz) = ed12bad06f3a974c2fe556df213589ccc2a0886fafb60b517726a8529d422076
+SIZE (dgasmith-gau2grid-v1.3.1_GH0.tar.gz) = 78811
Added: head/math/py-gau2grid/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/py-gau2grid/files/patch-CMakeLists.txt Sat Jan 26 20:29:29 2019 (r491311)
@@ -0,0 +1,41 @@
+--- CMakeLists.txt.orig 2018-12-17 15:06:15 UTC
++++ CMakeLists.txt
+@@ -56,7 +56,7 @@ message(STATUS "gau2grid install: ${CMAK
+
+ # << Python >>
+ set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5) # adjust with CMake minimum FindPythonInterp
+-find_package(PythonLibsNew 2.7 REQUIRED)
++find_package(PythonLibsNew ${FREEBSD_PYTHON_VER} REQUIRED)
+ message(STATUS "${Cyan}Found Python ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}${ColourReset}: ${PYTHON_EXECUTABLE} (found version ${PYTHON_VERSION_STRING})")
+
+
+@@ -112,6 +112,7 @@ target_include_directories(gg INTERFACE
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+
+ # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
++if (FALSE) # see https://github.com/dgasmith/gau2grid/issues/39#issuecomment-457856365
+ set(CMAKECONFIG_INSTALL_DIR "share/cmake/${PN}")
+ configure_package_config_file(cmake/${PN}Config.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/${PN}Config.cmake"
+@@ -138,6 +139,7 @@ if(NOT(${INSTALL_PYMOD} AND ${NATIVE_PYT
+ NAMESPACE "${PN}::"
+ DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+ endif()
++endif()
+
+ if(${INSTALL_PYMOD})
+ if(${NATIVE_PYTHON_INSTALL})
+@@ -161,11 +163,11 @@ if(${INSTALL_PYMOD})
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+ install(DIRECTORY gau2grid
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}${PYMOD_INSTALL_LIBDIR}
++ DESTINATION ${PYMOD_INSTALL_LIBDIR}
+ USE_SOURCE_PERMISSIONS
+ FILES_MATCHING PATTERN "*.py")
+
+ install(FILES $<TARGET_FILE:gg>
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}${PYMOD_INSTALL_LIBDIR}/gau2grid
++ DESTINATION ${PYMOD_INSTALL_LIBDIR}/gau2grid
+ RENAME "gg${PYLIB_EXTENSION}")
+ endif()
Added: head/math/py-gau2grid/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/py-gau2grid/pkg-plist Sat Jan 26 20:29:29 2019 (r491311)
@@ -0,0 +1,23 @@
+%%PYTHON_SITELIBDIR%%/gau2grid/RSH.py
+%%PYTHON_SITELIBDIR%%/gau2grid/__init__.py
+%%PYTHON_SITELIBDIR%%/gau2grid/_version.py
+%%PYTHON_SITELIBDIR%%/gau2grid/c_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/c_pragma.py
+%%PYTHON_SITELIBDIR%%/gau2grid/c_util_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/c_wrapper.py
+%%PYTHON_SITELIBDIR%%/gau2grid/codegen.py
+%%PYTHON_SITELIBDIR%%/gau2grid/docs_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/extras.py
+%%PYTHON_SITELIBDIR%%/gau2grid/gg.so
+%%PYTHON_SITELIBDIR%%/gau2grid/np_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/order.py
+%%PYTHON_SITELIBDIR%%/gau2grid/python_reference.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/ref_basis.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_c_code.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_c_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_helper.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_np_generator.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_order.py
+%%PYTHON_SITELIBDIR%%/gau2grid/tests/test_rsh.py
+%%PYTHON_SITELIBDIR%%/gau2grid/utility.py
More information about the svn-ports-head
mailing list