Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Jul 2020 09:49:03 +0000 (UTC)
From:      =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r543850 - in head/science/elmerfem: . files
Message-ID:  <202007310949.06V9n3hO071883@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fernape
Date: Fri Jul 31 09:49:03 2020
New Revision: 543850
URL: https://svnweb.freebsd.org/changeset/ports/543850

Log:
  science/elmerfem: Update to 8.4.20200708 and fix dependencies
  
  * Update to commit 679a882b on the devel branch (after elmerice merge + fixes)
  * Removed DISTVERSIONPREFIX; we use the devel branch now, not official releases
  * Removed Tcl dependency; this was only used for ElmerPost, which is obsolete
  * Moved lots of library dependencies that were only needed for OpenCASCADE
  * Added OCC option for OpenCASCADE dependency; on by default.
  * Fixed indirect dependencies (Python 2.7 -> 3.7 and VTK 6.2 -> 8.2)
  * Moved WITH_QT5 and QT_FOUND to GUI_CMAKE_ON to avoid CMake warnings
  * Added QT5_LIBS to avoid lines longer than 80 characters in the Makefile
  * Removed the partial f02cb33a patch file, which is no longer needed
  * Removed the last sentence in pkg-descr (written for science/elmerfem-devel)
  * Added HelmholtzProjection.so and SpringAssembly.so to pkg-plist
  
  PR:	248246
  Submitted by:	henrik@gulbra.net (maintainer)

Deleted:
  head/science/elmerfem/files/patch-git-f02cb33acd59a32c41fe9f67367155e271c22ae8
Modified:
  head/science/elmerfem/Makefile
  head/science/elmerfem/distinfo
  head/science/elmerfem/files/patch-CMakeLists.txt
  head/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
  head/science/elmerfem/pkg-descr
  head/science/elmerfem/pkg-plist

Modified: head/science/elmerfem/Makefile
==============================================================================
--- head/science/elmerfem/Makefile	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/Makefile	Fri Jul 31 09:49:03 2020	(r543850)
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	elmerfem
-PORTVERSION=	8.4.20200309
-PORTREVISION=	1
-DISTVERSIONPREFIX=	release-
+PORTVERSION=	8.4.20200708
 CATEGORIES=	science
 
 MAINTAINER=	henrik@gulbra.net
@@ -17,10 +15,10 @@ LIB_DEPENDS=	libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
 		libparpack.so:math/arpack-ng
 
-USES=		cmake compiler:c++11-lang fortran tcl
+USES=		cmake compiler:c++11-lang fortran
 USE_GITHUB=	yes
 GH_ACCOUNT=	ElmerCSC
-GH_TAGNAME=	39f692c
+GH_TAGNAME=	679a882b
 USE_LDCONFIG=	${PREFIX}/lib/elmersolver
 
 ALL_TARGET=	# empty
@@ -35,25 +33,36 @@ CMAKE_ARGS+=	-DHAVE_INTTYPES_H=ON
 CMAKE_ARGS+=	-Wno-dev
 .endif
 
-OPTIONS_DEFINE=		GUI
-OPTIONS_DEFAULT=	GUI
+OPTIONS_DEFINE=		GUI OCC
+OPTIONS_DEFAULT=	GUI OCC
 OPTIONS_SUB=		yes
+OCC_IMPLIES=		GUI
 
-GUI_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
+GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
+GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
+GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
+			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
+			-DDESIRED_QT_VERSION=5 \
+			-DWITH_QT5:BOOL=TRUE \
+			-DQT_FOUND:BOOL=TRUE
+GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
+GUI_USES=		gl jpeg qt:5 xorg
+GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${QT5_LIBS:ts,}
+
+OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
+OCC_CMAKE_BOOL=		WITH_OCC
+OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
+OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
 			libfreetype.so:print/freetype2 \
 			libpng16.so:graphics/png \
-			libpython2.7.so:lang/python27 \
-			libqwt6.so:x11-toolkits/qwt6 \
+			libpython3.7m.so:lang/python37 \
 			libtiff.so:graphics/tiff \
-			libvtksys-6.2.so:math/vtk6
-GUI_USES=		gl jpeg qt:5 xorg
-GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt \
-			qt=buildtools_build,concurrent,core,declarative,gui,location,network,opengl,printsupport,qmake_build,script,sensors,sql,svg,webchannel,webkit,widgets,xml
+			libTKernel.so:cad/opencascade \
+			libvtksys-8.2.so:math/vtk8
 
-GUI_CMAKE_BOOL=	WITH_ELMERGUI WITH_PARAVIEW WITH_QT5 QT_FOUND # WITH_OCC requires the QVTKWidget.h that is only provided by the math/vtk6 with QT5=yes
-GUI_CMAKE_ON=	-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
-		-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
-		-DDESIRED_QT_VERSION=5
+QT5_LIBS=	buildtools_build concurrent core declarative gui location \
+		network opengl printsupport qmake_build script sensors \
+		sql svg webchannel webkit widgets xml
 
 .include <bsd.port.pre.mk>
 
@@ -69,11 +78,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
 		${WRKSRC}/elmergrid/src/femelmer.c
 
