diff --git a/cad/csxcad/Makefile b/cad/csxcad/Makefile index eaffb8b1fa52..cb913cd8795a 100644 --- a/cad/csxcad/Makefile +++ b/cad/csxcad/Makefile @@ -1,38 +1,33 @@ PORTNAME= csxcad DISTVERSIONPREFIX= v -DISTVERSION= 0.6.2-109 -DISTVERSIONSUFFIX= -gcd9decb -PORTREVISION= 9 +DISTVERSION= 0.6.3 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org COMMENT= C++ library to describe geometrical objects WWW= https://github.com/thliebig/CSXCAD LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= cgal>0:math/cgal LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfparser-4.5.so:math/fparser \ 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 GH_ACCOUNT= thliebig GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS= -DFPARSER_ROOT_DIR=${LOCALBASE} \ -DVTK_DIR=${LOCALBASE}/lib/cmake/vtk-${VTK_VER} .include <../../math/vtk9/Makefile.version> .include 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 @@ -1,108 +1,108 @@ include/CSXCAD/CSBackgroundMaterial.h include/CSXCAD/CSFunctionParser.h include/CSXCAD/CSPrimBox.h include/CSXCAD/CSPrimCurve.h include/CSXCAD/CSPrimCylinder.h include/CSXCAD/CSPrimCylindricalShell.h include/CSXCAD/CSPrimLinPoly.h include/CSXCAD/CSPrimMultiBox.h include/CSXCAD/CSPrimPoint.h include/CSXCAD/CSPrimPolygon.h include/CSXCAD/CSPrimPolyhedron.h include/CSXCAD/CSPrimPolyhedronReader.h include/CSXCAD/CSPrimRotPoly.h include/CSXCAD/CSPrimSphere.h include/CSXCAD/CSPrimSphericalShell.h include/CSXCAD/CSPrimUserDefined.h include/CSXCAD/CSPrimWire.h include/CSXCAD/CSPrimitives.h include/CSXCAD/CSPropConductingSheet.h include/CSXCAD/CSPropDebyeMaterial.h include/CSXCAD/CSPropDiscMaterial.h include/CSXCAD/CSPropDispersiveMaterial.h include/CSXCAD/CSPropDumpBox.h include/CSXCAD/CSPropExcitation.h include/CSXCAD/CSPropLorentzMaterial.h include/CSXCAD/CSPropLumpedElement.h include/CSXCAD/CSPropMaterial.h include/CSXCAD/CSPropMetal.h include/CSXCAD/CSPropProbeBox.h include/CSXCAD/CSPropResBox.h include/CSXCAD/CSPropUnknown.h include/CSXCAD/CSProperties.h include/CSXCAD/CSRectGrid.h include/CSXCAD/CSTransform.h include/CSXCAD/CSUseful.h include/CSXCAD/CSXCAD_Global.h include/CSXCAD/ContinuousStructure.h 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 share/CSXCAD/matlab/AddCylinder.m share/CSXCAD/matlab/AddCylindricalShell.m share/CSXCAD/matlab/AddDebyeMaterial.m share/CSXCAD/matlab/AddDiscMaterial.m share/CSXCAD/matlab/AddDump.m share/CSXCAD/matlab/AddExcitation.m share/CSXCAD/matlab/AddLinPoly.m share/CSXCAD/matlab/AddLorentzMaterial.m share/CSXCAD/matlab/AddLumpedElement.m share/CSXCAD/matlab/AddMaterial.m share/CSXCAD/matlab/AddMetal.m share/CSXCAD/matlab/AddPlaneWaveExcite.m share/CSXCAD/matlab/AddPoint.m share/CSXCAD/matlab/AddPolygon.m share/CSXCAD/matlab/AddPolyhedron.m share/CSXCAD/matlab/AddProbe.m share/CSXCAD/matlab/AddPropAttribute.m share/CSXCAD/matlab/AddRotPoly.m share/CSXCAD/matlab/AddSphere.m share/CSXCAD/matlab/AddSphericalShell.m share/CSXCAD/matlab/AddWire.m share/CSXCAD/matlab/AnalyseMesh.m share/CSXCAD/matlab/AutoSmoothMeshLines.m share/CSXCAD/matlab/CSXGeomPlot.m share/CSXCAD/matlab/CalcDebyeMaterial.m share/CSXCAD/matlab/CalcDrudeMaterial.m share/CSXCAD/matlab/CalcLorentzMaterial.m share/CSXCAD/matlab/CheckMesh.m share/CSXCAD/matlab/Convert_VF_DiscMaterial.m share/CSXCAD/matlab/CreateDiscMaterial.m share/CSXCAD/matlab/DefineRectGrid.m share/CSXCAD/matlab/DetectEdges.m share/CSXCAD/matlab/DirChar2Int.m share/CSXCAD/matlab/ImportPLY.m share/CSXCAD/matlab/ImportSTL.m share/CSXCAD/matlab/InitCSX.m share/CSXCAD/matlab/RecursiveSmoothMesh.m share/CSXCAD/matlab/SetBackgroundMaterial.m share/CSXCAD/matlab/SetExcitationWeight.m share/CSXCAD/matlab/SetMaterialProperty.m share/CSXCAD/matlab/SetMaterialWeight.m share/CSXCAD/matlab/SmoothMesh.m share/CSXCAD/matlab/SmoothMeshLines.m share/CSXCAD/matlab/SmoothMeshLines2.m share/CSXCAD/matlab/export_empire.m share/CSXCAD/matlab/export_excellon.m share/CSXCAD/matlab/export_gerber.m share/CSXCAD/matlab/export_povray.m share/CSXCAD/matlab/isOctave.m share/CSXCAD/matlab/private/Add2Property.m share/CSXCAD/matlab/private/AddPrimitiveArgs.m share/CSXCAD/matlab/private/AddProperty.m share/CSXCAD/matlab/private/CheckSymmtricLines.m share/CSXCAD/matlab/private/FindProperty.m share/CSXCAD/matlab/private/GetPropertyPosition.m share/CSXCAD/matlab/private/GetPropertyType.m share/CSXCAD/matlab/private/SetPropertyArgs.m share/CSXCAD/matlab/private/SmoothRange.m share/CSXCAD/matlab/private/octave_struct2xml_2.m share/CSXCAD/matlab/private/struct_2_xmlNode.m share/CSXCAD/matlab/private/vector2str.m share/CSXCAD/matlab/searchBinary.m share/CSXCAD/matlab/struct_2_xml.m