diff --git a/math/costa/Makefile b/math/costa/Makefile
index 12f41b4d51ef..4cd520b6953f 100644
--- a/math/costa/Makefile
+++ b/math/costa/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	costa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Distributed Communication-Optimal Shuffle and Transpose Algorithm
 WWW=		https://github.com/eth-cscs/COSTA
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libscalapack.so:math/scalapack
 
 USES=		cmake:testing pkgconfig
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	eth-cscs
 GH_PROJECT=	COSTA
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_ARGS=	-DCOSTA_SCALAPACK=CUSTOM
 CMAKE_OFF=	COSTA_WITH_TESTS
 CMAKE_TESTING_ON=	COSTA_WITH_TESTS
 
 OPTIONS_SINGLE=		MPI
 OPTIONS_SINGLE_MPI=	MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 MPICH_USES=		mpi:mpich
 
 OPENMPI_USES=		mpi:openmpi
 
 post-install: # workaround for https://github.com/eth-cscs/COSTA/issues/9
 	@cd ${STAGEDIR}${PREFIX} && ${RMDIR} \
 		include/costa/pxtran \
 		include/costa/pxtranc \
 		include/costa/pxtranu
 
 .include <bsd.port.mk>
diff --git a/math/costa/files/patch-CMakeLists.txt b/math/costa/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..72ff9c11ba6e
--- /dev/null
+++ b/math/costa/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2023-02-28 08:57:54 UTC
++++ CMakeLists.txt
+@@ -58,7 +58,7 @@ adjust_mpiexec_flags()
+ # OpenMP
+ find_package(OpenMP COMPONENTS CXX REQUIRED)
+ 
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -funroll-loops -march=native -DNDEBUG")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -funroll-loops")
+ 
+ # Bundled dependencies
+ #