View | Details | Raw Unified | Return to bug 258784 | Differences between
and this patch

Collapse All | Expand All

(-)b/science/elmerfem/Makefile (-15 / +21 lines)
Lines 1-8 Link Here
1
# Created by: Pedro Giffuni
1
# Created by: Pedro Giffuni
2
2
3
PORTNAME=	elmerfem
3
PORTNAME=	elmerfem
4
PORTVERSION=	8.4.20200708
4
PORTVERSION=	9.0
5
PORTREVISION=	2
6
CATEGORIES=	science
5
CATEGORIES=	science
7
6
8
MAINTAINER=	henrik@gulbra.net
7
MAINTAINER=	henrik@gulbra.net
Lines 18-32 LIB_DEPENDS= libmetis.so:math/metis \ Link Here
18
USES=		cmake compiler:c++11-lang fortran
17
USES=		cmake compiler:c++11-lang fortran
19
USE_GITHUB=	yes
18
USE_GITHUB=	yes
20
GH_ACCOUNT=	ElmerCSC
19
GH_ACCOUNT=	ElmerCSC
21
GH_TAGNAME=	679a882b
20
GH_TAGNAME=	93526348
22
USE_LDCONFIG=	${PREFIX}/lib/elmersolver
21
USE_LDCONFIG=	${PREFIX}/lib/elmersolver
23
22
24
ALL_TARGET=	# empty
25
26
CMAKE_ARGS=	-DELMER_FEM_REVISION:STRING=${GH_TAGNAME}
23
CMAKE_ARGS=	-DELMER_FEM_REVISION:STRING=${GH_TAGNAME}
27
24
25
ALL_TARGET=	# empty
26
28
LDFLAGS+=	-L${LOCALBASE}/lib
27
LDFLAGS+=	-L${LOCALBASE}/lib
29
FCPPFLAGS+=	-ansi
28
29
PORTSCOUT=	limit:^release-[1-9]
30
30
31
CMAKE_ARGS+=	-DHAVE_INTTYPES_H=ON
31
CMAKE_ARGS+=	-DHAVE_INTTYPES_H=ON
32
.if !defined(MAINTAINER_MODE)
32
.if !defined(MAINTAINER_MODE)
Lines 36-57 CMAKE_ARGS+= -Wno-dev Link Here
36
OPTIONS_DEFINE=		GUI OCC
36
OPTIONS_DEFINE=		GUI OCC
37
OPTIONS_DEFAULT=	GUI OCC
37
OPTIONS_DEFAULT=	GUI OCC
38
OPTIONS_SUB=		yes
38
OPTIONS_SUB=		yes
39
OCC_IMPLIES=		GUI
40
39
41
GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
40
GUI_DESC=		Build with ElmerGUI (Graphical User Interface)
41
OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
42
43
GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
44
GUI_USES=		gl jpeg qt:5 xorg
45
GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${_QT5_LIBS:ts,}
42
GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
46
GUI_CMAKE_BOOL=		WITH_ELMERGUI WITH_PARAVIEW
43
GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
47
GUI_CMAKE_ON=		-DQWT_LIBRARY=${QT_LIBDIR}/libqwt6.so \
44
			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
48
			-DQWT_INCLUDE_DIR=${QT_INCDIR}/qwt6 \
45
			-DDESIRED_QT_VERSION=5 \
49
			-DDESIRED_QT_VERSION=5 \
46
			-DWITH_QT5:BOOL=TRUE \
50
			-DWITH_QT5:BOOL=TRUE \
47
			-DQT_FOUND:BOOL=TRUE
51
			-DQT_FOUND:BOOL=TRUE
48
GUI_LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6
49
GUI_USES=		gl jpeg qt:5 xorg
50
GUI_USE=		gl=gl,glu xorg=ice,sm,x11,xext,xt qt=${QT5_LIBS:ts,}
51
52
52
OCC_DESC=		Use OpenCASCADE for CAD import in ElmerGUI
53
OCC_IMPLIES=		GUI
53
OCC_CMAKE_BOOL=		WITH_OCC
54
OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
55
OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
54
OCC_LIB_DEPENDS=	libexpat.so:textproc/expat2 \
56
			libfreetype.so:print/freetype2 \
55
			libfreetype.so:print/freetype2 \
57
			libpng.so:graphics/png \
56
			libpng.so:graphics/png \
Lines 59-66 OCC_LIB_DEPENDS= libexpat.so:textproc/expat2 \ Link Here
59
			libtiff.so:graphics/tiff \
58
			libtiff.so:graphics/tiff \
60
			libTKernel.so:cad/opencascade \
59
			libTKernel.so:cad/opencascade \
61
			libvtksys-8.2.so:math/vtk8
60
			libvtksys-8.2.so:math/vtk8
