Index: head/cad/calculix-ccx/Makefile
===================================================================
--- head/cad/calculix-ccx/Makefile	(revision 549612)
+++ head/cad/calculix-ccx/Makefile	(revision 549613)
@@ -1,81 +1,82 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	ccx
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
 DISTFILES=	${DIST_SOURCES}
 DIST_SUBDIR=	calculix
 EXTRACT_ONLY=	${DIST_SOURCES}
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	Three-Dimensional Structural Finite Element Program
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
 		libspooles.so:math/spooles
 
 USES=		blaslapack compiler:openmp fortran gmake tar:bzip2
 USE_PERL5=	build
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}
 DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PS=	ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
 DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}
 
 ALL_TARGET=	#Empty
 
 CCX_VER=	ccx_${PORTVERSION}
 WRKSRC=		${WRKDIR}/CalculiX/${CCX_VER}/src
 DOCSDIR=	${PREFIX}/share/doc/CalculiX
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${DIST_HTM} ${DIST_PS}
 EXTRACT_ONLY+=	${DIST_HTM} ${DIST_PS}
 .endif
 
 .if $(PORT_OPTIONS:MEXAMPLES)
 DISTFILES+=	${DIST_EXAMPLES}
 EXTRACT_ONLY+=	${DIST_EXAMPLES}
 .endif
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
 FFLAGS+=	-fPIC
 .else
 CFLAGS+=	-fpic
 FFLAGS+=	-fpic
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
 	s+%%BLAS_LIBS%%+${BLASLIB}+ ; \
 	s+%%LAPACK_LIBS%%+${LAPACKLIB}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${CCX_VER} \
 	  ${STAGEDIR}${PREFIX}/bin/ccx
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${DOCSDIR}/ccx)
 	${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \
 		${STAGEDIR}${DOCSDIR}
 	@${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/test && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/cad/calculix-ccx/files/patch-Makefile
===================================================================
--- head/cad/calculix-ccx/files/patch-Makefile	(revision 549612)
+++ head/cad/calculix-ccx/files/patch-Makefile	(revision 549613)
@@ -1,32 +1,32 @@
 --- Makefile.orig	2020-07-23 19:41:38 UTC
 +++ Makefile
 @@ -1,9 +1,9 @@
  
 -CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
 -FFLAGS = -Wall -O2
-+CFLAGS += -O2  -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
++CFLAGS += -O2  -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DUSE_MT=1 -DMATRIXSTORAGE -DNETWORKOUT
 +FFLAGS += -O2
  
 -CC=cc
 -FC=gfortran
 +CC=%%CC%%
 +FC=%%FC%%
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
 @@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
  DIR=../../../SPOOLES.2.2
  
  LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
 +       -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
 +       -lpthread -lm
  
  ccx_2.17: $(OCCXMAIN) ccx_2.17.a  $(LIBS)
 -	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
 +	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
  
  ccx_2.17.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
Index: head/cad/calculix-ccx/pkg-message
===================================================================
--- head/cad/calculix-ccx/pkg-message	(revision 549612)
+++ head/cad/calculix-ccx/pkg-message	(revision 549613)
@@ -1,9 +1,9 @@
 [
 { type: install
   message: <<EOM
 Spooles: by default the single-threaded solver is used unless you set the
-CCX_NPROC_EQUATION_SOLVER environment variable with the number of
-cores you want to use.
+CCX_NPROC_EQUATION_SOLVER or the OMP_NUM_THREADS environment variables with
+the number of cores you want to use.
 EOM
 }
 ]