Attachment #200247 for bug #234146




# $FreeBSD$

PORTNAME=	ccx
PORTVERSION=	2.15
PORTREVISION=	3
CATEGORIES=	cad
MASTER_SITES=	http://www.dhondt.de/
PKGNAMEPREFIX=	CalculiX-

LICENSE=	GPLv2

LIB_DEPENDS=	libarpack.so:math/arpack-ng	\
		libspooles.so:math/spooles
		libspooles.so:math/spooles	\
		libtaucs.so:math/taucs

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}

USES=		blaslapack compiler:openmp fortran gmake tar:bzip2 shebangfix
USE_PERL5=	build
SHEBANG_FILES=	date.pl

ALL_TARGET=	#Empty

CCX_VER=	ccx_${PORTVERSION}

Lines 1-9 Link Here

(-)cad/calculix-ccx/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1526335200	1	TIMESTAMP = 1545160861
2	SHA256 (calculix/ccx_2.14.src.tar.bz2) = 59de9965d8f69141a34519101f7dd932c7d8d2be15480b31062b92512545fec4	2	SHA256 (calculix/ccx_2.15.src.tar.bz2) = a4354c33e14dd3da5f5babd607bbd553667055dceef71b3bbc0d98a741be1c9f
3	SIZE (calculix/ccx_2.14.src.tar.bz2) = 1160412	3	SIZE (calculix/ccx_2.15.src.tar.bz2) = 1219901
4	SHA256 (calculix/ccx_2.14.htm.tar.bz2) = 4e697b40e68c12a7b9e67516b59ec18ee4779ab1719c7582fc67d38a81ae8988	4	SHA256 (calculix/ccx_2.15.htm.tar.bz2) = 0bfdef36076d3d1d1b7f8cd1d5a886915f7b0b54ed5ae7a7f71fa813ef655922
5	SIZE (calculix/ccx_2.14.htm.tar.bz2) = 2218811	5	SIZE (calculix/ccx_2.15.htm.tar.bz2) = 2347033
6	SHA256 (calculix/ccx_2.14.ps.tar.bz2) = 362897a739939d247e623a737b9c80313222f1f0e113b310b78c883d59f22128	6	SHA256 (calculix/ccx_2.15.ps.tar.bz2) = 93910e4f2a875bcebcb78fbed369549d58a0b9daf3e7526e8135cf53727a1fae
7	SIZE (calculix/ccx_2.14.ps.tar.bz2) = 2674965	7	SIZE (calculix/ccx_2.15.ps.tar.bz2) = 2989356
8	SHA256 (calculix/ccx_2.14.test.tar.bz2) = d0b8b7f4aa25691e703b3b91e1d4280fa73967380a7c3d110f868868c48b4003	8	SHA256 (calculix/ccx_2.15.test.tar.bz2) = ee17e477aeae944c35853a663ac245c33b405c3750308c5d77e5ee9a4e609dd5
9	SIZE (calculix/ccx_2.14.test.tar.bz2) = 9661509	9	SIZE (calculix/ccx_2.15.test.tar.bz2) = 10027839




--- CalculiX.h.orig	2018-12-15 14:30:31 UTC
+++ CalculiX.h
@@ -18,12 +18,14 @@
 /*     along with this program; if not, write to the Free Software       */
 /*     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         */
 
 #include <pthread.h>
 
-#define Linux 1
+#include <pthread.h>
+

 #define FORTRAN(A,B) A##_  B
 #elif ARCH == IRIX || ARCH == IRIX64
 #define FORTRAN(A,B) A##_##B
@@ -31,7 +33,7 @@
 #define FORTRAN(A,B) A##B
 #endif
 




--- Makefile.orig	2018-12-15 14:30:33 UTC
+++ Makefile
@@ -1,9 +1,9 @@
 
-CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
-FFLAGS = -Wall -O3 
+CFLAGS += -O3  -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
+FFLAGS += -O3 
 
-CC=cc

