cad/calculix: Update to 2.20

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

5 files changed, 22 insertions, 26 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index c1e1b4f52ec4..1dd137a94ff8 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	calculix
-PORTVERSION=	2.19
+PORTVERSION=	2.20
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 8ef34118fed6..075f63b4b3dc 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1643750229
-SHA256 (calculix/cgx_2.19.all.tar.bz2) = 598121372373b679a228c85d25c7e549489a38535d82f025acb750f831afe546
-SIZE (calculix/cgx_2.19.all.tar.bz2) = 5706254
-SHA256 (calculix/cgx_2.19.exa.tar.bz2) = e87ad00b728e958e6c431799443030db684e86a026d83007b6c777f363ecb71c
-SIZE (calculix/cgx_2.19.exa.tar.bz2) = 3918398
-SHA256 (calculix/cgx_2.19.htm.tar.bz2) = 8cbea1d807e58a9fce8bb21bb302f36939915b0979c1501ed31659ed400e2d8b
-SIZE (calculix/cgx_2.19.htm.tar.bz2) = 378446
-SHA256 (calculix/cgx_2.19.pdf) = 4ea6d3477ddfa8e302595185d08b0d116da5ea12b53d745ad947bca88f14e5d8
-SIZE (calculix/cgx_2.19.pdf) = 1492713
+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
diff --git a/cad/calculix/files/patch-cgx__2.19_src_pickFunktions.c b/cad/calculix/files/patch-cgx__2.19_src_pickFunktions.c
deleted file mode 100644
index 0994414a60ec..000000000000
--- a/cad/calculix/files/patch-cgx__2.19_src_pickFunktions.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_2.19/src/pickFunktions.c.orig	2021-09-18 09:40:04 UTC
-+++ cgx_2.19/src/pickFunktions.c
-@@ -4594,7 +4594,7 @@ void moveLineEndPoint(int lineNr, int pntNr, double ll
-     else
-     {
-       printf("ERROR: selected point:%s is no line endpoint\n", point[pntNr].name);
--      return(-1);
-+      return;
-     }
-     u=flag*llength;
-     u/=scale->w;
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__2.20_src_Makefile
index 991d488e14d7..cf33c6764675 100644
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__2.20_src_Makefile
@@ -1,6 +1,6 @@
---- cgx_2.19/src/Makefile.orig	2021-03-11 17:35:46 UTC
-+++ cgx_2.19/src/Makefile
-@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
+--- cgx_2.20/src/Makefile.orig	2022-07-29 09:41:00 UTC
++++ cgx_2.20/src/Makefile
+@@ -5,11 +5,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
    -I/usr/include/GL \
    -I../../libSNL/src \
    -I../../glut-3.5/src \
@@ -15,7 +15,7 @@
    -lm -lpthread -lrt
  
  
-@@ -66,7 +66,7 @@ OULIB = $(ULIB:.c=.o)
+@@ -67,7 +67,7 @@ OULIB = $(ULIB:.c=.o)
  OUTIL = $(SUTIL:.c=.o)
  
  cgx: $(OLIB) $(OUTIL) $(OULIB)
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 3482c5eb69ce..b893cadf0bbf 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -324,7 +324,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.19.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.20.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -369,6 +369,9 @@ 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
@@ -389,6 +392,7 @@ 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
@@ -408,12 +412,15 @@ bin/cgx
 %%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/writedemo.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
 %%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