git: ada48bb23728 - main - cad/calculix{-ccx}: Update to version 2.18
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 22 Oct 2021 04:44:52 UTC
The branch main has been updated by pfg:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ada48bb23728ccccbbbf190064b5151d3ff9b888
commit ada48bb23728ccccbbbf190064b5151d3ff9b888
Author: Pedro F. Giffuni <pfg@FreeBSD.org>
AuthorDate: 2021-10-22 04:43:59 +0000
Commit: Pedro F. Giffuni <pfg@FreeBSD.org>
CommitDate: 2021-10-22 04:43:59 +0000
cad/calculix{-ccx}: Update to version 2.18
Check http://www.dhondt.de/new_calc.htm for a list of new features.
Approved by: thierry (mentor, implicit)
---
cad/calculix-ccx/Makefile | 3 +-
cad/calculix-ccx/distinfo | 18 +-
cad/calculix-ccx/files/patch-Makefile | 10 +-
cad/calculix-ccx/files/patch-date.pl | 4 +-
cad/calculix-ccx/pkg-plist | 390 ++++-----------------
cad/calculix/Makefile | 3 +-
cad/calculix/distinfo | 18 +-
.../files/patch-cgx__2.18_src_pickFunktions.c | 11 +
cad/calculix/files/patch-cgx__VER_src_Makefile | 4 +-
cad/calculix/pkg-plist | 28 +-
10 files changed, 135 insertions(+), 354 deletions(-)
diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile
index 3807d9a7ea8d..7d3d1b459b39 100644
--- a/cad/calculix-ccx/Makefile
+++ b/cad/calculix-ccx/Makefile
@@ -1,8 +1,7 @@
# Created by: Pedro Giffuni
PORTNAME= ccx
-PORTVERSION= 2.17
-PORTREVISION= 2
+PORTVERSION= 2.18
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
PKGNAMEPREFIX= CalculiX-
diff --git a/cad/calculix-ccx/distinfo b/cad/calculix-ccx/distinfo
index c43912445239..9054945ce025 100644
--- a/cad/calculix-ccx/distinfo
+++ b/cad/calculix-ccx/distinfo
@@ -1,9 +1,9 @@
-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
+TIMESTAMP = 1634866888
+SHA256 (calculix/ccx_2.18.src.tar.bz2) = fad533bd66693daa398856262bf7c6feb12599c3051955238b0a70420852ff65
+SIZE (calculix/ccx_2.18.src.tar.bz2) = 1593157
+SHA256 (calculix/ccx_2.18.htm.tar.bz2) = 5b9cc5e6a1ef70bd93737b507cb754d485b229ec3cef31ea33501a74deff23e6
+SIZE (calculix/ccx_2.18.htm.tar.bz2) = 2586160
+SHA256 (calculix/ccx_2.18.ps.tar.bz2) = 6754f63a7df7bb32a2a065fa7cd576bdc6db9fcc8944c7c102da26ac77734740
+SIZE (calculix/ccx_2.18.ps.tar.bz2) = 5148638
+SHA256 (calculix/ccx_2.18.test.tar.bz2) = c5f771fc152d876366570b0d88032d908d912efb566ccddf070184acceeed7f4
+SIZE (calculix/ccx_2.18.test.tar.bz2) = 9759177
diff --git a/cad/calculix-ccx/files/patch-Makefile b/cad/calculix-ccx/files/patch-Makefile
index da7ff087aff1..bb05ee5c1506 100644
--- a/cad/calculix-ccx/files/patch-Makefile
+++ b/cad/calculix-ccx/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2020-07-23 19:41:38 UTC
+--- Makefile.orig 2021-09-15 19:39:24 UTC
+++ Makefile
@@ -1,9 +1,9 @@
@@ -24,9 +24,9 @@
+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
+ -lpthread -lm
- 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.18: $(OCCXMAIN) ccx_2.18.a $(LIBS)
+- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
++ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.18.c; $(FC) -o $@ $(OCCXMAIN) ccx_2.18.a $(LIBS) -fopenmp
- ccx_2.17.a: $(OCCXF) $(OCCXC)
+ ccx_2.18.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
diff --git a/cad/calculix-ccx/files/patch-date.pl b/cad/calculix-ccx/files/patch-date.pl
index 3151d033dab8..83d15086270c 100644
--- a/cad/calculix-ccx/files/patch-date.pl
+++ b/cad/calculix-ccx/files/patch-date.pl
@@ -1,4 +1,4 @@
---- date.pl.orig 2020-07-23 19:41:38 UTC
+--- date.pl.orig 2021-09-15 19:39:24 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.17.c
+ # inserting the date into ccx_2.18.c
diff --git a/cad/calculix-ccx/pkg-plist b/cad/calculix-ccx/pkg-plist
index b6b002a90006..91f3b2ebd521 100644
--- a/cad/calculix-ccx/pkg-plist
+++ b/cad/calculix-ccx/pkg-plist
@@ -1715,265 +1715,31 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/img2539.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img254.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img2540.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2541.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2542.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2543.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2544.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2545.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2546.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2547.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2548.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2549.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img255.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2550.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2551.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2552.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2553.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2554.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2555.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2556.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2557.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2558.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2559.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img256.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2560.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2561.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2562.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2563.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2564.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2565.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2566.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2567.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2568.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2569.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img257.png
-%%PORTDOCS%%%%DOCSDIR%%/ccx/img2570.png
-%%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
@@ -3206,39 +2972,10 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node484.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node485.html
%%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
@@ -3291,7 +3028,7 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.17.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.18.ps.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref
@@ -3398,6 +3135,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd3.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamd3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdelay.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdelay.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy1.dat.ref
@@ -3447,6 +3186,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy9.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdynamic2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamexpdy1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamexpdy1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamf.dat.ref
@@ -3601,6 +3342,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo4.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo5.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo6.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampo6.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamprand.inp
@@ -3645,6 +3388,7 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamstraight.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamt2.inp
@@ -3738,6 +3482,9 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel7.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel9.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channel9.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/channelcbs.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/chanson1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/characteristic.dat.ref
@@ -3745,12 +3492,10 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circ10p.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
@@ -3792,36 +3537,27 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contdamp2.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.dat.ref
-%%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%%/coucyl.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucyl.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucyl.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcent2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcentcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coucylcomp.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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecyl4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcent.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couettecylcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette5.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling2.dat.ref
@@ -3836,6 +3572,27 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling6.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling7.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coupling7.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couseg3.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cousegcomp.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIcum.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIint.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crackIIprin.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cubef2f1.dat.ref
@@ -3911,13 +3668,10 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidread.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fluidwrite.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frdcheck.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/freq_test.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.inp
@@ -4062,6 +3816,21 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/leifer2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_cooks_beam_128.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_initial_temp_condition.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_pres_load.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_th_gradient.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lin_stat_twisted_beam.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linearnet.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/linearnet.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/load1.dat.ref
@@ -4074,6 +3843,7 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/masterII.frd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane1.inp
@@ -4110,6 +3880,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20cf.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20df2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel20fi2.dat.ref
@@ -4171,18 +3943,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestress4.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestressquadsens.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planestresssens.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plate.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plate.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d2.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poi2d2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/potied.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/potied.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret1.dat.ref
@@ -4313,6 +4075,10 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth.rfn.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentsmooth2.rfn.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmenttet.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.dat.ref
@@ -4320,9 +4086,6 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segmentunsmooth.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/segststate.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens2d.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens3d.inp
@@ -4338,6 +4101,9 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_freq_orien.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.dat.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.frd.ref
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sens_modalstress.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sensitivity_I.inp
@@ -4388,12 +4154,6 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellf2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellnor.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellnor.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellquadsens.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.dat.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.frd.ref
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shellsens.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeam.inp
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 853d8342e6fd..740d3662b07c 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -1,8 +1,7 @@
# Created by: Pedro Giffuni
PORTNAME= calculix
-PORTVERSION= 2.17.1
-PORTREVISION= 1
+PORTVERSION= 2.18
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
DISTFILES= ${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 380263f3785d..e9761f88101c 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-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
+TIMESTAMP = 1634869635
+SHA256 (calculix/cgx_2.18.all.tar.bz2) = dea36f02f36f35a420241b8ed9836f0121b75b5af1abb8e13ca48e31dc4f8734
+SIZE (calculix/cgx_2.18.all.tar.bz2) = 5749856
+SHA256 (calculix/cgx_2.18.exa.tar.bz2) = 498d239ae77be8f3f5d1f48acc431724dd297a246755bfb651dcbc03ba233873
+SIZE (calculix/cgx_2.18.exa.tar.bz2) = 3921273
+SHA256 (calculix/cgx_2.18.htm.tar.bz2) = 486ce50880cb0c298f6ccdde353bc8982bfb095294a7404eb966b3345d790312
+SIZE (calculix/cgx_2.18.htm.tar.bz2) = 377755
+SHA256 (calculix/cgx_2.18.pdf) = 2ee1f644fc8747bf2a1af1ad093251db736e6836fa695e7eb87745447e2bf62d
+SIZE (calculix/cgx_2.18.pdf) = 1476039
diff --git a/cad/calculix/files/patch-cgx__2.18_src_pickFunktions.c b/cad/calculix/files/patch-cgx__2.18_src_pickFunktions.c
new file mode 100644
index 000000000000..2444eb171a21
--- /dev/null
+++ b/cad/calculix/files/patch-cgx__2.18_src_pickFunktions.c
@@ -0,0 +1,11 @@
+--- cgx_2.18/src/pickFunktions.c.orig 2021-09-18 09:40:04 UTC
++++ cgx_2.18/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__VER_src_Makefile
index ab664be54b69..fe1d596937bc 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.1/src/Makefile.orig 2020-02-18 18:22:00 UTC
-+++ cgx_2.17.1/src/Makefile
+--- cgx_2.18/src/Makefile.orig 2021-03-11 17:35:46 UTC
++++ cgx_2.18/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 95eab5f30480..8a8e52a8cb7f 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,8 +1,10 @@
bin/cgx
+%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
%%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
@@ -236,7 +238,12 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node265.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node266.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node267.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node268.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node269.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node270.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node271.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node272.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node3.html
@@ -316,7 +323,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.18.pdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -344,7 +351,6 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/boundary
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbb
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/faces
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/neighbour
@@ -366,6 +372,10 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.hdr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.trl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
@@ -392,6 +402,7 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dolfyn/mirror/spiegel.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/geometry.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.12d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
@@ -404,6 +415,7 @@ bin/cgx
%%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
@@ -411,17 +423,17 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.12d
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.12d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/post.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbb
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl