diff --git a/graphics/py-mayavi/Makefile b/graphics/py-mayavi/Makefile index edfbc975e80d..a2a28ba776bb 100644 --- a/graphics/py-mayavi/Makefile +++ b/graphics/py-mayavi/Makefile @@ -1,56 +1,56 @@ PORTNAME= mayavi -DISTVERSION= 4.8.1 -PORTREVISION= 7 +DISTVERSION= 4.8.2 CATEGORIES= graphics science python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Application and library for 3D visualization and plotting in Python WWW= http://code.enthought.com/pages/mayavi-project.html LICENSE= BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11 # see ${WRKSRC}/image_LICENSE.txt LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.txt LICENSE_FILE_LGPL21= ${WRKSRC}/image_LICENSE_Nuvola.txt LICENSE_FILE_LGPL20= ${WRKSRC}/image_LICENSE_CP.txt LICENSE_FILE_EPL= ${WRKSRC}/image_LICENSE_Eclipse.txt LICENSE_FILE_LGPL3= ${WRKSRC}/image_LICENSE_OOo.txt LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE_YORICK.txt LICENSE_FILE_APACHE11= ${WRKSRC}/LICENSE_COLORBREWER.txt BUILD_DEPENDS= ${PYNUMPY} \ ${PY_SPHINX} \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R} RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyface>=6.1.1:devel/py-pyface@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traits>=6.0.0:devel/py-traits@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitsui>=7.0.0:graphics/py-traitsui@${PY_FLAVOR} # list is in mayavi/__init__.py USES= python shebangfix USE_PYTHON= distutils autoplist USE_WX= 3.2 WX_COMPS= python:run -SHEBANG_FILES= mayavi/tests/csv_files/csv_2_py +SHEBANG_FILES= mayavi/scripts/mayavi2 \ + mayavi/tests/csv_files/csv_2_py POST_PLIST= fix-plist post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext*.so fix-plist: @${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/mayavi/preferences/__pycache__$$||" ${TMPPLIST} @${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/tvtk/plugins/scene/__pycache__$$||" ${TMPPLIST} do-test: @${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} ${WRKSRC}/examples/mayavi/interactive/coil_design_application.py .include <../../math/vtk9/Makefile.version> .include diff --git a/graphics/py-mayavi/distinfo b/graphics/py-mayavi/distinfo index 380df7f215fd..81df0d9b166b 100644 --- a/graphics/py-mayavi/distinfo +++ b/graphics/py-mayavi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666417495 -SHA256 (mayavi-4.8.1.tar.gz) = 9f427ef2ca6c91ae78d92d3689ba6beca24c8460e2706d8a1c9b84289ad3fd9e -SIZE (mayavi-4.8.1.tar.gz) = 20607299 +TIMESTAMP = 1717834084 +SHA256 (mayavi-4.8.2.tar.gz) = b10fe9145f21c48e4902f0e746b3603b3cb694d11456515a46820f21a0a74229 +SIZE (mayavi-4.8.2.tar.gz) = 7100132 diff --git a/graphics/py-mayavi/files/patch-setup.py b/graphics/py-mayavi/files/patch-setup.py deleted file mode 100644 index e005fa7e1a0d..000000000000 --- a/graphics/py-mayavi/files/patch-setup.py +++ /dev/null @@ -1,32 +0,0 @@ -- The first patch is to fix build by accepting tvtk_classes.zip, -- otherwise the build SEGVs on some platforms. -- Rebuilding tvtk_classes.zip seems to cause SEGVs. - -- Misc other patches. - ---- setup.py.orig 2022-10-17 14:42:18 UTC -+++ setup.py -@@ -260,7 +260,7 @@ def _tvtk_built_recently(zipfile, delay): - def build_tvtk_classes_zip(): - MY_DIR = os.path.dirname(__file__) - zipfile = os.path.join(MY_DIR, 'tvtk', 'tvtk_classes.zip') -- if _tvtk_built_recently(zipfile, delay=120): -+ if True or _tvtk_built_recently(zipfile, delay=120): - print("Already built tvtk_classes.zip") - return - else: -@@ -378,12 +378,12 @@ def configuration(parent_package=None, top_path=None): - config.add_data_dir('mayavi/core/lut') - config.add_data_dir('mayavi/tests/data') - config.add_data_dir('mayavi/tests/csv_files') -- config.add_data_dir('mayavi/tools/static') -+ config.add_data_dir('mayavi/tools/static/x3d') - - # Image files. - for pkgdir in ('mayavi', 'tvtk'): - for root, dirs, files in os.walk(pkgdir): -- if split(root)[-1] == 'images': -+ if split(root)[-1] == 'images' and files: - config.add_data_dir(root) - - # *.ini files. diff --git a/graphics/py-mayavi/files/patch-tvtk_setup.py b/graphics/py-mayavi/files/patch-tvtk_setup.py deleted file mode 100644 index 0be4fc50cc0c..000000000000 --- a/graphics/py-mayavi/files/patch-tvtk_setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- tvtk/setup.py.orig 2016-08-01 19:02:36 UTC -+++ tvtk/setup.py -@@ -20,7 +20,7 @@ def configuration(parent_package=None, t - config.add_subpackage('custom') - config.add_subpackage('pipeline') - config.add_data_dir('pipeline/images') -- config.add_data_dir('pyface/images') -+# config.add_data_dir('pyface/images') - config.add_data_dir('tools/images') - - config.add_subpackage('plugins')