mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-26 09:46:09 +00:00
Code Issues Releases Activity

cad/calculix: Update to 2.15.

Browse Source 
CalculiX GraphiX changelog:
	http://www.dhondt.de/new_calc.htm
Save from deprecation.

PR:		234131
Approved by:	thierry (mentor)
This commit is contained in:
Pedro F. Giffuni 2019-04-19 17:16:35 +00:00
parent 8523c47808
commit 4048cf030b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=499378
7 changed files with 35 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cad/calculix/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= calculix
PORTVERSION= 2.14
PORTREVISION= 2
PORTVERSION= 2.15
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
DISTFILES= ${DIST_SOURCES}
@ -15,13 +14,14 @@ COMMENT= Three-Dimensional Structural Finite Element Program
LICENSE= GPLv2
BROKEN= checksum and size mismatch
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2019-03-05
BROKEN_aarch64= fails to link: shapeFunctions.c:(function attach_new): relocation R_AARCH64_CALL26 out of range
RUN_DEPENDS= ccx:cad/calculix-ccx
USES= gmake tar:bzip2 compiler:c++11-lib
USE_XORG= ice sm x11 xext xi xmu xt
USE_GL= gl glu # uses its own glut
DIST_SOURCES= cgx_${PORTVERSION}.all${EXTRACT_SUFX}
DIST_HTM= cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
DIST_PDF= cgx_${PORTVERSION}.pdf
@ -30,15 +30,11 @@ DIST_EXAMPLES= cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/CalculiX
CGX_VER= cgx_${PORTVERSION}
USES= gmake tar:bzip2 compiler:c++11-lib
USE_XORG= ice sm x11 xext xi xmu xt
USE_GL= gl glu # uses its own glut
CXXFLAGS+= -std=c++98
BROWSER?= firefox
PSVIEWER?= gv
CXXFLAGS+= -std=c++98
OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.port.options.mk>

18
cad/calculix/distinfo
View File

@ -1,9 +1,9 @@
TIMESTAMP = 1526334631
SHA256 (calculix/cgx_2.14.all.tar.bz2) = 7ed16261749a2a62c77ad0631e5a1f001566aad62cd3e71fcbe2c9ce507f3712
SIZE (calculix/cgx_2.14.all.tar.bz2) = 4546855
SHA256 (calculix/cgx_2.14.exa.tar.bz2) = b922ba2bbd5662d05e1e9d6da1189a80fc341dfb1c46bcc19d89de56e6e67fc3
SIZE (calculix/cgx_2.14.exa.tar.bz2) = 3030018
SHA256 (calculix/cgx_2.14.htm.tar.bz2) = 20952ebb3d733a135c089a42473e15c119bd14b04e4fe73d858505d453267c0b
SIZE (calculix/cgx_2.14.htm.tar.bz2) = 336313
SHA256 (calculix/cgx_2.14.pdf) = dc9c30470e678953d1c4efcdff10a55122bd29f88fe520a43c548f178d9082f1
SIZE (calculix/cgx_2.14.pdf) = 1304642
TIMESTAMP = 1555653315
SHA256 (calculix/cgx_2.15.all.tar.bz2) = 86f65e111811939e0dff9cdc2b17d0d1720e34100ae099845f0deaf4761fcb98
SIZE (calculix/cgx_2.15.all.tar.bz2) = 5467670
SHA256 (calculix/cgx_2.15.exa.tar.bz2) = 10dbb18b1a52730d4a55d94eb1e9b10ccd3f3ce0a688814710d31c05cc798997
SIZE (calculix/cgx_2.15.exa.tar.bz2) = 3928308
SHA256 (calculix/cgx_2.15.htm.tar.bz2) = fd9bbb71175016e8e8c4b4e39479697cdcb9cf521c6fe518860f3cdb9fa33bc7
SIZE (calculix/cgx_2.15.htm.tar.bz2) = 338838
SHA256 (calculix/cgx_2.15.pdf) = 6640a20bfe4e1fff8e422ae9f1228f386a7eb15aeca8d49cb63cf2c8148245a9
SIZE (calculix/cgx_2.15.pdf) = 1320172

4
cad/calculix/files/patch-cgx__VER_src_Makefile
View File

@ -1,5 +1,5 @@
--- cgx_2.14/src/Makefile.orig 2017-03-11 16:25:39 UTC
+++ cgx_2.14/src/Makefile
--- cgx_2.15/src/Makefile.orig 2017-03-11 16:25:39 UTC
+++ cgx_2.15/src/Makefile
@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
-I/usr/include/GL \
-I../../libSNL/src \

12
cad/calculix/files/patch-cgx__VER_src_cgx.h
View File

@ -1,11 +1,11 @@
--- cgx_2.14/src/cgx.h.orig 2017-04-28 10:12:50 UTC
+++ cgx_2.14/src/cgx.h
--- cgx_2.15/src/cgx.h.orig 2017-04-28 10:12:50 UTC
+++ cgx_2.15/src/cgx.h
@@ -89,8 +89,8 @@ rendering is done in the index-mode.
"/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html",\
"/usr/local/CalculiX/cgx_2.14/doc/aflib/aflib.pdf"}
"/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html",\
"/usr/local/CalculiX/cgx_2.15/doc/aflib/aflib.pdf"}
#else
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.14/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html"}
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.15/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html"}
+ #define HELPFILE {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
+ "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
#endif

27
cad/calculix/files/patch-cgx__VER_src_extUtil.h
View File

@ -1,27 +0,0 @@
--- cgx_2.14/src/extUtil.h.orig 2017-04-28 10:12:50 UTC
+++ cgx_2.14/src/extUtil.h
@@ -9,6 +9,7 @@
#else
#define DEV_NULL " >/dev/null"
#define DEV_NULL2 " 2>/dev/null"
+ #include <sys/param.h>
#include <unistd.h>
#endif
@@ -52,12 +53,10 @@ void printf_fflush(const char *fmt,...);
/* from #include "f2c.h" */
#define abs(x) ((x) >= 0 ? (x) : -(x))
#define dabs(x) (double)abs(x)
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#define smin(a,b) (float)min(a,b)
-#define smax(a,b) (float)max(a,b)
-#define dmin(a,b) (double)min(a,b)
-#define dmax(a,b) (double)max(a,b)
+#define smin(a,b) (float)MIN(a,b)
+#define smax(a,b) (float)MAX(a,b)
+#define dmin(a,b) (double)MIN(a,b)
+#define dmax(a,b) (double)MAX(a,b)
typedef struct {

4
cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
View File

@ -1,5 +1,5 @@
--- cgx_2.14/src/uselibSNL.cpp.orig 2017-10-07 09:58:00 UTC
+++ cgx_2.14/src/uselibSNL.cpp
--- cgx_2.15/src/uselibSNL.cpp.orig 2017-10-07 09:58:00 UTC
+++ cgx_2.15/src/uselibSNL.cpp
@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
// (5) create the cgx nurbs
// printf(" create blended nurbs\n");

12
cad/calculix/pkg-plist
View File

@ -219,6 +219,9 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node251.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node252.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node253.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node254.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node255.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
@ -300,7 +303,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.14.pdf
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.15.pdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@ -346,8 +349,10 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.cvg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822f.cvg
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
@ -380,9 +385,9 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo2.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
@ -400,10 +405,13 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.12d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbb
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl