diff --git a/math/py-CyLP/Makefile b/math/py-CyLP/Makefile index ffe1617773e1..1113e2aa086e 100644 --- a/math/py-CyLP/Makefile +++ b/math/py-CyLP/Makefile @@ -1,42 +1,43 @@ PORTNAME= CyLP DISTVERSIONPREFIX= v -DISTVERSION= 0.91.6 +DISTVERSION= 0.92.2 CATEGORIES= math python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Python interface to CLP, CBC, and CGL to solve LPs and MIPs WWW= https://github.com/coin-or/CyLP LICENSE= CPL10 LICENSE_NAME= Common Public License Version 1.0 LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell -PY_DEPENDS= ${PYNUMPY} \ - ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.0:science/py-scipy@${PY_FLAVOR} -BUILD_DEPENDS= ${PY_DEPENDS} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cython3>0:lang/cython3 \ + ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} LIB_DEPENDS= libblas.so:math/blas \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ libClp.so:math/clp \ libCoinUtils.so:math/coinutils \ liblapack.so:math/lapack \ libOsi.so:math/osi -RUN_DEPENDS= ${PY_DEPENDS} +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.0:science/py-scipy@${PY_FLAVOR} USES= compiler:c++11-lang python -USE_PYTHON= distutils cython autoplist pytest +USE_PYTHON= pep517 cython autoplist pytest USE_GITHUB= yes GH_ACCOUNT= coin-or MAKE_ENV= COIN_INSTALL_DIR=${LOCALBASE} TEST_WRKSRC= ${WRKSRC}/cylp TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cylp/cy/Cy*.so .include diff --git a/math/py-CyLP/distinfo b/math/py-CyLP/distinfo index 0defb60d93f2..dd51899b86c6 100644 --- a/math/py-CyLP/distinfo +++ b/math/py-CyLP/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685780281 -SHA256 (coin-or-CyLP-v0.91.6_GH0.tar.gz) = e05a4db7f86646a0103235d2b9620ec3bb1d88ca34e11319f9feb98ed11e3156 -SIZE (coin-or-CyLP-v0.91.6_GH0.tar.gz) = 7667335 +TIMESTAMP = 1703097807 +SHA256 (coin-or-CyLP-v0.92.2_GH0.tar.gz) = d107e457754e6da71877f4e192eedd5fdcd80c00c601b4d99fdebc8f9ff9afec +SIZE (coin-or-CyLP-v0.92.2_GH0.tar.gz) = 7666830 diff --git a/math/py-CyLP/files/patch-setup.py b/math/py-CyLP/files/patch-setup.py index f2607cf7e063..a7d9511dcb83 100644 --- a/math/py-CyLP/files/patch-setup.py +++ b/math/py-CyLP/files/patch-setup.py @@ -1,11 +1,20 @@ ---- setup.py.orig 2014-02-14 17:25:06 UTC +--- setup.py.orig 2023-11-01 20:21:56 UTC +++ setup.py -@@ -108,7 +108,7 @@ ext_modules = [] +@@ -124,7 +124,7 @@ ext_modules = [] if operatingSystem == 'mac': extra_link_args = ['-Wl,-framework', '-Wl,Accelerate', '-headerpad_max_install_names'] -elif operatingSystem == 'linux': +elif operatingSystem == 'linux' or operatingSystem.startswith('freebsd'): extra_link_args = ['-lrt'] else: # Assuming Windows +@@ -396,7 +396,7 @@ s_AUTHORS = open('AUTHORS').read() + + extra_files = ['cpp/*.hpp', 'cpp/*.h', 'cy/*.pxd', 'VERSION'] + +-setup(name='cylp', ++setup(name='CyLP', + version=VERSION, + description='A Python interface for CLP, CBC, and CGL', + long_description=s_README,