From d0a47f4e0919385e86a5bb657838ff49bfa5e99a Mon Sep 17 00:00:00 2001
From: maho <maho@FreeBSD.org>
Date: Sun, 6 Feb 2005 03:09:06 +0000
Subject: Fix build with math/spooles

---
 cad/calculix/Makefile                         | 4 +++-
 cad/calculix/files/patch-ccx_VER+src+Makefile | 6 +++---
 cad/calculix/pkg-descr                        | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'cad/calculix')

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index f7db85e1378d..d4ecc456c9c6 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -22,7 +22,6 @@ DIST_SUBDIR=	calculix
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A Three-Dimensional Structural Finite Element Program
 
-# These are required to build Crunchix (ccx)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles \
 		${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack
 LIB_DEPENDS=    atlas.1:${PORTSDIR}/math/atlas
@@ -31,6 +30,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GL=	yes
 USE_REINPLACE=	yes
 BLAS_LIBS=	-lf77blas -latlas
+
 BROWSER?=	mozilla
 PSVIEWER?=	gv
 
@@ -47,6 +47,8 @@ pre-everything::
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
+	s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS} -DUSE_MT+g; \
+	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g; \
 	s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/ccx_${PORTVERSION}/src/Makefile
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile
index 5d12fd47fd81..c1c0c36937f0 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,9 +1,9 @@
 --- ccx_1.2/src/Makefile.orig	Sun Jul 25 09:55:36 2004
-+++ ccx_1.2/src/Makefile	Sat Dec 25 00:56:51 2004
++++ ccx_1.2/src/Makefile	Wed Feb  2 15:53:46 2005
 @@ -1,8 +1,8 @@
 -CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux"
 -FFLAGS = -Wall -O
-+CFLAGS += -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD"
++CFLAGS += -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" %%PTHREAD_CFLAGS%%
 +FFLAGS += -O
  
 -CC=cc
@@ -28,7 +28,7 @@
  
  ccx_1.2: $(OCCXMAIN) ccx_1.2.a  $(LIBS)
 -	g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS)
-+	$(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS) -L$(DIR)
++	$(FC) %%PTHREAD_LIBS%% $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS) -L$(DIR)
  
  ccx_1.2.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/calculix/pkg-descr b/cad/calculix/pkg-descr
index 1a3cce5c3053..ba17ae1a44b3 100644
--- a/cad/calculix/pkg-descr
+++ b/cad/calculix/pkg-descr
@@ -11,3 +11,7 @@ Karlsson & Sorensen, Inc (HKS) and are used with kind permission from HKS.
 Results obtained from CalculiX are in no way connected to ABAQUS.
 
 WWW: http://www.calculix.de/
+
+note: By default, the single-threaded solver is used.his can be changed by
+setting the CCX_NPROC environment variable with the number of processor you want
+to use.
-- 
cgit