diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index 7d680a75189c..dc30f36856ac 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ccx
-PORTVERSION=	2.16
-PORTREVISION=	2
+PORTVERSION=	2.17
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 PKGNAMEPREFIX=	CalculiX-
diff --git a/cad/calculix-ccx/distinfo b/cad/calculix-ccx/distinfo
index be5da060260c..c43912445239 100644
--- a/cad/calculix-ccx/distinfo
+++ b/cad/calculix-ccx/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1577502528
-SHA256 (calculix/ccx_2.16.src.tar.bz2) = ebd95a0e4d52a3a8fb969eefc85417c82f649f25526bb6d83d69868ab44d47b7
-SIZE (calculix/ccx_2.16.src.tar.bz2) = 1400083
-SHA256 (calculix/ccx_2.16.htm.tar.bz2) = 035d99f01d7e85e04d4e1a1c8918489c8a39e0b3fb20cbfc604f03adbe1cef0f
-SIZE (calculix/ccx_2.16.htm.tar.bz2) = 2501636
-SHA256 (calculix/ccx_2.16.ps.tar.bz2) = bcae0c31bd36bcf7b92747f81f9b71fed12256e31a970670a713133fea5b73b2
-SIZE (calculix/ccx_2.16.ps.tar.bz2) = 3826593
-SHA256 (calculix/ccx_2.16.test.tar.bz2) = fcbeb4d03a960ec26b5027fd729f6a13b607ab5fece4c5673c16fa740592f687
-SIZE (calculix/ccx_2.16.test.tar.bz2) = 10613987
+TIMESTAMP = 1597089998
+SHA256 (calculix/ccx_2.17.src.tar.bz2) = ca708ad4aa729d9f84a9faba343c1bcc0b7cc84ed372616ebb55c8e6fa8f6e50
+SIZE (calculix/ccx_2.17.src.tar.bz2) = 1503269
+SHA256 (calculix/ccx_2.17.htm.tar.bz2) = 1af8f5e48d5a09637428e69a606fbd21beb719ab3dda9ff8ffed7545e15d6dcc
+SIZE (calculix/ccx_2.17.htm.tar.bz2) = 2658834
+SHA256 (calculix/ccx_2.17.ps.tar.bz2) = 41ec913a759c7f8da618c62278c1bf9dda89b7ad4fbe22289aff5a8647a1830d
+SIZE (calculix/ccx_2.17.ps.tar.bz2) = 4126329
+SHA256 (calculix/ccx_2.17.test.tar.bz2) = 798f94e536197bb10a74bae096f2a29a5111239020e7d10f93e1ad3d90c370cf
+SIZE (calculix/ccx_2.17.test.tar.bz2) = 12396359
diff --git a/cad/calculix-ccx/files/patch-Makefile b/cad/calculix-ccx/files/patch-Makefile
index be2751a210bb..20d406555718 100644
--- a/cad/calculix-ccx/files/patch-Makefile
+++ b/cad/calculix-ccx/files/patch-Makefile
@@ -1,12 +1,11 @@
---- Makefile.orig	2019-11-25 17:54:53 UTC
+--- Makefile.orig	2020-07-23 19:41:38 UTC
 +++ Makefile
-@@ -1,9 +1,10 @@
+@@ -1,9 +1,9 @@
  
 -CFLAGS = -Wall -O2  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
--FFLAGS = -Wall -O2 
-+CFLAGS += -O2 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT \
-+	  -DUSE_MT=1
-+FFLAGS += -O2 
+-FFLAGS = -Wall -O2
++CFLAGS += -O2  -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
++FFLAGS += -O2
  
 -CC=cc
 -FC=gfortran
@@ -15,19 +14,19 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -21,12 +22,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
+@@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
  DIR=../../../SPOOLES.2.2
  
  LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lpthread -lm -lc
-+	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
-+	-lpthread -lm
++       -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
++       -lpthread -lm
  
- ccx_2.16: $(OCCXMAIN) ccx_2.16.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.16.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.16.a $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.16.c; $(FC)  -O2 -o $@ $(OCCXMAIN) ccx_2.16.a $(LIBS) $(LDFLAGS)
+ ccx_2.17: $(OCCXMAIN) ccx_2.17.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
  
- ccx_2.16.a: $(OCCXF) $(OCCXC)
+ ccx_2.17.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/calculix-ccx/files/patch-date.pl b/cad/calculix-ccx/files/patch-date.pl
index 638b0aee2a1b..3151d033dab8 100644
--- a/cad/calculix-ccx/files/patch-date.pl
+++ b/cad/calculix-ccx/files/patch-date.pl
@@ -1,4 +1,4 @@
---- date.pl.orig	2019-11-25 17:54:53 UTC
+--- date.pl.orig	2020-07-23 19:41:38 UTC
 +++ date.pl
 @@ -1,6 +1,7 @@
  #!/usr/bin/env perl
@@ -7,5 +7,5 @@
 +use POSIX qw(strftime);
 +chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} || time)));
  
- # inserting the date into ccx_2.16.c
+ # inserting the date into ccx_2.17.c
  
diff --git a/cad/calculix-ccx/pkg-plist b/cad/calculix-ccx/pkg-plist
index 71be78035c68..b6b002a90006 100644
--- a/cad/calculix-ccx/pkg-plist
+++ b/cad/calculix-ccx/pkg-plist
@@ -1751,28 +1751,229 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img2571.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img2572.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img2573.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2574.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2575.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2576.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2577.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2578.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2579.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img258.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2580.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2581.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2582.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2583.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2584.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2585.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2586.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2587.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2588.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2589.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img259.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2590.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2591.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2592.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2593.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2594.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2595.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2596.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2597.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2598.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2599.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img26.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img260.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2600.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2601.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2602.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2603.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2604.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2605.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2606.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2607.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2608.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2609.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img261.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2610.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2611.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2612.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2613.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2614.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2615.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2616.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2617.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2618.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2619.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img262.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2620.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2621.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2622.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2623.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2624.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2625.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2626.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2627.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2628.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2629.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img263.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2630.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2631.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2632.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2633.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2634.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2635.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2636.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2637.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2638.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2639.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img264.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2640.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2641.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2642.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2643.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2644.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2645.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2646.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2647.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2648.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2649.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img265.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2650.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2651.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2652.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2653.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2654.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2655.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2656.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2657.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2658.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2659.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img266.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2660.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2661.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2662.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2663.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2664.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2665.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2666.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2667.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2668.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2669.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img267.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2670.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2671.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2672.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2673.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2674.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2675.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2676.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2677.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2678.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2679.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img268.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2680.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2681.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2682.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2683.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2684.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2685.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2686.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2687.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2688.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2689.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img269.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2690.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2691.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2692.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2693.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2694.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2695.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2696.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2697.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2698.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2699.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img27.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img270.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2700.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2701.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2702.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2703.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2704.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2705.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2706.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2707.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2708.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2709.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img271.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2710.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2711.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2712.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2713.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2714.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2715.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2716.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2717.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2718.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2719.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img272.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2720.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2721.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2722.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2723.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2724.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2725.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2726.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2727.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2728.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2729.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img273.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2730.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2731.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2732.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2733.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2734.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2735.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2736.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2737.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2738.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2739.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img274.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2740.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2741.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2742.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2743.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2744.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2745.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2746.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2747.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2748.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2749.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img275.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2750.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2751.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2752.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2753.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2754.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2755.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2756.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2757.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2758.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2759.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img276.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2760.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2761.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2762.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2763.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2764.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2765.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2766.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2767.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2768.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2769.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img277.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2770.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2771.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2772.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2773.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img2774.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img278.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img279.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img28.png
@@ -3007,10 +3208,37 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node486.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node487.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node488.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node489.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node49.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node490.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node491.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node492.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node493.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node494.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node495.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node496.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node497.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node498.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node499.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node5.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node50.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node500.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node501.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node502.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node503.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node504.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node505.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node506.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node507.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node508.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node509.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node51.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node510.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node511.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node512.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node513.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node514.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node515.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node52.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node53.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node54.html
@@ -3063,7 +3291,7 @@ bin/ccx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.16.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.17.ps.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref
@@ -3080,8 +3308,6 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtelg.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtelp.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtelp.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acou1.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/acou1.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acou2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acou2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acou3.dat.ref
@@ -3371,6 +3597,10 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo2.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo3.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo3.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo4.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo4.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.inp
@@ -3513,9 +3743,15 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pfin.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pfin.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.rfn.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.rfn.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.rfn.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10pcent.rfn.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compare_valgrind_leaks
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/concretebeam.dat.ref
@@ -3538,6 +3774,8 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact3.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact4.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact4.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact4_mortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact4_mortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact5.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact5.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contact6.dat.ref
@@ -3558,14 +3796,22 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2dfem.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2dfem.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucss.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couctr.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1fem.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1fem.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2fem.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette2fem.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5fem.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5fem.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.dat.ref
@@ -3603,6 +3849,18 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubef2f3.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubenewt.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubenewt.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubes.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubes.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubes.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubeslinmortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubeslinmortar.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubeslinmortar.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubesmortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubesmortar.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubesmortar.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespglinmortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespglinmortar.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespglinmortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespring.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespring.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubespring.inp
@@ -3748,12 +4006,20 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinge.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1_mortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1_mortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber2.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber2_mortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber2_mortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber3.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber3.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber3_mortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber3_mortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber4.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber4.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber4_mortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber4_mortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/impdyn.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/impdyn.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/impdyn.inp
@@ -3846,6 +4112,10 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi3.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi3.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20rs.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20rs.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel8ra.dat.ref
@@ -4037,8 +4307,17 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentface.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentm.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentm.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentmass.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentmass.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.rfn.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.dat.ref
@@ -4170,6 +4449,9 @@ bin/ccx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tempdiscon.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tempdiscon.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tempdiscon.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testmortar.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testmortar.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testmortar.inp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermomech.dat.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermomech.frd.ref
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermomech.inp
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