61
OCC_CMAKE_BOOL=		WITH_OCC
62
OCC_CMAKE_ON=		-DVTK_DIR=${LOCALBASE}/lib/vtk-8.2/cmake/vtk-8.2
62
63
63
QT5_LIBS=	buildtools_build concurrent core declarative gui location \
64
_LIBSTAGEDIR=	${STAGEDIR}/${PREFIX}/lib/elmersolver
65
_QT5_LIBS=	buildtools_build concurrent core declarative gui location \
64
		network opengl printsupport qmake_build script sensors \
66
		network opengl printsupport qmake_build script sensors \
65
		sql svg webchannel webkit widgets xml
67
		sql svg webchannel webkit widgets xml
66
68
Lines 82-88 FFLAGS+= -fallow-argument-mismatch Link Here
82
post-patch:
84
post-patch:
83
	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
85
	@${RM} -r ${WRKSRC}/elmergrid/src/metis-5.1.0
84
	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
86
	@${REINPLACE_CMD} -e 's,"metis.*/metis\.h",<metis.h>,' \
85
		${WRKSRC}/elmergrid/src/femelmer.c
87
		${WRKSRC}/elmergrid/src/egparallel.c
86
88
87
post-patch-OCC-on:
89
post-patch-OCC-on:
88
	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
90
	@${REINPLACE_CMD} -e "s|\$${VERSION}|`${PKG_QUERY} '%v' opencascade`|" \
Lines 92-97 post-patch-OCC-on: Link Here
92
94
93
post-install:
95
post-install:
94
	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
96
	${LN} -sf ElmerSolver_mpi ${STAGEDIR}${PREFIX}/bin/ElmerSolver
97
	${LN} -sf libelmersolver.so ${_LIBSTAGEDIR}/libelmersolver.so.0
98
	${LN} -sf libfhuti.so ${_LIBSTAGEDIR}/libfhuti.so.0
99
	${LN} -sf libmatc.so ${_LIBSTAGEDIR}/libmatc.so.0
100
	${LN} -sf libmpi_stubs.so ${_LIBSTAGEDIR}/libmpi_stubs.so.0
95
	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