-post-patch-GUI-on:
-	#@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
-	#	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
-	#@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
-	#	"${WRKSRC}/cmake/Modules/FindOCE.cmake"
+post-patch-OCC-on:
+	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
+		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
+	@${REINPLACE_CMD} -e 's|$${INCLUDE}|${LOCALBASE}/include/OpenCASCADE|' \
+		"${WRKSRC}/cmake/Modules/FindOCE.cmake"
 
 post-install:
 	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver

Modified: head/science/elmerfem/distinfo
==============================================================================
--- head/science/elmerfem/distinfo	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/distinfo	Fri Jul 31 09:49:03 2020	(r543850)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583810165
-SHA256 (ElmerCSC-elmerfem-release-8.4.20200309-39f692c_GH0.tar.gz) = ac47ad284120077fdb453d7ef2be849b194bedf756bcb5f08fcb46960393ee67
-SIZE (ElmerCSC-elmerfem-release-8.4.20200309-39f692c_GH0.tar.gz) = 59972679
+TIMESTAMP = 1595166083
+SHA256 (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 13c8b9a4af76ae8fc6b6fcff612572e671ac31cffe070bbef7ace740e4044f1d
+SIZE (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 63393434

Modified: head/science/elmerfem/files/patch-CMakeLists.txt
==============================================================================
--- head/science/elmerfem/files/patch-CMakeLists.txt	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/files/patch-CMakeLists.txt	Fri Jul 31 09:49:03 2020	(r543850)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-05-19 12:19:26 UTC
+--- CMakeLists.txt.orig	2020-06-26 12:18:06 UTC
 +++ CMakeLists.txt
-@@ -264,7 +264,7 @@ ADD_SUBDIRECTORY(umfpack)
+@@ -470,7 +470,7 @@ ADD_SUBDIRECTORY(umfpack)
  ADD_SUBDIRECTORY(fhutiter)
  ADD_SUBDIRECTORY(meshgen2d)
  ADD_SUBDIRECTORY(fem)

Modified: head/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp
==============================================================================
--- head/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/files/patch-ElmerGUI_Application_cad_cadview.cpp	Fri Jul 31 09:49:03 2020	(r543850)
@@ -1,11 +1,11 @@
---- ElmerGUI/Application/cad/cadview.cpp.orig	2020-03-06 10:30:22 UTC
+--- ElmerGUI/Application/cad/cadview.cpp.orig	2020-06-26 12:18:06 UTC
 +++ ElmerGUI/Application/cad/cadview.cpp
-@@ -69,7 +69,7 @@
- #include <TopoDS_Shape.hxx>
- #include <BRepTools.hxx>
- #include <TopTools_HSequenceOfShape.hxx>
+@@ -74,7 +74,7 @@
+ #include <BRepAdaptor_Curve2d.hxx>
+ #include <BRepBndLib.hxx>
+ #include <BRepGProp.hxx>
 -#include <BRepMesh.hxx>
 +#include <BRepMesh_IncrementalMesh.hxx>
- #include <TopExp_Explorer.hxx>
- #include <TopoDS_Face.hxx>
- #include <TopoDS.hxx>
+ #include <BRepTools.hxx>
+ #include <BRep_Builder.hxx>
+ #include <BRep_Tool.hxx>

Modified: head/science/elmerfem/pkg-descr
==============================================================================
--- head/science/elmerfem/pkg-descr	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/pkg-descr	Fri Jul 31 09:49:03 2020	(r543850)
@@ -7,7 +7,4 @@ New solvers can be added as separate modules linked in
 While Elmer is powerful, it is not for the faint of heart. New users
 can expect to spend days or weeks honing their skills in one domain.
 
-This port is a development version of Elmer, which may or may not be
-better suited to your needs than the latest official release.
-
 WWW: https://www.csc.fi/web/elmer

Modified: head/science/elmerfem/pkg-plist
==============================================================================
--- head/science/elmerfem/pkg-plist	Fri Jul 31 09:36:23 2020	(r543849)
+++ head/science/elmerfem/pkg-plist	Fri Jul 31 09:49:03 2020	(r543850)
@@ -357,6 +357,7 @@ share/elmersolver/lib/HarmonicSignals.so
 share/elmersolver/lib/HeatSolve.so
 share/elmersolver/lib/HeatSolveVec.so
 share/elmersolver/lib/HelmholtzBEM.so
+share/elmersolver/lib/HelmholtzProjection.so
 share/elmersolver/lib/HelmholtzSolve.so
 share/elmersolver/lib/IncompressibleNSVec.so
 share/elmersolver/lib/Isosurface.so
@@ -408,6 +409,7 @@ share/elmersolver/lib/ShearrateSolver.so
 share/elmersolver/lib/ShellSolver.so
 share/elmersolver/lib/Smitc.so
 share/elmersolver/lib/Spalart-Allmaras.so
+share/elmersolver/lib/SpringAssembly.so
 share/elmersolver/lib/StatCurrentSolve.so
 share/elmersolver/lib/StatCurrentSolveVec.so
 share/elmersolver/lib/StatElecBoundary.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007310949.06V9n3hO071883>