Attachment #164279 for bug #205346




# $FreeBSD$

PORTNAME=	CalculiX
PORTVERSION=	2.9
CATEGORIES=	cad
MASTER_SITES=	http://www.dhondt.de/
DISTFILES=	${DIST_SOURCES}

MAINTAINER=	maho@FreeBSD.org
COMMENT=	Three-Dimensional Structural Finite Element Program

BROKEN=		unfetchable

LICENSE=	GPLv2

LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack	\

BROWSER?=	firefox
PSVIEWER?=	gv

OPTIONS_DEFINE=	METIS METIS_EDF DOCS
OPTIONS_DEFAULT=METIS

OPTIONS_RADIO=  BLAS




SHA256 (calculix/ccx_2.9.src.tar.bz2) = 755e173cfb712c83cefef22cfa43f06caf495e5dffbecf8df3d47f3cf6e6d44d
SIZE (calculix/ccx_2.9.src.tar.bz2) = 951618
SHA256 (calculix/cgx_2.9.all.tar.bz2) = eccce9424a05396c218f1c8cb3c3e92ffd847d4c9e24e5fe7e5812688bcc1f69
SIZE (calculix/cgx_2.9.all.tar.bz2) = 1731082
SHA256 (calculix/ccx_2.9.test.tar.bz2) = 6a2d864c970189c8b350f28826e9d3b624e2b3c1bad9f7f0ed45ccb2343c12e3
SIZE (calculix/ccx_2.9.test.tar.bz2) = 9051620
SHA256 (calculix/cgx_2.9.exa.tar.bz2) = 7553005a384faadb702c3fc186fc48b26559ba1a52ecd662579990167514f6ec
SIZE (calculix/cgx_2.9.exa.tar.bz2) = 505174
SHA256 (calculix/ccx_2.9.htm.tar.bz2) = 2313229b854e2558524d521ff586df05947416f0ee31a6b15edc59334e65178d
SIZE (calculix/ccx_2.9.htm.tar.bz2) = 1903990
SHA256 (calculix/cgx_2.9.htm.tar.bz2) = f8f4585275902f99e785be3d7beb4b4eaeecea3ab2c4456114a5a715c9fec032
SIZE (calculix/cgx_2.9.htm.tar.bz2) = 278036
SHA256 (calculix/ccx_2.9.ps.tar.bz2) = 709ab11a2996d1b0af8eaf727c553abb8b650ad39d6b8cd26084c1942831e0d5
SIZE (calculix/ccx_2.9.ps.tar.bz2) = 2412304
SHA256 (calculix/cgx_2.9.pdf) = 722f379619c9560278eb9cde2fc0db125f8d3b4aec04b1456fbf7056c8f9228a
SIZE (calculix/cgx_2.9.pdf) = 1161271

Lines 1-5 Link Here

(-)cad/calculix/files/patch-ccx_VER+src+CalculiX.h (-2 / +2 lines)
1	--- ccx_2.8/src/CalculiX.h.orig 2015-01-17 13:44:36.000000000 -0500	1	--- ccx_2.9/src/CalculiX.h.orig 2015-01-17 13:44:36.000000000 -0500
2	+++ ccx_2.8/src/CalculiX.h 2015-03-05 18:03:18.675496033 -0500	2	+++ ccx_2.9/src/CalculiX.h 2015-03-05 18:03:18.675496033 -0500
3	@@ -15,12 +15,14 @@	3	@@ -15,12 +15,14 @@
4	/* along with this program; if not, write to the Free Software */	4	/* along with this program; if not, write to the Free Software */
5	/* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */	5	/* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */




--- ccx_2.9/src/Makefile.orig	2015-11-19 19:28:14 UTC
+++ ccx_2.9/src/Makefile
@@ -1,10 +1,10 @@
 
-CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+CFLAGS += -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
 #FFLAGS = -Wall -O3 -fopenmp -fmax-stack-var-size=80000
 FFLAGS = -Wall -O3 -fopenmp
 
-CC=cc

 
 .c.o :
 	$(CC) $(CFLAGS) -c $<
@@ -19,15 +19,10 @@ OCCXF = $(SCCXF:.f=.o)
 OCCXC = $(SCCXC:.c=.o)
 OCCXMAIN = $(SCCXMAIN:.c=.o)
 

-       -lpthread -lm -lc
+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
 
 ccx_2.9: $(OCCXMAIN) ccx_2.9.a  $(LIBS)
-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a $(LIBS)
+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a -lpthread $(LIBS)
 
 ccx_2.9.a: $(OCCXF) $(OCCXC)
 	ar vr $@ $?

Lines 1-5 Link Here

(-)cad/calculix/files/patch-cgx_VER+src+Makefile (-2 / +2 lines)
1	--- cgx_2.8/src/Makefile.orig 2014-04-07 12:26:41.000000000 -0500	1	--- cgx_2.9/src/Makefile.orig 2014-04-07 12:26:41.000000000 -0500
2	+++ cgx_2.8/src/Makefile 2015-03-05 17:51:21.124545473 -0500	2	+++ cgx_2.9/src/Makefile 2015-03-05 17:51:21.124545473 -0500
3	@@ -1,14 +1,14 @@	3	@@ -1,14 +1,14 @@
4	CFLAGS = -O3 -Wall \	4	CFLAGS = -O3 -Wall \
5	-I./ \	5	-I./ \

Lines 1-11 Link Here

(-)cad/calculix/files/patch-cgx_VER+src+cgx.h (-4 / +4 lines)
1	--- cgx_2.8/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900	1	--- cgx_2.9/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900
2	+++ cgx_2.8/src/cgx.h 2009-09-03 15:07:10.000000000 +0900	2	+++ cgx_2.9/src/cgx.h 2009-09-03 15:07:10.000000000 +0900
3	@@ -86,8 +86,8 @@	3	@@ -86,8 +86,8 @@
4	"/yaprod/cae/application/CalculiX/doc/ccx_2.0/ccx.html"}	4	"/yaprod/cae/application/CalculiX/doc/ccx_2.0/ccx.html"}
5	#endif	5	#endif
6	#else	6	#else
7	- #define HELPFILE {"/usr/local/CalculiX/cgx_2.8/doc/cgx/cgx.html",\	7	- #define HELPFILE {"/usr/local/CalculiX/cgx_2.9/doc/cgx/cgx.html",\
8	- "/usr/local/CalculiX/ccx_2.8/doc/ccx/ccx.html"}	8	- "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html"}
9	+ #define HELPFILE {"%%DOCSDIR%%/cgx/cgx.html",\	9	+ #define HELPFILE {"%%DOCSDIR%%/cgx/cgx.html",\
10	+ "%%DOCSDIR%%/ccx/ccx.html"}	10	+ "%%DOCSDIR%%/ccx/ccx.html"}
11	#endif	11	#endif

Return to bug 205346

Lines 2-8 Link Here

(-)cad/calculix/Makefile (-4 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= CalculiX	4	PORTNAME= CalculiX
5	PORTVERSION= 2.8	5	PORTVERSION= 2.9
6	CATEGORIES= cad	6	CATEGORIES= cad
7	MASTER_SITES= http://www.dhondt.de/	7	MASTER_SITES= http://www.dhondt.de/
8	DISTFILES= ${DIST_SOURCES}	8	DISTFILES= ${DIST_SOURCES}
Lines 12-19 Link Here
12	MAINTAINER= maho@FreeBSD.org	12	MAINTAINER= maho@FreeBSD.org
13	COMMENT= Three-Dimensional Structural Finite Element Program	13	COMMENT= Three-Dimensional Structural Finite Element Program
14		14
15	BROKEN= unfetchable
16
17	LICENSE= GPLv2	15	LICENSE= GPLv2
18		16
19	LIB_DEPENDS= libarpack.so:${PORTSDIR}/math/arpack \	17	LIB_DEPENDS= libarpack.so:${PORTSDIR}/math/arpack \
Lines 41-47 Link Here
41	BROWSER?= firefox	39	BROWSER?= firefox
42	PSVIEWER?= gv	40	PSVIEWER?= gv
43		41
44	OPTIONS_DEFINE= METIS METIS_EDF DOCS EXAMPLES	42	OPTIONS_DEFINE= METIS METIS_EDF DOCS
45	OPTIONS_DEFAULT=METIS	43	OPTIONS_DEFAULT=METIS
46		44
47	OPTIONS_RADIO= BLAS	45	OPTIONS_RADIO= BLAS

Lines 1-16 Link Here

(-)cad/calculix/distinfo (-16 / +16 lines)
1	SHA256 (calculix/ccx_2.8.src.tar.bz2) = 4b1d032afbc7e24658824cd0dcf6b4279adb9b1788a0d75111b58cdc40219ced	1	SHA256 (calculix/ccx_2.9.src.tar.bz2) = 755e173cfb712c83cefef22cfa43f06caf495e5dffbecf8df3d47f3cf6e6d44d
2	SIZE (calculix/ccx_2.8.src.tar.bz2) = 918419	2	SIZE (calculix/ccx_2.9.src.tar.bz2) = 951618
3	SHA256 (calculix/cgx_2.8.all.tar.bz2) = 8e605df835f62748b2d7bba00d7c9ef0a2b797fb7f4ba4a8614062c1f0ba0875	3	SHA256 (calculix/cgx_2.9.all.tar.bz2) = eccce9424a05396c218f1c8cb3c3e92ffd847d4c9e24e5fe7e5812688bcc1f69
4	SIZE (calculix/cgx_2.8.all.tar.bz2) = 1657532	4	SIZE (calculix/cgx_2.9.all.tar.bz2) = 1731082
5	SHA256 (calculix/ccx_2.8.test.tar.bz2) = 192f7870ae462f35426d198b9c1ecb8876cd9fb8ad64e207e1c1b631709bf96d	5	SHA256 (calculix/ccx_2.9.test.tar.bz2) = 6a2d864c970189c8b350f28826e9d3b624e2b3c1bad9f7f0ed45ccb2343c12e3
6	SIZE (calculix/ccx_2.8.test.tar.bz2) = 8965915	6	SIZE (calculix/ccx_2.9.test.tar.bz2) = 9051620
7	SHA256 (calculix/cgx_2.8.exa.tar.bz2) = f5c51bef56682bf78f6f86275a125acc4e7124875fc53871549d335bd6612a8d	7	SHA256 (calculix/cgx_2.9.exa.tar.bz2) = 7553005a384faadb702c3fc186fc48b26559ba1a52ecd662579990167514f6ec
8	SIZE (calculix/cgx_2.8.exa.tar.bz2) = 492133	8	SIZE (calculix/cgx_2.9.exa.tar.bz2) = 505174
9	SHA256 (calculix/ccx_2.8.htm.tar.bz2) = 89559fdfe0ca46da4a61669dd4a4e19b992275a8be84d58d729f4dab7d3a03dd	9	SHA256 (calculix/ccx_2.9.htm.tar.bz2) = 2313229b854e2558524d521ff586df05947416f0ee31a6b15edc59334e65178d
10	SIZE (calculix/ccx_2.8.htm.tar.bz2) = 1720873	10	SIZE (calculix/ccx_2.9.htm.tar.bz2) = 1903990
11	SHA256 (calculix/cgx_2.8.htm.tar.bz2) = de9da52f427c8cb2e9635c1a6f7e09a59bf2d4802b7a64fa1e4c197e8b75db59	11	SHA256 (calculix/cgx_2.9.htm.tar.bz2) = f8f4585275902f99e785be3d7beb4b4eaeecea3ab2c4456114a5a715c9fec032
12	SIZE (calculix/cgx_2.8.htm.tar.bz2) = 349398	12	SIZE (calculix/cgx_2.9.htm.tar.bz2) = 278036
13	SHA256 (calculix/ccx_2.8.ps.tar.bz2) = 9c71d21a474ca938156f532ba5f656840297148105975cffb871525f4bddc30a	13	SHA256 (calculix/ccx_2.9.ps.tar.bz2) = 709ab11a2996d1b0af8eaf727c553abb8b650ad39d6b8cd26084c1942831e0d5
14	SIZE (calculix/ccx_2.8.ps.tar.bz2) = 2359282	14	SIZE (calculix/ccx_2.9.ps.tar.bz2) = 2412304
15	SHA256 (calculix/cgx_2.8.pdf) = 17ba0f2e341d37d9b94ea38c92b574b9cff4ffdc91a2e560611b1387ade12471	15	SHA256 (calculix/cgx_2.9.pdf) = 722f379619c9560278eb9cde2fc0db125f8d3b4aec04b1456fbf7056c8f9228a
16	SIZE (calculix/cgx_2.8.pdf) = 1129372	16	SIZE (calculix/cgx_2.9.pdf) = 1161271

Lines 1-9 Link Here

(-)cad/calculix/files/patch-ccx_VER+src+Makefile (-9 / +10 lines)
1	--- ccx_2.8/src/Makefile.orig 2015-01-17 13:44:37.000000000 -0500	1	--- ccx_2.9/src/Makefile.orig 2015-11-19 19:28:14 UTC
2	+++ ccx_2.8/src/Makefile 2015-03-05 17:47:19.851561593 -0500	2	+++ ccx_2.9/src/Makefile
3	@@ -1,9 +1,9 @@	3	@@ -1,10 +1,10 @@
4		4
5	-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE	5	-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
6	+CFLAGS = -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE	6	+CFLAGS += -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
		7	#FFLAGS = -Wall -O3 -fopenmp -fmax-stack-var-size=80000
7	FFLAGS = -Wall -O3 -fopenmp	8	FFLAGS = -Wall -O3 -fopenmp
8		9
9	-CC=cc	10	-CC=cc
Lines 13-19 Link Here
13		14
14	.c.o :	15	.c.o :
15	$(CC) $(CFLAGS) -c $<	16	$(CC) $(CFLAGS) -c $<
16	@@ -18,15 +18,10 @@	17	@@ -19,15 +19,10 @@ OCCXF = $(SCCXF:.f=.o)
17	OCCXC = $(SCCXC:.c=.o)	18	OCCXC = $(SCCXC:.c=.o)
18	OCCXMAIN = $(SCCXMAIN:.c=.o)	19	OCCXMAIN = $(SCCXMAIN:.c=.o)
19		20
Lines 25-33 Link Here
25	- -lpthread -lm -lc	26	- -lpthread -lm -lc
26	+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm	27	+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
27		28
28	ccx_2.8: $(OCCXMAIN) ccx_2.8.a $(LIBS)	29	ccx_2.9: $(OCCXMAIN) ccx_2.9.a $(LIBS)
29	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.8.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8.a $(LIBS)	30	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a $(LIBS)
30	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.8.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8.a -lpthread $(LIBS)	31	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a -lpthread $(LIBS)
31		32
32	ccx_2.8.a: $(OCCXF) $(OCCXC)	33	ccx_2.9.a: $(OCCXF) $(OCCXC)
33	ar vr $@ $?	34	ar vr $@ $?