git: 69eaa3254aa3 - main - graphics/py-mayavi: update 4.8.1 → 4.8.2

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 08 Jun 2024 15:31:15 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=69eaa3254aa35710752aabb53bde1e55b83230ff

commit 69eaa3254aa35710752aabb53bde1e55b83230ff
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-08 15:30:30 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-08 15:31:09 +0000

    graphics/py-mayavi: update 4.8.1 → 4.8.2
---
 graphics/py-mayavi/Makefile                  |  6 +++---
 graphics/py-mayavi/distinfo                  |  6 +++---
 graphics/py-mayavi/files/patch-setup.py      | 32 ----------------------------
 graphics/py-mayavi/files/patch-tvtk_setup.py | 11 ----------
 4 files changed, 6 insertions(+), 49 deletions(-)

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,6 +1,5 @@
 PORTNAME=	mayavi
-DISTVERSION=	4.8.1
-PORTREVISION=	7
+DISTVERSION=	4.8.2
 CATEGORIES=	graphics science python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -38,7 +37,8 @@ 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
 
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')