6 files changed, 42 insertions, 30 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 4e989ec35d27..aded4a7fff36 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calculix
-PORTVERSION=	2.16.1
+PORTVERSION=	2.17
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -22,7 +22,7 @@ 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_2.16.pdf
+DIST_PDF=	cgx_${PORTVERSION}.pdf
 DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/CalculiX
@@ -63,6 +63,8 @@ pre-build:
 	s+"firefox"+"${BROWSER}"+ ; \
 	s+"gv"+"${PSVIEWER}"+ ;' \
 		${WRKSRC}/${CGX_VER}/src/cgx.h
+	@${REINPLACE_CMD} -e 's!CalculiX/${CGX_VER}/doc!share/doc/CalculiX!g;' \
+		${WRKSRC}/${CGX_VER}/src/cgx.h
 
 do-build:
 	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} )
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 2691b1db46f2..3a7e80398e5d 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1579642636
-SHA256 (calculix/cgx_2.16.1.all.tar.bz2) = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54
-SIZE (calculix/cgx_2.16.1.all.tar.bz2) = 5574753
-SHA256 (calculix/cgx_2.16.1.exa.tar.bz2) = 3bf64df5cc63eef1c2f3bc4a8fed292fe76c5fe2e035857bf51ef8578a04d57f
-SIZE (calculix/cgx_2.16.1.exa.tar.bz2) = 3914261
-SHA256 (calculix/cgx_2.16.1.htm.tar.bz2) = ed0107b6aa6a020ae616a9ffee8f02115a587d9482e6c599d8ab914bc68b4524
-SIZE (calculix/cgx_2.16.1.htm.tar.bz2) = 369390
-SHA256 (calculix/cgx_2.16.pdf) = b6d63ec1cddd1901de758eb18a68e1f123270cf0257042b10a0f364106e509f7
-SIZE (calculix/cgx_2.16.pdf) = 1426769
+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
diff --git a/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c b/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c
new file mode 100644
index 000000000000..fc6121dc46fd
--- /dev/null
+++ b/cad/calculix/files/patch-cgx__2.17_src_pickFunktions.c
@@ -0,0 +1,20 @@
+--- 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 bfdecf7ae9df..cf00ca1ef525 100644
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__VER_src_Makefile
@@ -1,6 +1,6 @@
---- cgx_2.16.1/src/Makefile.orig	2017-03-11 16:25:39 UTC
-+++ cgx_2.16.1/src/Makefile
-@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
+--- cgx_2.17/src/Makefile.orig	2020-02-18 18:22:00 UTC
++++ cgx_2.17/src/Makefile
+@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
    -I/usr/include/GL \
    -I../../libSNL/src \
    -I../../glut-3.5/src \
diff --git a/cad/calculix/files/patch-cgx__VER_src_cgx.h b/cad/calculix/files/patch-cgx__VER_src_cgx.h
deleted file mode 100644
index 73e2124f77c9..000000000000
--- a/cad/calculix/files/patch-cgx__VER_src_cgx.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- cgx_2.16.1/src/cgx.h.orig	2017-04-28 10:12:50 UTC
-+++ cgx_2.16.1/src/cgx.h
-@@ -89,8 +89,8 @@ rendering is done in the index-mode.
-     "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
-     "/usr/local/CalculiX/cgx_2.16.1/doc/aflib/aflib.pdf"}
- #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html"}
-+  #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
-+    "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
- #endif
- 
- /* html browser, change if necessary */
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index a54e05f7bf23..048171257d1c 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -3,7 +3,6 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
-%%PORTDOCS%%%%DOCSDIR%%/cgx/images.out
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.pl
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img1.png
@@ -40,6 +39,8 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img38.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img39.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img40.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img41.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img7.png
@@ -231,6 +232,9 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node261.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node262.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node263.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node264.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node265.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node266.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
@@ -311,7 +315,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.16.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -359,7 +363,6 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd