diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 3537b2d597d5..14e73fdb595f 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	2.3
-PORTREVISION=	1
+PORTVERSION=	2.4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 3227c6191d93..d90a83954ffe 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,12 +1,12 @@
-SHA256 (calculix/ccx_2.3.src.tar.bz2) = 6e63249d324cf7b75e144cb4ce264b1ca54dbcf863b357c0a18ca8fb9184c55f
-SIZE (calculix/ccx_2.3.src.tar.bz2) = 756130
-SHA256 (calculix/cgx_2.3.all.tar.bz2) = e7db0b5ed21f8ee35d7b3ee04c2241d5b6abc19a0b030dd68cd4bc7c93d031ba
-SIZE (calculix/cgx_2.3.all.tar.bz2) = 1098026
-SHA256 (calculix/ccx_2.3.htm.tar.bz2) = 29b2c2ea4464872de94a613d8ee062202c2fa7157cc878745a3b7789e8ccb26c
-SIZE (calculix/ccx_2.3.htm.tar.bz2) = 1465591
-SHA256 (calculix/cgx_2.3.htm.tar.bz2) = c79ac3e83d13a8cbb066511adad2ba712ab68b27132fa9f2d546ecba0fe9af58
-SIZE (calculix/cgx_2.3.htm.tar.bz2) = 243747
-SHA256 (calculix/ccx_2.3.ps.tar.bz2) = ecf53c105573b3dd585b2928cd6013cdfcceac8d0f92500f6c4c80e4dba16dee
-SIZE (calculix/ccx_2.3.ps.tar.bz2) = 1877663
-SHA256 (calculix/cgx_2.3.pdf) = 31c1382d52b54d775549a221406848bebde4c08099581c69e490cdedd664b59d
-SIZE (calculix/cgx_2.3.pdf) = 859465
+SHA256 (calculix/ccx_2.4.src.tar.bz2) = cadcd0d71bb54c6d61c83ce3aaa7a3fb8c8517d40db3909778797fd05e25e7a4
+SIZE (calculix/ccx_2.4.src.tar.bz2) = 830747
+SHA256 (calculix/cgx_2.4.all.tar.bz2) = c8f7008b9be75110f6c491d1fdf83cf9a4b2c0fbda37a3f2249ea9bdaf825be9
+SIZE (calculix/cgx_2.4.all.tar.bz2) = 1148846
+SHA256 (calculix/ccx_2.4.htm.tar.bz2) = 18c3b3ab7dcedf096c7d2f1320985588fc906fd40755c037b77381459579995e
+SIZE (calculix/ccx_2.4.htm.tar.bz2) = 1499249
+SHA256 (calculix/cgx_2.4.htm.tar.bz2) = 07b0029edcbeea5cfd4755325894100f22e28941e752f44bf72cab91bc3e7044
+SIZE (calculix/cgx_2.4.htm.tar.bz2) = 246556
+SHA256 (calculix/ccx_2.4.ps.tar.bz2) = 522d727ddfd5991ab4de6fa788e554e981223b3a657c6ee18936811c5b2a6805
+SIZE (calculix/ccx_2.4.ps.tar.bz2) = 1908642
+SHA256 (calculix/cgx_2.4.pdf) = e50e23801501bb91d8c3465ffd167cd07e4dbddfda4b6b4b26a8a1ff11463e6a
+SIZE (calculix/cgx_2.4.pdf) = 876897
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 9b8cb4416108..39d4f62891c2 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.3/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
-+++ ccx_2.3/src/CalculiX.h	Sun Feb 19 22:27:54 2006
+--- ccx_2.4/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_2.4/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 0df67d30cff4..719ef94defd3 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.3/src/Makefile.orig	2011-03-27 02:19:21.000000000 +0900
-+++ ccx_2.3/src/Makefile	2011-05-11 11:54:16.000000000 +0900
+--- ccx_2.4/src/Makefile.orig	2011-03-27 02:19:21.000000000 +0900
++++ ccx_2.4/src/Makefile	2011-05-11 11:54:16.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.3: $(OCCXMAIN) ccx_2.3.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.3.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.3.a  -lpthread  $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.3.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.3.a %%PTHREAD_LIBS%%  $(LIBS)
+ ccx_2.4: $(OCCXMAIN) ccx_2.4.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.4.a  -lpthread  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.4.a %%PTHREAD_LIBS%%  $(LIBS)
  
- ccx_2.3.a: $(OCCXF) $(OCCXC)
+ ccx_2.4.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 bd131fe6034a..c90b54d3c322 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.3/src/Makefile.orig	2011-03-23 06:14:10.000000000 +0900
-+++ cgx_2.3/src/Makefile	2011-05-11 11:56:10.000000000 +0900
+--- cgx_2.4/src/Makefile.orig	2011-03-23 06:14:10.000000000 +0900
++++ cgx_2.4/src/Makefile	2011-05-11 11:56:10.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 e108e7de8108..a1c5fa5c6466 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.3/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
-+++ cgx_2.3/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
+--- cgx_2.4/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
++++ cgx_2.4/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.3/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.3/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.4/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.4/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 36040ed41c46..07b152d3e3d2 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -207,11 +207,56 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1181.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1182.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1183.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1184.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1185.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1186.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1187.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1188.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1189.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img119.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1190.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1191.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1192.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1193.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1194.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1195.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1196.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1197.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1198.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1199.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img12.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img120.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1200.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1201.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1202.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1203.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1204.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1205.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1206.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1207.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1208.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1209.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img121.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1210.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1211.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1212.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1213.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1214.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1215.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1216.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1217.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1218.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1219.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img122.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1220.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1221.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1222.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1223.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1224.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1225.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1226.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1227.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1228.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img123.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img124.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img125.png
@@ -1720,7 +1765,19 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node579.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node58.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node580.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node580.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node581.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node582.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node583.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node584.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node585.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node586.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node587.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node588.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node589.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node59.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node590.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node591.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node6.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node60.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node61.html
@@ -1765,7 +1822,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.3.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.4.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
@@ -1800,7 +1857,6 @@ 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
@@ -1923,6 +1979,11 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node199.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node20.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node200.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node201.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node202.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node203.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node204.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node21.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node22.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node23.html
@@ -2009,7 +2070,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.3.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.4.pdf
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/README
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/isaac.fbl