-       $(DIR)/spooles.a \
-	../../../ARPACK/libarpack_INTEL.a \
-       -lpthread -lm -lc
+	-lmetis \
+	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
+	-lpthread -lm
 
 ccx_2.15: $(OCCXMAIN) ccx_2.15.a  $(LIBS)
-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC)  -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS)
+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC)  -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) $(LDFLAGS)
 
 ccx_2.15.a: $(OCCXF) $(OCCXC)
 	ar vr $@ $?

Line 0 Link Here

(-)cad/calculix-ccx/files/patch-date.pl (+11 lines)
	1	--- date.pl.orig 2018-12-15 14:30:33 UTC
	2	+++ date.pl
	3	@@ -1,6 +1,7 @@
	4	#!/usr/bin/env perl
	5
	6	-chomp($date=`date`);
	7	+use POSIX qw(strftime);
	8	+chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} \|\| time)));
	9
	10	# inserting the date into ccx_2.15.c
	11

Lines 1117-1126 Link Here

(-)cad/calculix-ccx/pkg-plist (-2 / +129 lines)
1117	%%PORTDOCS%%%%DOCSDIR%%/ccx/img200.png	1117	%%PORTDOCS%%%%DOCSDIR%%/ccx/img200.png
1118	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2000.png	1118	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2000.png
1119	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2001.png	1119	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2001.png
		1120	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2002.png
		1121	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2003.png
		1122	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2004.png
		1123	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2005.png
		1124	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2006.png
		1125	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2007.png
		1126	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2008.png
		1127	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2009.png
1120	%%PORTDOCS%%%%DOCSDIR%%/ccx/img201.png	1128	%%PORTDOCS%%%%DOCSDIR%%/ccx/img201.png
		1129	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2010.png
		1130	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2011.png
		1131	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2012.png
		1132	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2013.png
		1133	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2014.png
		1134	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2015.png
		1135	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2016.png
		1136	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2017.png
		1137	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2018.png
		1138	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2019.png
1121	%%PORTDOCS%%%%DOCSDIR%%/ccx/img202.png	1139	%%PORTDOCS%%%%DOCSDIR%%/ccx/img202.png
		1140	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2020.png
		1141	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2021.png
		1142	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2022.png
		1143	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2023.png
		1144	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2024.png
		1145	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2025.png
		1146	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2026.png
		1147	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2027.png
		1148	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2028.png
		1149	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2029.png
1122	%%PORTDOCS%%%%DOCSDIR%%/ccx/img203.png	1150	%%PORTDOCS%%%%DOCSDIR%%/ccx/img203.png
		1151	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2030.png
		1152	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2031.png
		1153	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2032.png
		1154	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2033.png
		1155	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2034.png
		1156	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2035.png
		1157	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2036.png
		1158	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2037.png
		1159	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2038.png
		1160	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2039.png
1123	%%PORTDOCS%%%%DOCSDIR%%/ccx/img204.png	1161	%%PORTDOCS%%%%DOCSDIR%%/ccx/img204.png
		1162	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2040.png
		1163	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2041.png
		1164	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2042.png
		1165	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2043.png
		1166	%%PORTDOCS%%%%DOCSDIR%%/ccx/img2044.png
1124	%%PORTDOCS%%%%DOCSDIR%%/ccx/img205.png	1167	%%PORTDOCS%%%%DOCSDIR%%/ccx/img205.png
1125	%%PORTDOCS%%%%DOCSDIR%%/ccx/img206.png	1168	%%PORTDOCS%%%%DOCSDIR%%/ccx/img206.png
1126	%%PORTDOCS%%%%DOCSDIR%%/ccx/img207.png	1169	%%PORTDOCS%%%%DOCSDIR%%/ccx/img207.png
Lines 2355-2363 Link Here
2355	%%PORTDOCS%%%%DOCSDIR%%/ccx/node413.html	2398	%%PORTDOCS%%%%DOCSDIR%%/ccx/node413.html
2356	%%PORTDOCS%%%%DOCSDIR%%/ccx/node414.html	2399	%%PORTDOCS%%%%DOCSDIR%%/ccx/node414.html
2357	%%PORTDOCS%%%%DOCSDIR%%/ccx/node415.html	2400	%%PORTDOCS%%%%DOCSDIR%%/ccx/node415.html
		2401	%%PORTDOCS%%%%DOCSDIR%%/ccx/node416.html
		2402	%%PORTDOCS%%%%DOCSDIR%%/ccx/node417.html
		2403	%%PORTDOCS%%%%DOCSDIR%%/ccx/node418.html
		2404	%%PORTDOCS%%%%DOCSDIR%%/ccx/node419.html
