science/PETSc: Change to 64-bit indices; Add METIS option

By default PETSc uses 32-bit indices.

7 files changed, 16 insertions, 5 deletions

diff --git a/math/petiga/Makefile b/math/petiga/Makefile
index d473c9d8907d..5bb862f9f480 100644
--- a/math/petiga/Makefile
+++ b/math/petiga/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	petiga
 DISTVERSION=	g20221208
+PORTREVISION=	1
 CATEGORIES=	math python
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/math/py-petsc4py/Makefile b/math/py-petsc4py/Makefile
index 8b9353736664..9435289a63e2 100644
--- a/math/py-petsc4py/Makefile
+++ b/math/py-petsc4py/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	petsc4py
 DISTVERSION=	3.18.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-slepc4py/Makefile b/math/py-slepc4py/Makefile
index 076b0e55330d..f2ef98e42d80 100644
--- a/math/py-slepc4py/Makefile
+++ b/math/py-slepc4py/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	slepc4py
 DISTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/math/slepc/Makefile b/math/slepc/Makefile
index 6ca2eab4a840..f6cbdc245f1f 100644
--- a/math/slepc/Makefile
+++ b/math/slepc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	slepc
 DISTVERSION=	3.18.2
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://slepc.upv.es/download/distrib/
 
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index c6d6d7bff073..5067cf1ff2a2 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	PETSc
 DISTVERSION=	3.18.4
+PORTREVISION=	1
 CATEGORIES=	science devel
 MASTER_SITES=	https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
@@ -25,6 +26,7 @@ CONFIGURE_ARGS=	--with-shared-libraries=1 \
 		MAKEFLAGS="${MAKEFLAGS}" LDFLAGS="${LDFLAGS}" LIBS=""
 CONFIGURE_ARGS_amd64=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
 CONFIGURE_ARGS_i386=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
+CONFIGURE_ARGS=	--with-64-bit-indices # as opposed to 32-bit indices that are default
 CONFIGURE_LOG=	configure.log
 USE_XORG=	x11
 MAKEFILE=	makefile
@@ -39,6 +41,13 @@ LDFLAGS+=	${LOCALBASE}/lib/libmpi.so
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SHLIB=${DISTVERSION} SHL=${DISTVERSION:C/\.[0-9]$//}
 
+OPTIONS_DEFINE=		METIS
+OPTIONS_DEFAULT=	METIS
+
+METIS_DESC=		Enable metis support for graph partitioning algorithms
+METIS_CONFIGURE_ON=	--with-metis=1 # --with-parmetis=1 to use include/parmetis.h
+METIS_LIB_DEPENDS=	libmetis.so:math/metis
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpetsc.so.${DISTVERSION}
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.html" -delete
diff --git a/science/bout++/Makefile b/science/bout++/Makefile
index c00c2823ea8a..b901aa12150f 100644
--- a/science/bout++/Makefile
+++ b/science/bout++/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	bout++
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science math # physics
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -49,7 +49,7 @@ OPTIONS_MULTI=		FORMAT
 OPTIONS_MULTI_FORMAT=	HDF5 NETCDF
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
-OPTIONS_DEFAULT=	MPICH NETCDF PETSC SLEPC
+OPTIONS_DEFAULT=	MPICH NETCDF # PETSC SLEPC: not compatible with the latest petsc-3.18.4
 
 FORMAT_DESC=		File format support
 
@@ -68,8 +68,6 @@ OPRNMP_BROKEN=		SEGV when OpenMP is enabled, see https://github.com/boutproject/
 
 OPENMPI_USES=		mpi:openmpi
 
-PETSC_CMAKE_BOOL=	BOUT_USE_PETSC
-
 PETSC_DESC=		Build with PETSc support
 PETSC_CMAKE_BOOL=	BOUT_USE_PETSC
 PETSC_LIB_DEPENDS=	libpetsc.so:science/PETSc
diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index f4c0d88a3ffc..cb86252933d8 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	code_saturne
 PORTVERSION=	7.1.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org