Upgrade to 6.0.1.

Changelog at <https://github.com/code-saturne/code_saturne/blob/v6.0/NEWS.md>.

science/code_saturne/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	code_saturne
-PORTVERSION=	5.3.3
-PORTREVISION=	2
+PORTVERSION=	6.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	science parallel
 
@@ -18,7 +17,8 @@ LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo	\
 		libhdf5.so:science/hdf5		\
 		libomp.so:devel/openmp		\
 		libmedC.so:french/med
-RUN_DEPENDS=	xmgrace:math/grace	\
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}	\
+		xmgrace:math/grace	\
 		bash:shells/bash	\
 		xterm:x11/xterm
 
@@ -33,17 +33,20 @@ USE_PYQT=	core gui sip widgets xml_build
 SHEBANG_FILES=	install_saturne.py tests/unittests.py bin/*.py build-aux/*.py
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-salome --without-salome-yacs --without-salome-kernel	\
+		--without-salome-gui
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python=${PYTHON_CMD} \
 		pyrcc5=pyrcc5-${PYTHON_VER} \
 		pyuic5=pyuic5-${PYTHON_VER}
 
-OPTIONS_DEFINE=		DOCS EXAMPLES ATLAS BATCH MPI
-OPTIONS_DEFAULT=	BATCH MPI METIS
+OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS MPI
+OPTIONS_DEFAULT=	BATCH BLAS MPI METIS
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
-ATLAS_USES=		blaslapack:atlas
-ATLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-type=ATLAS
+BLAS_USES=		blaslapack
+BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-type=BLAS
+BLAS_LIB_DEPENDS=	libcblas.so:math/cblas
 BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich

science/code_saturne/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1557393862
-SHA256 (code-saturne-code_saturne-v5.3.3_GH0.tar.gz) = cbac0ae64551178ce0b4ac6bcc5cc6c6be007d054540263bc4df4794c56ca878
-SIZE (code-saturne-code_saturne-v5.3.3_GH0.tar.gz) = 18878277
+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

science/code_saturne/files/patch-m4_cs__blas.m4

@@ -0,0 +1,11 @@
+--- m4/cs_blas.m4.orig	2019-12-23 11:17:00 UTC
++++ m4/cs_blas.m4
+@@ -346,7 +346,7 @@ if test "x$with_blas" != "xno" ; then
+     if test "x$with_blas_libs" != "x" ; then
+       BLAS_LIBS="$with_blas_libs"
+     else
+-      BLAS_LIBS="-lblas"
++      BLAS_LIBS="-lcblas -lblas"
+     fi
+ 
+     CPPFLAGS="${saved_CPPFLAGS} ${BLAS_CPPFLAGS}"

science/code_saturne/files/patch-m4_cs__omniorb.m4

@@ -0,0 +1,11 @@
+--- m4/cs_omniorb.m4.orig	2019-12-23 11:17:00 UTC
++++ m4/cs_omniorb.m4
+@@ -221,7 +221,7 @@ then
+   OMNIORB_IDLPYFLAGS_1='-bpython -nf '
+   OMNIORB_IDLPYFLAGS_2=" -I${OMNIORB_ROOT}/idl"
+   OMNIORB_IDLPYFLAGS=${OMNIORB_IDLPYFLAGS_1}${OMNIORB_IDLPYFLAGS_2}
+-  for p in `cut -d: -f 1- --output-delimiter=$'\n' <<<"$PYTHONPATH"`; do
++  for p in `echo "$PYTHONPATH" | tr ':' $'\n'`; do
+     if test -f $p/omniidl_be/python.py; then
+       OMNIORB_IDLPYFLAGS="${OMNIORB_IDLPYFLAGS} -p ${p}"
+     fi

science/code_saturne/files/patch-m4_cs__salome.m4

@@ -0,0 +1,23 @@
+--- m4/cs_salome.m4.orig	2019-12-23 11:17:00 UTC
++++ m4/cs_salome.m4
+@@ -167,16 +167,16 @@ AC_LANG_SAVE
+ 
+ omniORB_ok=no # in case following test is not called
+ 
+-AS_IF([test $cs_have_salome_kernel = yes -o $cs_have_salome_gui = yes],
++AS_IF([test "x$cs_have_salome_kernel" = "xyes" -o "x$cs_have_salome_gui" = "xyes"],
+       [CS_AC_TEST_OMNIORB
+        CS_AC_TEST_CORBA])
+ 
+ AC_LANG_RESTORE
+ 
+ AM_CONDITIONAL(HAVE_SALOME,
+-               test $cs_have_salome_kernel = yes \
+-                 -a $cs_have_salome_gui = yes \
+-                 -a $omniORB_ok = yes)
++               test x$cs_have_salome_kernel = xyes \
++                 -a x$cs_have_salome_gui = xyes \
++                 -a x$omniORB_ok = xyes)
+ 
+ ])dnl
+