2358	%%PORTDOCS%%%%DOCSDIR%%/ccx/node42.html	2405	%%PORTDOCS%%%%DOCSDIR%%/ccx/node42.html
		2406	%%PORTDOCS%%%%DOCSDIR%%/ccx/node420.html
		2407	%%PORTDOCS%%%%DOCSDIR%%/ccx/node421.html
		2408	%%PORTDOCS%%%%DOCSDIR%%/ccx/node422.html
		2409	%%PORTDOCS%%%%DOCSDIR%%/ccx/node423.html
		2410	%%PORTDOCS%%%%DOCSDIR%%/ccx/node424.html
		2411	%%PORTDOCS%%%%DOCSDIR%%/ccx/node425.html
		2412	%%PORTDOCS%%%%DOCSDIR%%/ccx/node426.html
		2413	%%PORTDOCS%%%%DOCSDIR%%/ccx/node427.html
		2414	%%PORTDOCS%%%%DOCSDIR%%/ccx/node428.html
		2415	%%PORTDOCS%%%%DOCSDIR%%/ccx/node429.html
2359	%%PORTDOCS%%%%DOCSDIR%%/ccx/node43.html	2416	%%PORTDOCS%%%%DOCSDIR%%/ccx/node43.html
		2417	%%PORTDOCS%%%%DOCSDIR%%/ccx/node430.html
		2418	%%PORTDOCS%%%%DOCSDIR%%/ccx/node431.html
		2419	%%PORTDOCS%%%%DOCSDIR%%/ccx/node432.html
		2420	%%PORTDOCS%%%%DOCSDIR%%/ccx/node433.html
		2421	%%PORTDOCS%%%%DOCSDIR%%/ccx/node434.html
		2422	%%PORTDOCS%%%%DOCSDIR%%/ccx/node435.html
		2423	%%PORTDOCS%%%%DOCSDIR%%/ccx/node436.html
		2424	%%PORTDOCS%%%%DOCSDIR%%/ccx/node437.html
		2425	%%PORTDOCS%%%%DOCSDIR%%/ccx/node438.html
		2426	%%PORTDOCS%%%%DOCSDIR%%/ccx/node439.html
2360	%%PORTDOCS%%%%DOCSDIR%%/ccx/node44.html	2427	%%PORTDOCS%%%%DOCSDIR%%/ccx/node44.html
		2428	%%PORTDOCS%%%%DOCSDIR%%/ccx/node440.html
		2429	%%PORTDOCS%%%%DOCSDIR%%/ccx/node441.html
		2430	%%PORTDOCS%%%%DOCSDIR%%/ccx/node442.html
		2431	%%PORTDOCS%%%%DOCSDIR%%/ccx/node443.html
		2432	%%PORTDOCS%%%%DOCSDIR%%/ccx/node444.html
		2433	%%PORTDOCS%%%%DOCSDIR%%/ccx/node445.html
		2434	%%PORTDOCS%%%%DOCSDIR%%/ccx/node446.html
		2435	%%PORTDOCS%%%%DOCSDIR%%/ccx/node447.html
		2436	%%PORTDOCS%%%%DOCSDIR%%/ccx/node448.html
		2437	%%PORTDOCS%%%%DOCSDIR%%/ccx/node449.html
2361	%%PORTDOCS%%%%DOCSDIR%%/ccx/node45.html	2438	%%PORTDOCS%%%%DOCSDIR%%/ccx/node45.html
2362	%%PORTDOCS%%%%DOCSDIR%%/ccx/node46.html	2439	%%PORTDOCS%%%%DOCSDIR%%/ccx/node46.html
2363	%%PORTDOCS%%%%DOCSDIR%%/ccx/node47.html	2440	%%PORTDOCS%%%%DOCSDIR%%/ccx/node47.html
Lines 2418-2424 Link Here
2418	%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html	2495	%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
2419	%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html	2496	%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
2420	%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html	2497	%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
2421	%%PORTDOCS%%%%DOCSDIR%%/ccx_2.14.ps.gz	2498	%%PORTDOCS%%%%DOCSDIR%%/ccx_2.15.ps.gz
2422	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref	2499	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
2423	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp	2500	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
2424	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref	2501	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref
Lines 2477-2482 Link Here
2477	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.dat.ref	2554	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.dat.ref
2478	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.frd.ref	2555	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.frd.ref
2479	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.inp	2556	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31.inp
		2557	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31nodthi.dat.ref
		2558	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/b31nodthi.inp
2480	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ball.dat.ref	2559	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ball.dat.ref
2481	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ball.inp	2560	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ball.inp
2482	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam10p.dat.ref	2561	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beam10p.dat.ref
Lines 2531-2536 Link Here
2531	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy1.inp	2610	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy1.inp
2532	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10.dat.ref	2611	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10.dat.ref
2533	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10.inp	2612	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10.inp
		2613	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10bm.dat.ref
		2614	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy10bm.inp
2534	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy11.dat.ref	2615	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy11.dat.ref
2535	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy11.inp	2616	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy11.inp
2536	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy12.dat.ref	2617	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy12.dat.ref
Lines 2573-2585 Link Here
2573	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.dat.ref	2654	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.dat.ref
2574	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.inp	2655	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.inp
2575	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.dat.ref	2656	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.dat.ref
		2657	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.frd.ref
2576	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.inp	2658	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.inp
2577	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf2.dat.ref	2659	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf2.dat.ref
2578	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf2.inp	2660	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf2.inp
		2661	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3.dat.ref
		2662	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3.frd.ref
		2663	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3.inp
		2664	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3submodel.dat.ref
		2665	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3submodel.frd.ref
		2666	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf3submodel.inp
2579	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.dat.ref	2667	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.dat.ref
2580	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.inp	2668	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsh1.inp
2581	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.dat.ref	2669	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.dat.ref
2582	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.inp	2670	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfstrucdamp.inp
		2671	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsubmodel.dat.ref
		2672	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsubmodel.frd.ref
		2673	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamfsubmodel.inp
2583	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.dat.ref	2674	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.dat.ref
2584	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.inp	2675	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamft.inp
2585	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamheatplas.dat.ref	2676	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamheatplas.dat.ref
Lines 2734-2739 Link Here
2734	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread.inp	2825	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread.inp
2735	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.dat.ref	2826	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.dat.ref
2736	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.inp	2827	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread2.inp
		2828	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread3.dat.ref
		2829	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamread3.inp
2737	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.dat.ref	2830	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.dat.ref
2738	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.inp	2831	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.inp
2739	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.dat.ref	2832	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.dat.ref
Lines 2758-2763 Link Here
2758	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite.inp	2851	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite.inp
2759	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.dat.ref	2852	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.dat.ref
2760	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.inp	2853	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite2.inp
		2854	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite3.dat.ref
		2855	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite3.frd.ref
		2856	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamwrite3.inp
2761	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.dat.ref	2857	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.dat.ref
2762	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.inp	2858	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bifur.inp
2763	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bolt.dat.ref	2859	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bolt.dat.ref
Lines 2831-2836 Link Here
2831	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.inp	2927	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.inp
2832	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.dat.ref	2928	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.dat.ref
2833	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.inp	2929	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.inp
		2930	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.dat.ref
		2931	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.inp
		2932	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pfin.dat.ref
		2933	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pfin.inp
