View | Details | Raw Unified | Return to bug 234131 | Differences between
and this patch

Collapse All | Expand All

(-)cad/calculix/Makefile (-10 / +6 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	calculix
4
PORTNAME=	calculix
5
PORTVERSION=	2.14
5
PORTVERSION=	2.15
6
PORTREVISION=	2
7
CATEGORIES=	cad
6
CATEGORIES=	cad
8
MASTER_SITES=	http://www.dhondt.de/
7
MASTER_SITES=	http://www.dhondt.de/
9
DISTFILES=	${DIST_SOURCES}
8
DISTFILES=	${DIST_SOURCES}
Lines 15-27 Link Here
15
14
16
LICENSE=	GPLv2
15
LICENSE=	GPLv2
17
16
18
BROKEN=		checksum and size mismatch
19
DEPRECATED=	Broken for more than 6 months
20
EXPIRATION_DATE=	2019-03-05
21
BROKEN_aarch64=		fails to link: shapeFunctions.c:(function attach_new): relocation R_AARCH64_CALL26 out of range
17
BROKEN_aarch64=		fails to link: shapeFunctions.c:(function attach_new): relocation R_AARCH64_CALL26 out of range
22
18
23
RUN_DEPENDS=	ccx:cad/calculix-ccx
19
RUN_DEPENDS=	ccx:cad/calculix-ccx
24
20
21
USES=		gmake tar:bzip2 compiler:c++11-lib
22
USE_XORG=	ice sm x11 xext xi xmu xt
23
USE_GL=		gl glu # uses its own glut
24
25
DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
25
DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
26
DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
26
DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
27
DIST_PDF=	cgx_${PORTVERSION}.pdf
27
DIST_PDF=	cgx_${PORTVERSION}.pdf
Lines 30-44 Link Here
30
WRKSRC=		${WRKDIR}/CalculiX
30
WRKSRC=		${WRKDIR}/CalculiX
31
CGX_VER=	cgx_${PORTVERSION}
31
CGX_VER=	cgx_${PORTVERSION}
32
32
33
USES=		gmake tar:bzip2 compiler:c++11-lib
33
CXXFLAGS+=	-std=c++98
34
USE_XORG=	ice sm x11 xext xi xmu xt
35
USE_GL=		gl glu # uses its own glut
36
34
37
BROWSER?=	firefox
35
BROWSER?=	firefox
38
PSVIEWER?=	gv
36
PSVIEWER?=	gv
39
37
40
CXXFLAGS+=	-std=c++98
41
42
OPTIONS_DEFINE=	DOCS EXAMPLES
38
OPTIONS_DEFINE=	DOCS EXAMPLES
43
39
44
.include <bsd.port.options.mk>
40
.include <bsd.port.options.mk>
(-)cad/calculix/distinfo (-9 / +9 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1526334631
1
TIMESTAMP = 1555653315
2
SHA256 (calculix/cgx_2.14.all.tar.bz2) = 7ed16261749a2a62c77ad0631e5a1f001566aad62cd3e71fcbe2c9ce507f3712
2
SHA256 (calculix/cgx_2.15.all.tar.bz2) = 86f65e111811939e0dff9cdc2b17d0d1720e34100ae099845f0deaf4761fcb98
3
SIZE (calculix/cgx_2.14.all.tar.bz2) = 4546855
3
SIZE (calculix/cgx_2.15.all.tar.bz2) = 5467670
4
SHA256 (calculix/cgx_2.14.exa.tar.bz2) = b922ba2bbd5662d05e1e9d6da1189a80fc341dfb1c46bcc19d89de56e6e67fc3
4
SHA256 (calculix/cgx_2.15.exa.tar.bz2) = 10dbb18b1a52730d4a55d94eb1e9b10ccd3f3ce0a688814710d31c05cc798997
5
SIZE (calculix/cgx_2.14.exa.tar.bz2) = 3030018
5
SIZE (calculix/cgx_2.15.exa.tar.bz2) = 3928308
6
SHA256 (calculix/cgx_2.14.htm.tar.bz2) = 20952ebb3d733a135c089a42473e15c119bd14b04e4fe73d858505d453267c0b
6
SHA256 (calculix/cgx_2.15.htm.tar.bz2) = fd9bbb71175016e8e8c4b4e39479697cdcb9cf521c6fe518860f3cdb9fa33bc7
7
SIZE (calculix/cgx_2.14.htm.tar.bz2) = 336313
7
SIZE (calculix/cgx_2.15.htm.tar.bz2) = 338838
8
SHA256 (calculix/cgx_2.14.pdf) = dc9c30470e678953d1c4efcdff10a55122bd29f88fe520a43c548f178d9082f1
8
SHA256 (calculix/cgx_2.15.pdf) = 6640a20bfe4e1fff8e422ae9f1228f386a7eb15aeca8d49cb63cf2c8148245a9
9
SIZE (calculix/cgx_2.14.pdf) = 1304642
9
SIZE (calculix/cgx_2.15.pdf) = 1320172
(-)cad/calculix/files/patch-cgx__VER_src_Makefile (-2 / +2 lines)
Lines 1-5 Link Here
1
--- cgx_2.14/src/Makefile.orig	2017-03-11 16:25:39 UTC
1
--- cgx_2.15/src/Makefile.orig	2017-03-11 16:25:39 UTC
2
+++ cgx_2.14/src/Makefile
2
+++ cgx_2.15/src/Makefile
3
@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
3
@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
4
   -I/usr/include/GL \
4
   -I/usr/include/GL \
5
   -I../../libSNL/src \
5
   -I../../libSNL/src \
(-)cad/calculix/files/patch-cgx__VER_src_cgx.h (-6 / +6 lines)
Lines 1-11 Link Here
1
--- cgx_2.14/src/cgx.h.orig	2017-04-28 10:12:50 UTC
1
--- cgx_2.15/src/cgx.h.orig	2017-04-28 10:12:50 UTC
2
+++ cgx_2.14/src/cgx.h
2
+++ cgx_2.15/src/cgx.h
3
@@ -89,8 +89,8 @@ rendering is done in the index-mode.
3
@@ -89,8 +89,8 @@ rendering is done in the index-mode.
4
     "/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html",\
4
     "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html",\
5
     "/usr/local/CalculiX/cgx_2.14/doc/aflib/aflib.pdf"}
5
     "/usr/local/CalculiX/cgx_2.15/doc/aflib/aflib.pdf"}
