cad/calculix : update to version 2.17.1

PR:	249459
Approved by:	thierry (mentor, implicit)

5 files changed, 14 insertions, 33 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index aded4a7fff36..48a49dcf720c 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calculix
-PORTVERSION=	2.17
+PORTVERSION=	2.17.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 3a7e80398e5d..380263f3785d 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1597108360
-SHA256 (calculix/cgx_2.17.all.tar.bz2) = 01b32864714d7ed7c760567e3a04077f3e41fe171d1804b305c96c344b0e4d2e
-SIZE (calculix/cgx_2.17.all.tar.bz2) = 5728571
-SHA256 (calculix/cgx_2.17.exa.tar.bz2) = 2f07e51d82ec90c503c2124e1291bfb7307cdd6f00be8f723f639d450e7dd1ed
-SIZE (calculix/cgx_2.17.exa.tar.bz2) = 3922236
-SHA256 (calculix/cgx_2.17.htm.tar.bz2) = a5b87d450e649bc891c6809b7132748cfedbc1a7565ef52a31e53f7773222b9a
-SIZE (calculix/cgx_2.17.htm.tar.bz2) = 370927
-SHA256 (calculix/cgx_2.17.pdf) = 2e3bc85af86bf1d79149e4bf0d8bacb64775f0f30ad851b0d827a60417c46d50
-SIZE (calculix/cgx_2.17.pdf) = 1197386
+TIMESTAMP = 1600795203
+SHA256 (calculix/cgx_2.17.1.all.tar.bz2) = 3fcd2ec59fd65e3b51cacf4c6ace21bf36570ea4527ba9840e52c96736c4dc0f
+SIZE (calculix/cgx_2.17.1.all.tar.bz2) = 5785730
+SHA256 (calculix/cgx_2.17.1.exa.tar.bz2) = 6aab76b368155933fa6894aacc27499f64e15534f4d34ea6810b1697a14bc825
+SIZE (calculix/cgx_2.17.1.exa.tar.bz2) = 3919545
+SHA256 (calculix/cgx_2.17.1.htm.tar.bz2) = 907a508856e3e5593f451facfdfa1cdfdc303b632165b7a20e8f7a566b57e36d
+SIZE (calculix/cgx_2.17.1.htm.tar.bz2) = 370298
+SHA256 (calculix/cgx_2.17.1.pdf) = f47918ccf3c041acb933ee45e112e58250547a6dde7ac649e9fa6d9ea7613527
+SIZE (calculix/cgx_2.17.1.pdf) = 1197112
diff --git a/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c b/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c
deleted file mode 100644
index fc6121dc46fd..000000000000
--- a/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- cgx_2.17/src/pickFunktions.c.orig	2020-08-10 20:32:48.506717000 -0500
-+++ cgx_2.17/src/pickFunktions.c	2020-08-10 20:35:44.407066000 -0500
-@@ -283,7 +283,7 @@ int hitAction( GLuint *name, char *type, int x, int y 
-     {
-       delSet(specialset->impc);
-       setNrbuf=pre_seta( specialset->impc, "i", 0);
--      if(setNrbuf<0) { errMsg(" ERROR: could not create set for qdis\n"); return; } 
-+      if(setNrbuf<0) { errMsg(" ERROR: could not create set for qdis\n"); return(0); } 
-       seta( setNrbuf, type, name[1]);
-       
-       /* complete the set by all connected faces which do not violate the tolerance */
-@@ -1214,7 +1214,7 @@ int hitAction( GLuint *name, char *type, int x, int y 
-     {
-       delSet(specialset->impc);
-       setNrbuf=pre_seta( specialset->impc, "i", 0);
--      if(setNrbuf<0) { errMsg(" ERROR: could not create set for qdis\n"); return; } 
-+      if(setNrbuf<0) { errMsg(" ERROR: could not create set for qdis\n"); return(0); } 
-       seta( setNrbuf, type, name[1]);
-       qaddTol=0;  // marker
-     }
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__VER_src_Makefile
index cf00ca1ef525..ab664be54b69 100644
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__VER_src_Makefile
@@ -1,5 +1,5 @@
---- cgx_2.17/src/Makefile.orig	2020-02-18 18:22:00 UTC
-+++ cgx_2.17/src/Makefile
+--- cgx_2.17.1/src/Makefile.orig	2020-02-18 18:22:00 UTC
++++ cgx_2.17.1/src/Makefile
 @@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
    -I/usr/include/GL \
    -I../../libSNL/src \
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 048171257d1c..95eab5f30480 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -235,6 +235,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node264.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node265.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node266.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node267.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
@@ -315,7 +316,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.1.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U