2834	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare	2934	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare
2835	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/concretebeam.dat.ref	2935	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/concretebeam.dat.ref
2836	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/concretebeam.frd.ref	2936	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/concretebeam.frd.ref
Lines 2883-2892 Link Here
2883	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.dat.ref	2983	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.dat.ref
2884	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.inp	2984	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.inp
2885	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.dat.ref	2985	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.dat.ref
		2986	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.frd.ref
2886	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.inp	2987	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.inp
2887	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.dat.ref	2988	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.dat.ref
2888	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.inp	2989	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.inp
2889	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.dat.ref	2990	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.dat.ref
		2991	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.frd.ref
2890	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.inp	2992	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.inp
2891	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.dat.ref	2993	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.dat.ref
2892	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.inp	2994	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.inp
Lines 2957-2963 Link Here
2957	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.dat.ref	3059	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.dat.ref
2958	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.frd.ref	3060	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.frd.ref
2959	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.inp	3061	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.inp
2960	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frdcheck.pl	3062	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.dat.ref
		3063	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.inp
		3064	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.dat.ref
		3065	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.frd.ref
		3066	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.inp
2961	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.dat.ref	3067	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.dat.ref
2962	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.frd.ref	3068	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.frd.ref
2963	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.inp	3069	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.inp
Lines 3126-3131 Link Here
3126	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20rs.inp	3232	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20rs.inp
3127	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel8ra.dat.ref	3233	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel8ra.dat.ref
3128	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel8ra.inp	3234	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel8ra.inp
		3235	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt1.bou
		3236	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt1.dat.ref
		3237	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt1.f
		3238	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt1.frd.ref
		3239	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt1.inp
		3240	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt2.dat.ref
		3241	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt2.f
		3242	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt2.frd.ref
		3243	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt2.inp
		3244	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt3.dat.ref
		3245	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt3.frd.ref
		3246	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt3.inc
		3247	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opt3.inp
3129	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.dat.ref	3248	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.dat.ref
3130	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.frd.ref	3249	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.frd.ref
3131	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.inp	3250	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pendel.inp
Lines 3303-3308 Link Here
3303	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell3.inp	3422	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell3.inp
3304	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell4.dat.ref	3423	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell4.dat.ref
3305	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell4.inp	3424	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell4.inp
		3425	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell5.dat.ref
		3426	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell5.frd.ref
		3427	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shell5.inp
3306	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellbeam.dat.ref	3428	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellbeam.dat.ref
3307	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellbeam.inp	3429	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellbeam.inp
3308	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellf.dat.ref	3430	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellf.dat.ref
Lines 3322-3327 Link Here
3322	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe3.inp	3444	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe3.inp
3323	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.dat.ref	3445	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.dat.ref
3324	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.inp	3446	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.inp
		3447	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe5.dat.ref
		3448	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe5.frd.ref
		3449	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe5.inp
		3450	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slant.dat.ref
		3451	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/slant.inp
3325	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.dat.ref	3452	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.dat.ref
3326	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.inp	3453	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.inp
3327	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solidshell1.dat.ref	3454	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solidshell1.dat.ref

Return to bug 234146

Lines 2-9 Link Here

(-)cad/calculix-ccx/Makefile (-9 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ccx	4	PORTNAME= ccx
5	PORTVERSION= 2.14	5	PORTVERSION= 2.15
6	PORTREVISION= 3
7	CATEGORIES= cad	6	CATEGORIES= cad
8	MASTER_SITES= http://www.dhondt.de/	7	MASTER_SITES= http://www.dhondt.de/
9	PKGNAMEPREFIX= CalculiX-	8	PKGNAMEPREFIX= CalculiX-
Lines 17-35 Link Here
17	LICENSE= GPLv2	16	LICENSE= GPLv2
18		17
19	LIB_DEPENDS= libarpack.so:math/arpack-ng \	18	LIB_DEPENDS= libarpack.so:math/arpack-ng \
20	libmetis.so:math/metis4 \	19	libspooles.so:math/spooles
21	libspooles.so:math/spooles \
22	libtaucs.so:math/taucs
23		20
		21	USES= blaslapack compiler:openmp fortran gmake tar:bzip2
		22	USE_PERL5= build
		23
24	DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX}	24	DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX}
25	DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX}	25	DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
26	DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX}	26	DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
27	DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX}	27	DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX}
28		28
29	USES= blaslapack compiler:openmp fortran gmake tar:bzip2 shebangfix
30	USE_PERL5= build
31	SHEBANG_FILES= date.pl
32
33	ALL_TARGET= #Empty	29	ALL_TARGET= #Empty
34		30
35	CCX_VER= ccx_${PORTVERSION}	31	CCX_VER= ccx_${PORTVERSION}

Lines 1-9 Link Here

(-)cad/calculix-ccx/files/patch-CalculiX.h (-5 / +5 lines)
1	--- CalculiX.h.orig 2018-04-28 14:05:18 UTC	1	--- CalculiX.h.orig 2018-12-15 14:30:31 UTC
2	+++ CalculiX.h	2	+++ CalculiX.h
3	@@ -16,12 +16,14 @@	3	@@ -18,12 +18,14 @@
4	/* along with this program; if not, write to the Free Software */
5	/* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
6		4
		5	#include <pthread.h>
		6
7	-#define Linux 1	7	-#define Linux 1
8	+#include <pthread.h>	8	+#include <pthread.h>
9	+	9	+
Lines 17-23 Link Here
17	#define FORTRAN(A,B) A##_ B	17	#define FORTRAN(A,B) A##_ B
18	#elif ARCH == IRIX \|\| ARCH == IRIX64	18	#elif ARCH == IRIX \|\| ARCH == IRIX64
19	#define FORTRAN(A,B) A##_##B	19	#define FORTRAN(A,B) A##_##B
20	@@ -29,7 +31,7 @@	20	@@ -31,7 +33,7 @@
21	#define FORTRAN(A,B) A##B	21	#define FORTRAN(A,B) A##B
22	#endif	22	#endif
23		23

Lines 1-10 Link Here

(-)cad/calculix-ccx/files/patch-Makefile (-7 / +7 lines)
1	--- Makefile.orig 2018-04-28 14:05:19 UTC	1	--- Makefile.orig 2018-12-15 14:30:33 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,9 +1,9 @@	3	@@ -1,9 +1,9 @@
4		4
5	-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT	5	-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
6	-FFLAGS = -Wall -O3	6	-FFLAGS = -Wall -O3
7	+CFLAGS += -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT -DTAUCS	7	+CFLAGS += -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
8	+FFLAGS += -O3	8	+FFLAGS += -O3
9		9
10	-CC=cc	10	-CC=cc
Lines 21-33 Link Here
21	- $(DIR)/spooles.a \	21	- $(DIR)/spooles.a \
22	- ../../../ARPACK/libarpack_INTEL.a \	22	- ../../../ARPACK/libarpack_INTEL.a \
23	- -lpthread -lm -lc	23	- -lpthread -lm -lc
24	+ -ltaucs -lmetis \	24	+ -lmetis \
25	+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \	25	+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
26	+ -lpthread -lm	26	+ -lpthread -lm
27		27
28	ccx_2.14: $(OCCXMAIN) ccx_2.14.a $(LIBS)	28	ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS)
29	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS)	29	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS)
30	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.14.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.14.a $(LIBS) $(LDFLAGS)	30	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) $(LDFLAGS)
31		31
32	ccx_2.14.a: $(OCCXF) $(OCCXC)	32	ccx_2.15.a: $(OCCXF) $(OCCXC)
33	ar vr $@ $?	33	ar vr $@ $?