101
	@${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/ElmerGrid
96
102
97
do-test:
103
do-test:
(-)b/science/elmerfem/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1595166083
1
TIMESTAMP = 1631111260
2
SHA256 (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 13c8b9a4af76ae8fc6b6fcff612572e671ac31cffe070bbef7ace740e4044f1d
2
SHA256 (ElmerCSC-elmerfem-9.0-93526348_GH0.tar.gz) = 0af96b1ae455513739b752ebc9b1e36be12da2ad195e3cafb761cdd4a6ec056c
3
SIZE (ElmerCSC-elmerfem-8.4.20200708-679a882b_GH0.tar.gz) = 63393434
3
SIZE (ElmerCSC-elmerfem-9.0-93526348_GH0.tar.gz) = 64050416
(-)b/science/elmerfem/files/patch-CMakeLists.txt (-2 / +2 lines)
Lines 1-6 Link Here
1
--- CMakeLists.txt.orig	2020-06-26 12:18:06 UTC
1
--- CMakeLists.txt.orig	2020-11-10 19:52:44 UTC
2
+++ CMakeLists.txt
2
+++ CMakeLists.txt
3
@@ -470,7 +470,7 @@ ADD_SUBDIRECTORY(umfpack)
3
@@ -506,7 +506,7 @@ ADD_SUBDIRECTORY(umfpack)
4
 ADD_SUBDIRECTORY(fhutiter)
4
 ADD_SUBDIRECTORY(fhutiter)
5
 ADD_SUBDIRECTORY(meshgen2d)
5
 ADD_SUBDIRECTORY(meshgen2d)
6
 ADD_SUBDIRECTORY(fem)
6
 ADD_SUBDIRECTORY(fem)
(-)b/science/elmerfem/files/patch-elmergrid_src_CMakeLists.txt (-6 / +6 lines)
Lines 1-4 Link Here
1
--- elmergrid/src/CMakeLists.txt.orig	2020-03-06 10:30:22 UTC
1
--- elmergrid/src/CMakeLists.txt.orig	2020-11-10 19:52:44 UTC
2
+++ elmergrid/src/CMakeLists.txt
2
+++ elmergrid/src/CMakeLists.txt
3
@@ -12,19 +12,13 @@ IF(CMAKE_CROSSCOMPILING)
3
@@ -12,19 +12,13 @@ IF(CMAKE_CROSSCOMPILING)
4
   ENDIF()
4
   ENDIF()
Lines 8-18 Link Here
8
-SET(METIS_INSTALL FALSE CACHE BOOL "")
8
-SET(METIS_INSTALL FALSE CACHE BOOL "")
9
-ADD_SUBDIRECTORY(metis-5.1.0)
9
-ADD_SUBDIRECTORY(metis-5.1.0)
10
-
10
-
11
 SET(elmergrid_SRCS common.h femdef.h femelmer.h femfilein.h
11
 SET(elmergrid_SRCS egdef.h egparallel.h egnative.h egconvert.h
12
   femfileout.h feminfo.h femknot.h femmesh.h 
12
   egexport.h egextra.h egmesh.h 
13
   femtypes.h nrutil.h common.c femelmer.c femfilein.c femfileout.c
13
   egtypes.h egutils.h egparallel.c egnative.c egconvert.c egexport.c
14
   feminfo.c femknot.c femmesh.c fempre.c 
14
   egextra.c egmesh.c fempre.c 
15
   nrutil.c)
15
   egutils.c)
16
 
16
 
17
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/metis)
17
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/metis)
18
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
18
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
(-)b/science/elmerfem/pkg-plist (+8 lines)
Lines 12-20 bin/matc Link Here
12
lib/elmersolver/libamd.a
12
lib/elmersolver/libamd.a
13
lib/elmersolver/libamdf77.a
13
lib/elmersolver/libamdf77.a
14
lib/elmersolver/libelmersolver.so
14
lib/elmersolver/libelmersolver.so
15
lib/elmersolver/libelmersolver.so.0
15
lib/elmersolver/libfhuti.so
16
lib/elmersolver/libfhuti.so
17
lib/elmersolver/libfhuti.so.0
16
lib/elmersolver/libmatc.so
18
lib/elmersolver/libmatc.so
19
lib/elmersolver/libmatc.so.0
17
lib/elmersolver/libmpi_stubs.so
20
lib/elmersolver/libmpi_stubs.so
21
lib/elmersolver/libmpi_stubs.so.0
18
lib/elmersolver/libumfpack.a
22
lib/elmersolver/libumfpack.a
19
%%GUI%%share/ElmerGUI/edf-extra/advection-diffusion.xml
23
%%GUI%%share/ElmerGUI/edf-extra/advection-diffusion.xml
20
%%GUI%%share/ElmerGUI/edf-extra/divergencesolver.xml
24
%%GUI%%share/ElmerGUI/edf-extra/divergencesolver.xml
Lines 292-298 share/elmersolver/include/pelementmaps.mod Link Here
292
share/elmersolver/include/porousmaterials.mod
296
share/elmersolver/include/porousmaterials.mod
293
share/elmersolver/include/radiation.mod
297
share/elmersolver/include/radiation.mod
294
share/elmersolver/include/radiationfactorglobals.mod
298
share/elmersolver/include/radiationfactorglobals.mod
299
share/elmersolver/include/saveutils.mod
295
share/elmersolver/include/smoothers.mod
300
share/elmersolver/include/smoothers.mod
301
share/elmersolver/include/solidmechanicsutils.mod
296
share/elmersolver/include/solverutils.mod
302
share/elmersolver/include/solverutils.mod
297
share/elmersolver/include/sparitercomm.mod
303
share/elmersolver/include/sparitercomm.mod
298
share/elmersolver/include/spariterglobals.mod
304
share/elmersolver/include/spariterglobals.mod
Lines 353-358 share/elmersolver/lib/FluxSolver.so Link Here
353
share/elmersolver/lib/FourierLoss.so
359
share/elmersolver/lib/FourierLoss.so
354
share/elmersolver/lib/FreeSurfaceReduced.so
360
share/elmersolver/lib/FreeSurfaceReduced.so
355
share/elmersolver/lib/FreeSurfaceSolver.so
361
share/elmersolver/lib/FreeSurfaceSolver.so
362
share/elmersolver/lib/GmshOutputReader.so
356
share/elmersolver/lib/HarmonicSignals.so
363
share/elmersolver/lib/HarmonicSignals.so
357
share/elmersolver/lib/HeatSolve.so
364
share/elmersolver/lib/HeatSolve.so
358
share/elmersolver/lib/HeatSolveVec.so
365
share/elmersolver/lib/HeatSolveVec.so
Lines 369-374 share/elmersolver/lib/MagnetoDynamics.so Link Here
369
share/elmersolver/lib/MagnetoDynamics2D.so
376
share/elmersolver/lib/MagnetoDynamics2D.so
370
share/elmersolver/lib/MarchingODESolver.so
377
share/elmersolver/lib/MarchingODESolver.so
371
share/elmersolver/lib/Mesh2MeshSolver.so
378
share/elmersolver/lib/Mesh2MeshSolver.so
379
share/elmersolver/lib/MeshChecksum.so
372
share/elmersolver/lib/MeshSolve.so
380
share/elmersolver/lib/MeshSolve.so
373
share/elmersolver/lib/ModelMixedPoisson.so
381
share/elmersolver/lib/ModelMixedPoisson.so
374
share/elmersolver/lib/ModelPDE.so
382
share/elmersolver/lib/ModelPDE.so

Return to bug 258784