6
 #else
6
 #else
7
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.14/doc/cgx/cgx.html",\
7
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.15/doc/cgx/cgx.html",\
8
-    "/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html"}
8
-    "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html"}
9
+  #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
9
+  #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
10
+    "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
10
+    "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
11
 #endif
11
 #endif
(-)cad/calculix/files/patch-cgx__VER_src_extUtil.h (-27 lines)
Lines 1-27 Link Here
1
--- cgx_2.14/src/extUtil.h.orig	2017-04-28 10:12:50 UTC
2
+++ cgx_2.14/src/extUtil.h
3
@@ -9,6 +9,7 @@
4
 #else
5
   #define DEV_NULL   " >/dev/null"
6
   #define DEV_NULL2 " 2>/dev/null"
7
+  #include <sys/param.h>
8
   #include <unistd.h>
9
 #endif
10
 
11
@@ -52,12 +53,10 @@ void printf_fflush(const char *fmt,...);
12
 /* from #include "f2c.h" */
13
 #define abs(x) ((x) >= 0 ? (x) : -(x))
14
 #define dabs(x) (double)abs(x)
15
-#define min(a,b) ((a) <= (b) ? (a) : (b))
16
-#define max(a,b) ((a) >= (b) ? (a) : (b))
17
-#define smin(a,b) (float)min(a,b)
18
-#define smax(a,b) (float)max(a,b)
19
-#define dmin(a,b) (double)min(a,b)
20
-#define dmax(a,b) (double)max(a,b)
21
+#define smin(a,b) (float)MIN(a,b)
22
+#define smax(a,b) (float)MAX(a,b)
23
+#define dmin(a,b) (double)MIN(a,b)
24
+#define dmax(a,b) (double)MAX(a,b)
25
 
26
 
27
 typedef struct {
(-)cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp (-2 / +2 lines)
Lines 1-5 Link Here
1
--- cgx_2.14/src/uselibSNL.cpp.orig	2017-10-07 09:58:00 UTC
1
--- cgx_2.15/src/uselibSNL.cpp.orig	2017-10-07 09:58:00 UTC
2
+++ cgx_2.14/src/uselibSNL.cpp
2
+++ cgx_2.15/src/uselibSNL.cpp
3
@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
3
@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
4
   // (5)   create the cgx nurbs
4
   // (5)   create the cgx nurbs
5
   // printf(" create blended nurbs\n"); 
5
   // printf(" create blended nurbs\n"); 
(-)cad/calculix/pkg-plist (-2 / +10 lines)
Lines 219-224 Link Here
219
%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
219
%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
220
%%PORTDOCS%%%%DOCSDIR%%/cgx/node251.html
220
%%PORTDOCS%%%%DOCSDIR%%/cgx/node251.html
221
%%PORTDOCS%%%%DOCSDIR%%/cgx/node252.html
221
%%PORTDOCS%%%%DOCSDIR%%/cgx/node252.html
222
%%PORTDOCS%%%%DOCSDIR%%/cgx/node253.html
223
%%PORTDOCS%%%%DOCSDIR%%/cgx/node254.html
224
%%PORTDOCS%%%%DOCSDIR%%/cgx/node255.html
222
%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
225
%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
223
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
226
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
224
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
227
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
Lines 300-306 Link Here
300
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
303
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
301
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
304
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
302
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
305
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
303
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.14.pdf
306
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.15.pdf
304
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
307
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
305
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
308
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
306
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
309
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
Lines 346-353 Link Here
346
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
349
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
347
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
350
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
348
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
351
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
352
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.cvg
349
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
353
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
350
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
354
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
355
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822f.cvg
351
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
356
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
352
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
357
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
353
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
358
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
Lines 380-388 Link Here
380
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
385
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
381
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
386
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
382
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
387
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
388
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/README
383
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
389
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
384
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
390
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
385
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo2.fbl
386
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
391
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
387
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
392
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
388
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
393
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
Lines 400-409 Link Here
400
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
405
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
401
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
406
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
402
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
407
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
408
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.12d
403
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
409
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
404
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
410
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
405
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
411
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
406
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
412
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
413
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
414
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbb
407
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
415
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
408
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
416
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
409
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
417
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl

Return to bug 234131