cad/calculix : update to version 2.16

In CalculiX CrunchiX (ccx) bring back the taucs solver with the new metis.
For Calculix GraphiX (cgx) drop patches that were upstreamed.

Release notes:  http://www.dhondt.de/new_calc.htm

Approved by:	thierry (mentor)

7 files changed, 29 insertions, 84 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 5139aeb519a1..5ca781c5118f 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calculix
-PORTVERSION=	2.15
-PORTREVISION=	1
+PORTVERSION=	2.16
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 209cb5fe0626..9592ec1db31c 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-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
+TIMESTAMP = 1577502634
+SHA256 (calculix/cgx_2.16.all.tar.bz2) = 8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1
+SIZE (calculix/cgx_2.16.all.tar.bz2) = 5500475
+SHA256 (calculix/cgx_2.16.exa.tar.bz2) = 3dedf12eefa72604144229bdda533b29235bbe6dea66a92b2e0127eee52d9dca
+SIZE (calculix/cgx_2.16.exa.tar.bz2) = 3927640
+SHA256 (calculix/cgx_2.16.htm.tar.bz2) = 3755d29c1975c99c575efc64453a6641039831733ffe940d1ba2b48794961177
+SIZE (calculix/cgx_2.16.htm.tar.bz2) = 370067
+SHA256 (calculix/cgx_2.16.pdf) = b6d63ec1cddd1901de758eb18a68e1f123270cf0257042b10a0f364106e509f7
+SIZE (calculix/cgx_2.16.pdf) = 1426769
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__VER_src_Makefile
index 4fbcc97f35be..7cb995ef7e45 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.15/src/Makefile.orig	2017-03-11 16:25:39 UTC
-+++ cgx_2.15/src/Makefile
+--- cgx_2.16/src/Makefile.orig	2017-03-11 16:25:39 UTC
++++ cgx_2.16/src/Makefile
 @@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
    -I/usr/include/GL \
    -I../../libSNL/src \
diff --git a/cad/calculix/files/patch-cgx__VER_src_cgx.h b/cad/calculix/files/patch-cgx__VER_src_cgx.h
index 58804cc748d2..7e23e5a22742 100644
--- a/cad/calculix/files/patch-cgx__VER_src_cgx.h
+++ b/cad/calculix/files/patch-cgx__VER_src_cgx.h
@@ -1,11 +1,11 @@
---- cgx_2.15/src/cgx.h.orig	2017-04-28 10:12:50 UTC
-+++ cgx_2.15/src/cgx.h
+--- cgx_2.16/src/cgx.h.orig	2017-04-28 10:12:50 UTC
++++ cgx_2.16/src/cgx.h
 @@ -89,8 +89,8 @@ rendering is done in the index-mode.
-     "/usr/local/CalculiX/ccx_2.15/doc/ccx/ccx.html",\
-     "/usr/local/CalculiX/cgx_2.15/doc/aflib/aflib.pdf"}
+     "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
+     "/usr/local/CalculiX/cgx_2.16/doc/aflib/aflib.pdf"}
  #else
--  #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/CalculiX/cgx_2.16/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
diff --git a/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp b/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
deleted file mode 100644
index 81ab0567c5fc..000000000000
--- a/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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"); 
-   buffer[0]='S';
--  buffer[1]=(char)NULL;
-+  buffer[1]='\0';
-   getNewName( name, buffer );
-   for (i=0; i<MAX_LINE_LENGTH; i++) sname[i]=name[i];
-   if(printFlag) printf ("store NURS Nr:%d Name:%s\n", anzGeo->nurs+1, name);
-@@ -1012,7 +1012,7 @@ int createBlendedNurbs(int nr, Points **
-     for (j=0; j<nurbs[nr].v_npnt; j++)
-     {
-       buffer[0]='p';
--      buffer[1]=(char)NULL;
-+      buffer[1]='\0';
-       getNewName( name, buffer );
-       nurbs[nr].ctlpnt[i][j]  = pnt( name, surface->controlPoints()[ index ].x(), surface->controlPoints()[ index ].y(), surface->controlPoints()[ index ].z(), 0);
-       point=*pntpntr;  /* update pointer */
diff --git a/cad/calculix/files/patch-dir.h b/cad/calculix/files/patch-dir.h
deleted file mode 100644
index 23b34714a038..000000000000
--- a/cad/calculix/files/patch-dir.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- cgx_2.15/src/readFoam.c.orig	2018-12-15 10:23:59.490288980 -0500
-+++ cgx_2.15/src/readFoam.c	2019-06-11 17:49:23.469502000 -0400
-@@ -4,7 +4,7 @@
- 
- 
- #include <cgx.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- 
- #define kappa    1.4
- 
-@@ -289,7 +289,7 @@
-   int eface[8], sum_dir, ncomps;
-   FILE *handle;
-   DIR *dirp;
--  struct direct *dp;
-+  struct dirent *dp;
-   Rsort *rsort=NULL;
-   Ds ds;
- 
---- cgx_2.15/src/setFunktions.c.orig	2019-06-11 17:50:19.651248000 -0400
-+++ cgx_2.15/src/setFunktions.c	2019-06-11 17:50:41.211341000 -0400
-@@ -30,7 +30,7 @@
- */
- 
- #include <cgx.h>
--#include <sys/dir.h>
-+#include <dirent.h>
- #include <xwd.h>
- 
- 
-@@ -11859,7 +11859,7 @@
-   int pics;
-   int pnts[3];
-   DIR *dirp;
--  struct direct *dp;
-+  struct dirent *dp;
-   static int ifFlag=1, whileFlag=1, returnFlag=1;
-   Scale scaleSet[1];
- 
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 25a6cd55faba..5ef1fae033c8 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -39,6 +39,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img36.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img37.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img38.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img39.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
@@ -222,7 +223,13 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node253.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node254.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node255.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node256.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node257.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node258.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node259.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node260.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node261.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
@@ -303,7 +310,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.15.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.16.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -349,13 +356,11 @@ 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/rae2822_penta.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
@@ -417,4 +422,5 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/generate.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/normals.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/temperature.fbl