Revert "textproc/py-python-lsp-black: New port: Black plugin for the Python LSP Server"

This reverts commit 0c041ad4a2d2ade16fb3a91a5e651f018e33455f.

5 files changed, 14 insertions, 33 deletions

diff --git a/cad/appcsxcad/Makefile b/cad/appcsxcad/Makefile
index 391abcce4447..eeacd1ff5ed4 100644
--- a/cad/appcsxcad/Makefile
+++ b/cad/appcsxcad/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	appcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.2-9
 DISTVERSIONSUFFIX=	-g97ba30e
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libQCSXCAD.so:cad/qcsxcad \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
-		libvtkCommonCore-${VTK_VER}.so:math/vtk9
+		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui sql widgets xml buildtools:build qmake:build
@@ -31,7 +31,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	AppCSXCAD
 
-CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
 
 PLIST_FILES=	bin/AppCSXCAD
 
@@ -40,5 +40,4 @@ post-install:
 
 # an example of file that AppCSXCAD opens (zipped): http://openems.de/forum/download/file.php?id=418&sid=6daebbb2df72b415fa2ec7031ffa6ca9
 
-.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index 55b3091b7edf..4c2563b0c173 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -2,7 +2,7 @@ PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-109
 DISTVERSIONSUFFIX=	-gcd9decb
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libsz.so:science/libaec \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
-		libvtkCommonCore-${VTK_VER}.so:math/vtk9
+		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake jpeg pkgconfig
 USE_LDCONFIG=	yes
@@ -32,7 +32,6 @@ GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
 CMAKE_ARGS=	-DFPARSER_ROOT_DIR=${LOCALBASE} \
-		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
+		-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
 
-.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index d10b1d6a1967..0ff44d1e1b94 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opencascade
 PORTVERSION=	7.6.0
-PORTREVISION=	9
+PORTREVISION=	8
 CATEGORIES=	cad science
 MASTER_SITES=	LOCAL/thierry
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 		libfreetype.so:print/freetype2		\
 		libexpat.so:textproc/expat2		\
 		libpng16.so:graphics/png		\
-		libvtksys-${VTK_VER}.so:math/vtk${VTK_VER:R}
+		libvtksys-${VTKVER}.so:math/vtk${VTKVER:R}
 RUN_DEPENDS=	bash:shells/bash
 
 # Check ${WRKSRC}/dox/overview/overview.md
@@ -40,6 +40,8 @@ SHEBANG_FILES=	adm/templates/*.sh	\
 		gendoc
 ENVSH=		adm/templates/env.sh
 
+VTKVER=		9.1
+
 OPTIONS_DEFINE=	DOCS DOXYGEN FFMPEG VIS
 VIS_DESC=	Build Visualizazion module (requires OpenGL, freetype, ftgl)
 OPTIONS_DEFAULT=FFMPEG VIS
@@ -60,7 +62,7 @@ CMAKE_ARGS+=	-DINSTALL_DIR=${OCCROOT}				\
 		-DUSE_TBB:BOOL=OFF					\
 		-DUSE_RAPIDJSON:BOOL=ON					\
 		-DUSE_VTK:BOOL=ON					\
-		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
+		-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTKVER}
 CONFIGURE_ENV+=	DESTDIR=${STAGEDIR}
 
 .if defined(MAINTAINER_MODE)
@@ -179,5 +181,4 @@ regression-test:	install
 	DRAWEXE -f ${FILESDIR}/regtest "
 .endif
 
-.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx b/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx
deleted file mode 100644
index e5b6146f4111..000000000000
--- a/cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx
+++ /dev/null
@@ -1,17 +0,0 @@
-- workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/18683
-
---- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig	2021-10-30 11:13:52 UTC
-+++ src/IVtkDraw/IVtkDraw_Interactor.cxx
-@@ -26,6 +26,12 @@
- #ifdef AllValues
- #undef AllValues
- #endif
-+#ifdef Status
-+#undef Status
-+#endif
-+#ifdef Success
-+#undef Success
-+#endif
- 
- #include <vtkXRenderWindowInteractor.h>
- #include <vtkXOpenGLRenderWindow.h>
diff --git a/cad/qcsxcad/Makefile b/cad/qcsxcad/Makefile
index 2ac32b0d67bc..8fc566507178 100644
--- a/cad/qcsxcad/Makefile
+++ b/cad/qcsxcad/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	qcsxcad
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.2-9
-PORTREVISION=	2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-g3f09a8b
 CATEGORIES=	cad
 
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libCSXCAD.so:cad/csxcad \
 		libpng16.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
-		libvtkCommonCore-${VTK_VER}.so:math/vtk9
+		libvtkCommonCore-9.1.so:math/vtk9
 
 USES=		cmake gl jpeg pkgconfig qt:5 xorg
 USE_QT=		core gui opengl sql widgets xml buildtools:build qmake:build
@@ -30,7 +30,6 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	thliebig
 GH_PROJECT=	${PORTNAME:tu}
 
-CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER}
+CMAKE_ARGS=	-DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-9.1
 
-.include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>