diff --git a/math/elpa/Makefile b/math/elpa/Makefile
index bce7ed9c98b6..4be23de3c3c6 100644
--- a/math/elpa/Makefile
+++ b/math/elpa/Makefile
@@ -1,69 +1,70 @@
 PORTNAME=	elpa
 DISTVERSION=	2021.11.001
 CATEGORIES=	math
 MASTER_SITES=	https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Eigenvalue soLver for Petaflop Applications
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING/gpl.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING/lgpl.txt
 
 LIB_DEPENDS=	libopenblas.so:math/openblas
 
 USES=		compiler:c11 fortran gmake libtool localbase perl5 shebangfix
 USE_LDCONFIG=	yes
 
 SHEBANG_GLOB=	*.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-avx --disable-avx2 --disable-avx512 --disable-static \
 		--disable-c-tests
 
 CFLAGS+=	-I${WRKSRC} -I${WRKSRC}/private_modules
+CFLAGS+=	-DFREEBSD_OSVERSION=${OSVERSION}
 FCFLAGS+=	-I${WRKSRC} -I${WRKSRC}/private_modules
 LDFLAGS+=	-lutil
 
 # ugly workaround for missing .mod files: some targets are added before 'all' that force rebuild of missing .mod files
 ALL_TARGET=	src/general/libelpa_private_la-elpa_utilities.lo \
 		src/libelpa_private_la-elpa_generated_fortran_interfaces.lo \
 		src/elpa1/libelpa_private_la-elpa1_compute_private.lo \
 		src/elpa2/libelpa_private_la-elpa2_compute.lo \
 		all
 INSTALL_TARGET=	install-strip
 
 BINARY_ALIAS=	make=gmake gcc=gcc${GCC_DEFAULT} g++=g++${GCC_DEFAULT} # build fails with clang: recursively calls cc
 FCFLAGS+=	-std=legacy -I${LOCALBASE}/include
 
 MAKE_JOBS_UNSAFE=	yes # part of the workaround for .mod files
 
 OPTIONS_DEFINE=			OPENMP MPI DOCS
 OPTIONS_DEFINE_amd64=		SSE
 OPTIONS_DEFAULT_amd64=		SSE
 
 SSE_CFLAGS=			-msse3
 OPENMP_CONFIGURE_ENABLE=	openmp
 MPI_CONFIGURE_WITH=		mpi
 MPI_LIB_DEPENDS=		libmpich.so:net/mpich \
 				libscalapack.so:math/scalapack
 
 PORTDOCS=	*
 
 post-patch:
 	# workaround for: https://github.com/marekandreas/elpa/issues/6
 	@${FIND} ${WRKSRC} -name "*.mk" | ${XARGS} ${REINPLACE_CMD} -e 's|-Werror| |'
 	# patch in the full path name of config-f90.h
 	@${FIND} ${WRKSRC} -name *.F90 -o -name *.c | ${XARGS} ${REINPLACE_CMD} -e 's|#include "config-f90.h"|#include "${WRKSRC}/config-f90.h"|'
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NSSE}
 CONFIGURE_ARGS+=	--disable-sse --disable-sse-assembly
 .endif
 
 post-install-DOCS-on:
 	@cd ${STAGEDIR}${DOCSDIR} && ${RM} *gpl* COPYING LICENSE
 
 .include <bsd.port.mk>
diff --git a/math/elpa/files/patch-src_helpers_check__thread__affinity.c b/math/elpa/files/patch-src_helpers_check__thread__affinity.c
index 40db36a7cd7d..5561d206753e 100644
--- a/math/elpa/files/patch-src_helpers_check__thread__affinity.c
+++ b/math/elpa/files/patch-src_helpers_check__thread__affinity.c
@@ -1,32 +1,47 @@
 --- src/helpers/check_thread_affinity.c.orig	2021-11-16 11:26:03 UTC
 +++ src/helpers/check_thread_affinity.c
-@@ -47,11 +47,14 @@
+@@ -47,29 +47,41 @@
  //
  // Author: Andreas Marek, MPCDF
  
 -#define  _GNU_SOURCE
 +//#define  _GNU_SOURCE
 +#define __BSD_VISIBLE
  #include <stdio.h>
  #include <stdlib.h>
  #include <sched.h>
  #include <sys/types.h>
 +#include <sys/_cpuset.h>
 +#include <sys/cpuset.h>
  #include <unistd.h>
  
++#if FREEBSD_OSVERSION >= 1301000
++#  define HAVE_SCHED_FUNCS // sched_getcpu() and sched_getaffinity() were added in 13.1
++#endif
  
-@@ -60,11 +63,11 @@ void get_thread_affinity(int *cpu_id) {
+ void get_thread_affinity(int *cpu_id) {
++#if defined(HAVE_SCHED_FUNCS)
+   *cpu_id = sched_getcpu();
++#else
++  *cpu_id = 0;
++#endif
  }
  
  void get_process_affinity(int cpu_id) {
 -  cpu_set_t set;
++#if defined(HAVE_SCHED_FUNCS)
 +  cpuset_t set;
    int ret, i;
    int cpu;
    cpu_id = 9999999 ;
 -  ret = sched_getaffinity(0, sizeof(cpu_set_t), &set);
 +  ret = sched_getaffinity(0, sizeof(cpuset_t), &set);
    for (i=0; i < CPU_SETSIZE; i++)
      {
        cpu = CPU_ISSET(i, &set);
+       if (cpu == 1) { cpu_id = i; }
+     }
++#endif
+ }
+ 
+ void get_process_id(int *process_id, int *pprocess_id) {