Upgrade to v6.0.2.

3 files changed, 20 insertions, 12 deletions

diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index 0af78afcaf48..20f435b1cb64 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	code_saturne
-PORTVERSION=	6.0.1
+PORTVERSION=	6.0.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -13,6 +12,7 @@ COMMENT=	EDF's general purpose Computational Fluid Dynamics (CFD) software
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libcgns.so:science/cgnslib	\
 		libhdf5.so:science/hdf5		\
@@ -35,6 +35,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
 		--without-salome-gui
+CONFIGURE_ENV=	ac_cv_path_SED=${LOCALBASE}/bin/gsed
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
@@ -58,6 +59,8 @@ PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
 PARMETIS_CONFIGURE_ENV=	LIBS=-lexecinfo
 
+CGNS2FIX=	preprocessor/pre-post/ecs_pre_cgns.c src/fvm/fvm_to_cgns.c
+
 TEST_TARGET=	check
 
 .if defined(PACKAGE_BUILDING)
@@ -99,6 +102,9 @@ pre-configure:
 		-o ${WRKSRC}/src/mei/mei_parser.c ${WRKSRC}/src/mei/mei_parser.y
 	${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|'	\
 		${WRKSRC}/Makefile.am
+.for f in ${CGNS2FIX}
+	${REINPLACE_CMD} -e 's|3400|3402|' ${WRKSRC}/${f}
+.endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/science/code_saturne/distinfo b/science/code_saturne/distinfo
index 8acb4c953604..cc771d167f73 100644
--- a/science/code_saturne/distinfo
+++ b/science/code_saturne/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578743688
-SHA256 (code-saturne-code_saturne-v6.0.1_GH0.tar.gz) = e6d140150c6533cf01e46257ab268f96ca9f9f57c50b514207583f93dddaf402
-SIZE (code-saturne-code_saturne-v6.0.1_GH0.tar.gz) = 19035551
+TIMESTAMP = 1581884825
+SHA256 (code-saturne-code_saturne-v6.0.2_GH0.tar.gz) = 88a8c88e949bbcd878e2511917edd976a1306235aeab0394bee3162754c4128e
+SIZE (code-saturne-code_saturne-v6.0.2_GH0.tar.gz) = 19033062
diff --git a/science/code_saturne/pkg-plist b/science/code_saturne/pkg-plist
index 58e86bd94989..b1a2ace2c572 100644
--- a/science/code_saturne/pkg-plist
+++ b/science/code_saturne/pkg-plist
@@ -1543,14 +1543,15 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user/usvosy.f90
 %%DATADIR%%/user_examples/cs_user_1d_wall_thermal.c
 %%DATADIR%%/user_examples/cs_user_atmospheric_model.f90
+%%DATADIR%%/user_examples/cs_user_boundary_conditions_ale-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-advanced.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-atmospheric.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-auto_inlet_profile.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-compressible.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-cooling_towers.f90
-%%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs_ieljou_3_or_4.c
+%%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-fuel.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-gas_3ptchem.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-gas_ebu.f90
@@ -1558,10 +1559,9 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-mapped_inlet.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-medcoupling_remapper_2d.c
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-notebook.c
-%%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal_lagrangian.f90
+%%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-richards.f90
-%%DATADIR%%/user_examples/cs_user_boundary_conditions_ale-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_mass_source_terms-condensation.f90
 %%DATADIR%%/user_examples/cs_user_boundary_mass_source_terms-nzones_condensation.f90
 %%DATADIR%%/user_examples/cs_user_coupling-saturne.c
@@ -1578,6 +1578,7 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_extra_operations-scalar_balance.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-turbomachinery.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-verif_cdo_diffusion.c
+%%DATADIR%%/user_examples/cs_user_extra_operations-vorticity_field.c
 %%DATADIR%%/user_examples/cs_user_fluid_structure_interaction.f90
 %%DATADIR%%/user_examples/cs_user_gwf-example.c
 %%DATADIR%%/user_examples/cs_user_head_losses.c
@@ -1635,12 +1636,13 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_postprocess-profiles.c
 %%DATADIR%%/user_examples/cs_user_postprocess-sfc.c
 %%DATADIR%%/user_examples/cs_user_postprocess.c
-%%DATADIR%%/user_examples/cs_user_radiative_transfer.c
 %%DATADIR%%/user_examples/cs_user_radiative_transfer_bcs.c
+%%DATADIR%%/user_examples/cs_user_radiative_transfer.c
 %%DATADIR%%/user_examples/cs_user_solver-heat-equation.c
-%%DATADIR%%/user_examples/cs_user_source_terms-richards.f90
-%%DATADIR%%/user_examples/cs_user_source_terms-scalar_in_a_channel.f90
-%%DATADIR%%/user_examples/cs_user_source_terms.f90
+%%DATADIR%%/user_examples/cs_user_source_terms-base.c
+%%DATADIR%%/user_examples/cs_user_source_terms-richards.c
+%%DATADIR%%/user_examples/cs_user_source_terms-scalar_in_a_channel.c
+%%DATADIR%%/user_examples/cs_user_source_terms-turbulence.c
 %%DATADIR%%/user_examples/cs_user_turbomachinery.c
 %%DATADIR%%/user_examples/cs_user_zones.c
 %%DATADIR%%/user_examples/usatch_4spe5reac.f90