From 96805d662cf35171405472ba76e62a308b48c4b0 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Tue, 22 Sep 2020 17:31:28 +0000
Subject: [PATCH] cad/calculix-ccx: Re-enable multithreading with spooles.

Clarify further the pkg-messager.

PR:	249351
Approved by:	thierry (mentor, implicit)
---
 cad/calculix-ccx/Makefile             | 1 +
 cad/calculix-ccx/files/patch-Makefile | 2 +-
 cad/calculix-ccx/pkg-message          | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index dc30f36856ac..df084ebf726b 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ccx
 PORTVERSION=	2.17
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
diff --git a/cad/calculix-ccx/files/patch-Makefile b/cad/calculix-ccx/files/patch-Makefile
index 20d406555718..da7ff087aff1 100644
--- a/cad/calculix-ccx/files/patch-Makefile
+++ b/cad/calculix-ccx/files/patch-Makefile
@@ -4,7 +4,7 @@
  
 -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
diff --git a/cad/calculix-ccx/pkg-message b/cad/calculix-ccx/pkg-message
index 6b09947dd01a..84c7306ccdc0 100644
--- a/cad/calculix-ccx/pkg-message
+++ b/cad/calculix-ccx/pkg-message
@@ -2,8 +2,8 @@
 { 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
 }
 ]