cad/calculix: Update to 2.21

ChangeLog: http://www.dhondt.de/new_calc.htm

PR:		272889
Reported by:	rsmith@xs4all.nl (maintainer)

4 files changed, 17 insertions, 23 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 09924bb06395..575a7f379c06 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	calculix
-PORTVERSION=	2.20
-PORTREVISION=	1
+PORTVERSION=	2.21
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 075f63b4b3dc..fc9a30014fe3 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1663157421
-SHA256 (calculix/cgx_2.20.all.tar.bz2) = f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
-SIZE (calculix/cgx_2.20.all.tar.bz2) = 5700948
-SHA256 (calculix/cgx_2.20.exa.tar.bz2) = 3fc8520ec934f916c554693ddf46ff750de0dbc91df37790bb590926d05d12d0
-SIZE (calculix/cgx_2.20.exa.tar.bz2) = 4207519
-SHA256 (calculix/cgx_2.20.htm.tar.bz2) = 8eb979caa6d965a146e4b70bb288a07448e8de9d90b8c28b9a15030f4df80da0
-SIZE (calculix/cgx_2.20.htm.tar.bz2) = 380994
-SHA256 (calculix/cgx_2.20.pdf) = 8f01e61571cedee1d1fe045eac16b2839db5a8b044b914e7e781301b23fed53a
-SIZE (calculix/cgx_2.20.pdf) = 1223026
+TIMESTAMP = 1690913771
+SHA256 (calculix/cgx_2.21.all.tar.bz2) = 55ae561903df011e944d7f82f9e00039dbc4c68ac9195a5a862d446eb56bcfc1
+SIZE (calculix/cgx_2.21.all.tar.bz2) = 5758392
+SHA256 (calculix/cgx_2.21.htm.tar.bz2) = f2c8aa71f4c81a537e7f3fffa62862b1f617d95ac31ac41a994799df7d28824f
+SIZE (calculix/cgx_2.21.htm.tar.bz2) = 384268
+SHA256 (calculix/cgx_2.21.pdf) = 0b392abde2041f7d646c668d42bf317487884fae2153145fdd7cb9ccd2496a5e
+SIZE (calculix/cgx_2.21.pdf) = 1240552
+SHA256 (calculix/cgx_2.21.exa.tar.bz2) = 0569cdeca93eab827277904519e7b5f7b04a1326e7a3a11cc148f3dde585c054
+SIZE (calculix/cgx_2.21.exa.tar.bz2) = 3917880
diff --git a/cad/calculix/files/patch-cgx__2.20_src_Makefile b/cad/calculix/files/patch-cgx__2.20_src_Makefile
index cf33c6764675..a27e25b9828b 100644
--- a/cad/calculix/files/patch-cgx__2.20_src_Makefile
+++ b/cad/calculix/files/patch-cgx__2.20_src_Makefile
@@ -1,5 +1,5 @@
---- cgx_2.20/src/Makefile.orig	2022-07-29 09:41:00 UTC
-+++ cgx_2.20/src/Makefile
+--- cgx_2.21/src/Makefile.orig	2022-07-29 09:41:00 UTC
++++ cgx_2.21/src/Makefile
 @@ -5,11 +5,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
    -I/usr/include/GL \
    -I../../libSNL/src \
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index b893cadf0bbf..b5a6fa164a37 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -245,6 +245,10 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node270.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node271.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node272.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node273.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node274.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node275.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node276.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node3.html
@@ -324,7 +328,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.20.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.21.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -369,9 +373,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.cvg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.fcv
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
@@ -392,7 +393,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cad/halter.stp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cad/halter.vda
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clean
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clean~
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/lavff.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/lavffcyc.inp
@@ -407,7 +407,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dolfyn/mirror/spiegel.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/geometry.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
@@ -420,7 +419,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png
@@ -428,17 +426,14 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/post.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl