Update to 2.2.

Notifyed by: "Pedro F. Giffuni"

7 files changed, 123 insertions, 36 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 767052386551..08efaf813b5f 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 0284815c5c83..33c2dd8ce255 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,18 +1,18 @@
-MD5 (calculix/ccx_2.1.src.tar.bz2) = bc653470ea8e8dc25a612048d8bfca98
-SHA256 (calculix/ccx_2.1.src.tar.bz2) = 35214971c2e29f0963451aebe6151d605670fe7892ca624a343bbc3a4cf11ade
-SIZE (calculix/ccx_2.1.src.tar.bz2) = 681426
-MD5 (calculix/cgx_2.1.all.tar.bz2) = 1940738da19e53132329006f0be76c3c
-SHA256 (calculix/cgx_2.1.all.tar.bz2) = f602504c62676e419f69d631cbafa16191f5b4984f146c1c17e25f4c94481fca
-SIZE (calculix/cgx_2.1.all.tar.bz2) = 1034690
-MD5 (calculix/ccx_2.1.htm.tar.bz2) = f6ec4757159265506fd89decd6a40135
-SHA256 (calculix/ccx_2.1.htm.tar.bz2) = 61b68bd51ba94fc6602db9314334de14a35229ea058894da7e389751bbc36666
-SIZE (calculix/ccx_2.1.htm.tar.bz2) = 1359902
-MD5 (calculix/cgx_2.1.htm.tar.bz2) = d6c34d0bd57082f3c8978616bf18e35a
-SHA256 (calculix/cgx_2.1.htm.tar.bz2) = 1dc25d98c831d9bbaecdffcbbfd2ac78773ac66176618eaf5f0821a407805b02
-SIZE (calculix/cgx_2.1.htm.tar.bz2) = 229978
-MD5 (calculix/ccx_2.1.ps.tar.bz2) = 17c3d63c2d86126a79ab52d33811c830
-SHA256 (calculix/ccx_2.1.ps.tar.bz2) = ad92bc1ad52ea6b2b14f8b73a550e9b564abd38cb2333d0691cbfbc8f2370477
-SIZE (calculix/ccx_2.1.ps.tar.bz2) = 1762209
-MD5 (calculix/cgx_2.1.ps.bz2) = faae3b7dd8cbf300ab2836b75e976fcf
-SHA256 (calculix/cgx_2.1.ps.bz2) = 2471abba7b3dee0f66160219bb9bd34ad3fdf33abd417d53e2595190223517e8
-SIZE (calculix/cgx_2.1.ps.bz2) = 344994
+MD5 (calculix/ccx_2.2.src.tar.bz2) = 7e2a020edfcfd48d5c067eb1fb9603af
+SHA256 (calculix/ccx_2.2.src.tar.bz2) = 96f0b5295df33b78c6789ee10f8441d211bab9eef342119d1ee41532011bf823
+SIZE (calculix/ccx_2.2.src.tar.bz2) = 720102
+MD5 (calculix/cgx_2.2.all.tar.bz2) = 85470f0ef2957d7f94cadb82235775ca
+SHA256 (calculix/cgx_2.2.all.tar.bz2) = 216a1102ac3d7765d10f1f4c78db11e974e50615d6cf08b4019000b6119a019a
+SIZE (calculix/cgx_2.2.all.tar.bz2) = 1357357
+MD5 (calculix/ccx_2.2.htm.tar.bz2) = 1f0bd9b9bd29aa0728a0fc70838676bf
+SHA256 (calculix/ccx_2.2.htm.tar.bz2) = 4d63b77c7a5e08b3f5f70ae4bf5c9c11bffa0b8b2d4bdea61bbecb4029e07fc8
+SIZE (calculix/ccx_2.2.htm.tar.bz2) = 1407424
+MD5 (calculix/cgx_2.2.htm.tar.bz2) = 423792616135242a76ebf642e1049c40
+SHA256 (calculix/cgx_2.2.htm.tar.bz2) = 760e2eada3058727902437b65af302818ae5c3092c4f0b3691c19ca6a3f04b33
+SIZE (calculix/cgx_2.2.htm.tar.bz2) = 235270
+MD5 (calculix/ccx_2.2.ps.tar.bz2) = 249bbc5b77b19a6d0e27b459028476f9
+SHA256 (calculix/ccx_2.2.ps.tar.bz2) = 13b3341bf059732059396061ce006a28c1296f085adba6624972e4899eca25fa
+SIZE (calculix/ccx_2.2.ps.tar.bz2) = 1828966
+MD5 (calculix/cgx_2.2.ps.bz2) = 3fe1e8b6a2b25a810c4072a9d81de8e9
+SHA256 (calculix/cgx_2.2.ps.bz2) = 29ca4ac8bf613782eacc268084a0b2db5c6b4fdf14e345280d55a20d8754213b
+SIZE (calculix/cgx_2.2.ps.bz2) = 356718
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 986f3dd92340..ecfdb33bde60 100644
--- a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
+++ b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
@@ -1,5 +1,5 @@
---- ccx_2.1/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
-+++ ccx_2.1/src/CalculiX.h	Sun Feb 19 22:27:54 2006
+--- ccx_2.2/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_2.2/src/CalculiX.h	Sun Feb 19 22:27:54 2006
 @@ -26,6 +26,8 @@
  #define FORTRAN(A,B) A##_##B
  #elif ARCH == HP
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile
index d4074258e64b..e6db256c9b81 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,5 +1,5 @@
---- ccx_2.1/src/Makefile.orig	2010-02-21 23:46:55.000000000 +0900
-+++ ccx_2.1/src/Makefile	2010-06-06 08:45:41.000000000 +0900
+--- ccx_2.2/src/Makefile.orig	2010-02-21 23:46:55.000000000 +0900
++++ ccx_2.2/src/Makefile	2010-06-06 08:45:41.000000000 +0900
 @@ -1,9 +1,9 @@
  
 -CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
@@ -25,9 +25,9 @@
 -       -lm -lc
 +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
  
- ccx_2.1: $(OCCXMAIN) ccx_2.1.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.1.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.1.a  -lpthread  $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.1.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.1.a %%PTHREAD_LIBS%%  -L%%LOCALBASE%%/lib $(LIBS)
+ ccx_2.2: $(OCCXMAIN) ccx_2.2.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.2.a  -lpthread  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.2.a %%PTHREAD_LIBS%%  -L%%LOCALBASE%%/lib $(LIBS)
  
- ccx_2.1.a: $(OCCXF) $(OCCXC)
+ ccx_2.2.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile
index d8128b89660e..bab5597b5809 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.1/src/Makefile.orig	2010-02-27 06:46:21.000000000 +0900
-+++ cgx_2.1/src/Makefile	2010-06-06 08:44:12.000000000 +0900
+--- cgx_2.2/src/Makefile.orig	2010-02-27 06:46:21.000000000 +0900
++++ cgx_2.2/src/Makefile	2010-06-06 08:44:12.000000000 +0900
 @@ -1,14 +1,14 @@
  CFLAGS = -O3 -Wall \
    -I./ \
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgx.h b/cad/calculix/files/patch-cgx_VER+src+cgx.h
index 06485922803b..ec67e69fd681 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.1/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
-+++ cgx_2.1/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
+--- cgx_2.2/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
++++ cgx_2.2/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
 @@ -86,8 +86,8 @@
                               "/yaprod/cae/application/CalculiX/doc/ccx_2.0/ccx.html"}
    #endif
  #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.1/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.1/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.2/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.2/doc/ccx/ccx.html"}
 +   #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
 +     "%%DOCSDIR%%/ccx/ccx.html"}
  #endif
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 87c7106d9581..92be0e7c0a15 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -103,12 +103,66 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1088.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1089.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img109.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1090.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1091.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1092.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1093.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1094.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1095.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1096.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1097.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1098.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1099.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img11.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img110.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1100.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1101.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1102.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1103.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1104.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1105.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1106.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1107.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1108.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1109.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img111.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1110.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1111.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1112.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1113.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1114.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1115.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1116.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1117.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1118.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1119.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img112.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1120.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1121.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1122.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1123.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1124.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1125.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1126.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1127.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1128.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1129.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img113.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1130.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1131.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1132.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1133.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1134.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1135.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1136.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1137.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1138.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1139.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img114.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1140.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1141.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1142.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1143.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img115.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img116.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img117.png
@@ -1547,15 +1601,44 @@ bin/cgx
 %%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/node51.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node515.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node516.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node517.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node518.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node519.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node52.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node520.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node521.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node522.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node523.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node524.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node525.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node526.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node527.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node528.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node529.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node53.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node530.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node531.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node532.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node533.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node534.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node535.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node536.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node537.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node538.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node539.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node54.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node540.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node541.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node542.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node543.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node55.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node56.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node57.html
@@ -1605,7 +1688,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.1.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.2.ps.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
@@ -1641,6 +1724,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img30.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img31.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img32.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img33.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
@@ -1746,6 +1830,9 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node183.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node184.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node185.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node186.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node187.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node188.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node19.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node20.html
@@ -1835,7 +1922,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.1.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.2.ps.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat