git: 741a01d54eea - main - cad/csxcad: update 0.6.2-109 → 0.6.3

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 24 Oct 2023 03:10:17 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=741a01d54eea7a3607f70f4274bb9bd451f4a48b

commit 741a01d54eea7a3607f70f4274bb9bd451f4a48b
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-10-24 02:02:23 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-10-24 03:10:12 +0000

    cad/csxcad: update 0.6.2-109 → 0.6.3
    
    Reported by:    portscout
---
 cad/csxcad/Makefile                   |  9 ++-------
 cad/csxcad/distinfo                   |  6 +++---
 cad/csxcad/files/patch-CMakeLists.txt | 13 +++++++++++++
 cad/csxcad/files/patch-hdf5           | 12 ------------
 cad/csxcad/pkg-plist                  |  2 +-
 5 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile
index eaffb8b1fa52..cb913cd8795a 100644
--- a/cad/csxcad/Makefile
+++ b/cad/csxcad/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	csxcad
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2-109
-DISTVERSIONSUFFIX=	-gcd9decb
-PORTREVISION=	9
+DISTVERSION=	0.6.3
 CATEGORIES=	cad
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -18,13 +16,10 @@ LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libgmp.so:math/gmp \
 		libhdf5.so:science/hdf5 \
 		libmpfr.so:math/mpfr \
-		libpng16.so:graphics/png \
-		libsz.so:science/libaec \
-		libtiff.so:graphics/tiff \
 		libtinyxml.so:textproc/tinyxml \
 		libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 
-USES=		cmake jpeg pkgconfig
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
diff --git a/cad/csxcad/distinfo b/cad/csxcad/distinfo
index 0a43f67b0193..02e08b763914 100644
--- a/cad/csxcad/distinfo
+++ b/cad/csxcad/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656263160
-SHA256 (thliebig-CSXCAD-v0.6.2-109-gcd9decb_GH0.tar.gz) = fef9258615906a37632be1de46847d987be1c8301d48e407e6600205daca1af5
-SIZE (thliebig-CSXCAD-v0.6.2-109-gcd9decb_GH0.tar.gz) = 169609
+TIMESTAMP = 1698081934
+SHA256 (thliebig-CSXCAD-v0.6.3_GH0.tar.gz) = 48ab6ffd19164d473655066468fc4c1e4616c6db7e53d208390f3a8d40b90be7
+SIZE (thliebig-CSXCAD-v0.6.3_GH0.tar.gz) = 169861
diff --git a/cad/csxcad/files/patch-CMakeLists.txt b/cad/csxcad/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..474094e6dd8a
--- /dev/null
+++ b/cad/csxcad/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+- workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25358
+
+--- CMakeLists.txt.orig	2023-10-24 00:58:47 UTC
++++ CMakeLists.txt
+@@ -100,7 +100,7 @@ message(STATUS "TinyXML_LIBRARY: ${TinyXML_LIBRARY}")
+ 
+ INCLUDE_DIRECTORIES( ${TinyXML_INCLUDE_DIR} )
+ 
+-find_package(HDF5 1.8 COMPONENTS C HL REQUIRED)
++find_package(HDF5 COMPONENTS C HL REQUIRED)
+ INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS})
+ link_directories(${HDF5_LIBRARY_DIRS})
+ # hdf5 compat
diff --git a/cad/csxcad/files/patch-hdf5 b/cad/csxcad/files/patch-hdf5
deleted file mode 100644
index c4134ce21cd4..000000000000
--- a/cad/csxcad/files/patch-hdf5
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2022-07-01 18:43:14 UTC
-+++ CMakeLists.txt
-@@ -100,7 +100,8 @@ message(STATUS "TinyXML_LIBRARY: ${TinyXML_LIBRARY}")
- 
- INCLUDE_DIRECTORIES( ${TinyXML_INCLUDE_DIR} )
- 
--find_package(HDF5 1.8 COMPONENTS C HL REQUIRED)
-+set(HDF5_INCLUDE_DIRS "${LOCALBASE}/include")
-+set(HDF5_LIBRARY_DIRS "${LOCALBASE}/lib")
- INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS})
- link_directories(${HDF5_LIBRARY_DIRS})
- # hdf5 compat
diff --git a/cad/csxcad/pkg-plist b/cad/csxcad/pkg-plist
index 161dc802b08d..7f004c0374ad 100644
--- a/cad/csxcad/pkg-plist
+++ b/cad/csxcad/pkg-plist
@@ -39,7 +39,7 @@ include/CSXCAD/ParameterCoord.h
 include/CSXCAD/ParameterObjects.h
 lib/libCSXCAD.so
 lib/libCSXCAD.so.0
-lib/libCSXCAD.so.0.6.2
+lib/libCSXCAD.so.0.6.3
 share/CSXCAD/matlab/AddBox.m
 share/CSXCAD/matlab/AddConductingSheet.m
 share/CSXCAD/matlab/AddCurve.m