17 files changed, 336 insertions, 301 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 3ef860e58238..f7db85e1378d 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	ccx_${PORTVERSION}.src.tar.gz cgx_${PORTVERSION}.tar.gz
@@ -24,11 +24,11 @@ COMMENT=	A Three-Dimensional Structural Finite Element Program
 
 # These are required to build Crunchix (ccx)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles \
-		${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack \
-		${LOCALBASE}/lib/libf77blas.a:${PORTSDIR}/math/atlas
+		${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack
+LIB_DEPENDS=    atlas.1:${PORTSDIR}/math/atlas
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_MESA=	yes
+USE_GL=	yes
 USE_REINPLACE=	yes
 BLAS_LIBS=	-lf77blas -latlas
 BROWSER?=	mozilla
@@ -55,12 +55,13 @@ pre-build:
 	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' \
 		${WRKSRC}/cgx_${PORTVERSION}/src/Makefile
 	@${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \
-	s+"netscape"+"${BROWSER}"+ ; \
+	s+"mozilla"+"${BROWSER}"+ ; \
 	s+"ghostview"+"${PSVIEWER}"+ ;' \
 		${WRKSRC}/cgx_${PORTVERSION}/src/cgx.h
 
 do-build:
 	@(cd ${WRKSRC}/ccx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
+	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
 	@(cd ${WRKSRC}/cgx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
 
 do-install:
@@ -77,7 +78,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/cgx_${PORTVERSION}/doc/cgx/* \
 	  ${DOCSDIR}/cgx
 	@${INSTALL_DATA} ${WRKSRC}/ccx_${PORTVERSION}/doc/*.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/cgx_${PORTVERSION}/doc/*.ps ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/cgx.ps ${DOCSDIR}
 	@${GZIP_CMD} ${DOCSDIR}/*.ps
 .endif
 .ifdef WITH_EXAMPLES
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 848fbc524e1e..8415ae2e9e7e 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,7 +1,14 @@
-MD5 (calculix/ccx_1.1.src.tar.gz) = a8468774cab93aea811a309348d51e25
-MD5 (calculix/cgx_1.1.tar.gz) = 64b60609efd5b11e6a5633c3287e62d5
-MD5 (calculix/ccx_1.1.ps.tar.gz) = ebd20e20724d9061bf193f20aeabbf05
-MD5 (calculix/cgx_1.1.ps.tar.gz) = 213f89fbe12c3acffa724f47f24cddc2
-MD5 (calculix/ccx_1.1.htm.tar.gz) = 392b97c0cb5b9af789aa4ccb45a1d932
-MD5 (calculix/cgx_1.1.htm.tar.gz) = cdbfbbc480e431fcd666ce0b5e90c19e
-MD5 (calculix/ccx_1.1.test.tar.gz) = 45ecbeeaa2444ddf340aa46186814993
+MD5 (calculix/ccx_1.2.src.tar.gz) = 6555df252f907ab0de47d400c6926959
+SIZE (calculix/ccx_1.2.src.tar.gz) = 376810
+MD5 (calculix/cgx_1.2.tar.gz) = 8f90ba5f681462e69b064ee670c4d0e4
+SIZE (calculix/cgx_1.2.tar.gz) = 963476
+MD5 (calculix/ccx_1.2.ps.tar.gz) = a2dd42355248ea0fc5b8b5484a3af1f0
+SIZE (calculix/ccx_1.2.ps.tar.gz) = 645495
+MD5 (calculix/cgx_1.2.ps.tar.gz) = 1135d0339a547afa2ec3e2ea54057279
+SIZE (calculix/cgx_1.2.ps.tar.gz) = 318914
+MD5 (calculix/ccx_1.2.htm.tar.gz) = b16b1b2a578c81ce12aecc390ffdd2fe
+SIZE (calculix/ccx_1.2.htm.tar.gz) = 674814
+MD5 (calculix/cgx_1.2.htm.tar.gz) = 7ad27a7fec332f8601e72ecf90056f8d
+SIZE (calculix/cgx_1.2.htm.tar.gz) = 220718
+MD5 (calculix/ccx_1.2.test.tar.gz) = a5538d9877eb1d906edacee70aa1d0e8
+SIZE (calculix/ccx_1.2.test.tar.gz) = 901407
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 8b81c239eaeb..afea7cd992f7 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_1.1/src/CalculiX.h.orig	Mon Mar  3 00:35:58 2003
-+++ ccx_1.1/src/CalculiX.h	Mon May  5 21:15:50 2003
+--- ccx_1.2/src/CalculiX.h.orig	Mon Mar  3 00:35:58 2003
++++ ccx_1.2/src/CalculiX.h	Mon May  5 21:15:50 2003
 @@ -24,6 +24,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 dbd1fd57ff80..5d12fd47fd81 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,10 +1,10 @@
---- ccx_1.1/src/Makefile.orig	Wed Aug  6 16:22:49 2003
-+++ ccx_1.1/src/Makefile	Thu Aug  7 08:48:23 2003
+--- ccx_1.2/src/Makefile.orig	Sun Jul 25 09:55:36 2004
++++ ccx_1.2/src/Makefile	Sat Dec 25 00:56:51 2004
 @@ -1,8 +1,8 @@
 -CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux"
 -FFLAGS = -Wall -O
 +CFLAGS += -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD"
-+#FFLAGS = -Wall -O
++FFLAGS += -O
  
 -CC=cc
 -FC=g77
@@ -13,21 +13,22 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -225,15 +225,10 @@
+@@ -248,15 +248,12 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
 -DIR=../../../SPOOLES.2.2
--
++DIR=%%LOCALBASE%%/lib
+ 
 -LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lm
 +LIBS = -lspooles -larpack %%BLAS_LIBS%% -lm
  
- ccx_1.1: $(OCCXMAIN) ccx_1.1.a  $(LIBS)
--	g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.1.a  $(LIBS)
-+	$(FC) -O -o $@ $(OCCXMAIN) ccx_1.1.a  $(LIBS) -L%%LOCALBASE%%/lib
+ ccx_1.2: $(OCCXMAIN) ccx_1.2.a  $(LIBS)
+-	g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS)
++	$(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS) -L$(DIR)
  
- ccx_1.1.a: $(OCCXF) $(OCCXC)
+ ccx_1.2.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/calculix/files/patch-ccx_VER+src+calinput.f b/cad/calculix/files/patch-ccx_VER+src+calinput.f
deleted file mode 100644
index 958c2c42a0c2..000000000000
--- a/cad/calculix/files/patch-ccx_VER+src+calinput.f
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccx_1.1/src/calinput.f.orig	Sun Sep 21 00:10:15 2003
-+++ ccx_1.1/src/calinput.f	Sun Sep 21 00:11:34 2003
-@@ -544,7 +544,7 @@
-          if(i.gt.nlabel) then
-             nodeflab(1)='U   '
-             nodeflab(3)='S   '
--            jout=1
-+            jout=max(jout,1)
-             exit
-          endif
-          if(nodeflab(i).ne.'    ') exit
diff --git a/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f b/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f
deleted file mode 100644
index 8e7d40c3cfd9..000000000000
--- a/cad/calculix/files/patch-ccx_VER+src+e_c3d_rhs.f
+++ /dev/null
@@ -1,17 +0,0 @@
---- ccx_1.1/src/e_c3d_rhs.f.orig	Tue Sep 23 23:17:44 2003
-+++ ccx_1.1/src/e_c3d_rhs.f	Tue Sep 23 23:33:14 2003
-@@ -226,6 +226,14 @@
- !           body forces
- !
-             if(ibod.ne.0) then
-+!
-+! incorporating the jacobian determinant in the shape
-+! functions
-+!
-+	    do i1=1,nope
-+	    shpj(4,i1)=shp(4,i1)*xsj
-+	    enddo
-+!
-                if(om.gt.0.d0) then
-                   do i1=1,3
- !
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile
index 18ab3835c7df..13efc7acb957 100644
--- a/cad/calculix/files/patch-cgx_VER+src+Makefile
+++ b/cad/calculix/files/patch-cgx_VER+src+Makefile
@@ -1,29 +1,38 @@
---- cgx_1.1/src/Makefile.orig	Tue Aug  5 13:46:07 2003
-+++ cgx_1.1/src/Makefile	Thu Aug  7 15:52:48 2003
-@@ -1,12 +1,10 @@
+--- cgx_1.2/src/Makefile.orig	Sat Jul 17 17:16:50 2004
++++ cgx_1.2/src/Makefile	Thu Dec 23 15:20:11 2004
+@@ -1,17 +1,16 @@
 -CFLAGS = -O2 -Wall \
 -  -I./ \
 -  -I/usr/include \
 -  -I/usr/include/GL \
--  -I/usr/X11R6/include 
-+CFLAGS +=  -I./ \
+-  -I/usr/local/CalculiX/libSNL/src \
+-  -I/usr/X11/include 
++CFLAGS += -I./ \
++  -I%%X11BASE%%/include \
 +  -I%%X11BASE%%/include/GL \
++  -I../../libSNL/src \
 +  -I%%X11BASE%%/include 
  
  LFLAGS = \
+-  -L/usr/local/CalculiX/libSNL/src -lSNL \
 -  -L/usr/lib -lGL -lGLU -lglut \
--  -L/usr/X11R6/lib -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+-  -L/usr/X11/lib -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
++  -L../../libSNL/src -lSNL \
 +  -L%%X11BASE%%/lib -lGL -lGLU -lglut \
 +  -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
    -lm 
  
- # -lpthread is needed if mesaGL is using threading, otherwhise it is not needed
-@@ -114,7 +112,7 @@
+-# -lpthread is needed if mesaGL is using threading, otherwhise it is not needed
++# -lpthread is needed if mesaGL is using threading, otherwise it reduces performance
+ 
+ SLIB = \
+    AsplitA.c \
+@@ -110,7 +109,7 @@
  OLIB = $(SLIB:.c=.o)
  
  cgx:  $(OLIB)
 -	g++   $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
-+	$(CXX)   $(OLIB)  $(CXXFLAGS) $(LFLAGS) -o  $@
- 
- 
++	$(CXX)   $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
  
+ # flags for the sgi compiler
+ #  use them with the CC compiler instead of g++
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgx.h b/cad/calculix/files/patch-cgx_VER+src+cgx.h
index db8f42863363..5c9f8b7dc90f 100644
--- a/cad/calculix/files/patch-cgx_VER+src+cgx.h
+++ b/cad/calculix/files/patch-cgx_VER+src+cgx.h
@@ -1,13 +1,13 @@
---- cgx_1.1/src/cgx.h.orig	Tue Aug  5 10:08:37 2003
-+++ cgx_1.1/src/cgx.h	Thu Aug  7 00:37:38 2003
+--- cgx_1.2/src/cgx.h.orig	Sat Jul 17 17:17:41 2004
++++ cgx_1.2/src/cgx.h	Thu Dec 23 15:32:58 2004
 @@ -59,8 +59,8 @@
  #define     MILLISECONDS_PER_PERIOD 1200 
  
  /* default location of the help files, please insert the actual one */
--#define     HELPFILE        {"/usr/local/CalculiX/cgx_1.1/doc/cgx/cgx.html",\
--   "/usr/local/CalculiX/ccx_1.1/doc/ccx/ccx.html"}
+-#define     HELPFILE        {"/usr/local/CalculiX/cgx_1.2/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_1.2/doc/ccx/ccx.html"}
 +#define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
-+   "%%DOCSDIR%%/ccx/ccx.html"}
++    "%%DOCSDIR%%/ccx/ccx.html"}
  
  /* html browser, change if necessary */
- #define     BROWSER         {"netscape"}
+ /* #define     BROWSER         {"netscape"} */
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgxToCdsm.cpp b/cad/calculix/files/patch-cgx_VER+src+cgxToCdsm.cpp
deleted file mode 100644
index 4d8c78b0178c..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+cgxToCdsm.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/cgxToCdsm.cpp.orig	Thu Aug  7 15:39:06 2003
-+++ cgx_1.1/src/cgxToCdsm.cpp	Thu Aug  7 15:42:01 2003
-@@ -28,7 +28,7 @@
- #include "knotVect.h"
- #include "nurbsBase.h"
- #include "ptrList.h"
--#include "iostream.h"
-+#include "iostream"
- 
- sLocn*  amb = 0;  // Ambiguous points.
- int     ambSize;
diff --git a/cad/calculix/files/patch-cgx_VER+src+ctrlPoint.cpp b/cad/calculix/files/patch-cgx_VER+src+ctrlPoint.cpp
deleted file mode 100644
index 6d8e7276f7a9..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+ctrlPoint.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- cgx_1.1/src/ctrlPoint.cpp.orig	Mon Aug  4 15:25:08 2003
-+++ cgx_1.1/src/ctrlPoint.cpp	Thu Aug  7 16:12:47 2003
-@@ -18,7 +18,8 @@
-  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- 
--#include <iostream.h>
-+#include <iostream>
-+using std::cout;
- #include <math.h>
- 
- #include "ctrlPoint.h"
diff --git a/cad/calculix/files/patch-cgx_VER+src+geometry.cpp b/cad/calculix/files/patch-cgx_VER+src+geometry.cpp
deleted file mode 100644
index dbd7e601c563..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+geometry.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/geometry.cpp.orig	Mon Aug  4 15:25:08 2003
-+++ cgx_1.1/src/geometry.cpp	Thu Aug  7 19:05:53 2003
-@@ -22,7 +22,7 @@
- // ------------------------
- 
- #include <math.h>
--#include <iostream.h>
-+#include <iostream>
- 
- #include "geometry.h"
- 
diff --git a/cad/calculix/files/patch-cgx_VER+src+knotVect.cpp b/cad/calculix/files/patch-cgx_VER+src+knotVect.cpp
deleted file mode 100644
index 467b052ea526..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+knotVect.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/knotVect.cpp.orig	Thu Aug  7 15:40:23 2003
-+++ cgx_1.1/src/knotVect.cpp	Thu Aug  7 15:47:46 2003
-@@ -19,7 +19,7 @@
-  */
- 
- #include "knotVect.h"
--#include <iostream.h>
-+#include <iostream>
- 
- knotVector::knotVector ( knot* knotArrayToCopy, unsigned size, unsigned knotVectType )
- {
diff --git a/cad/calculix/files/patch-cgx_VER+src+nurbsBase.cpp b/cad/calculix/files/patch-cgx_VER+src+nurbsBase.cpp
deleted file mode 100644
index 0a671ac54ebb..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+nurbsBase.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/nurbsBase.cpp.orig	Mon Aug  4 15:25:08 2003
-+++ cgx_1.1/src/nurbsBase.cpp	Thu Aug  7 17:12:46 2003
-@@ -27,7 +27,7 @@
-     #include "ptrList.h"

- #endif

- 

--#include <iostream.h>

-+#include <iostream>

- #include <math.h>

- #include <stdio.h>

- 

diff --git a/cad/calculix/files/patch-cgx_VER+src+nurbsBase.h b/cad/calculix/files/patch-cgx_VER+src+nurbsBase.h
deleted file mode 100644
index 42f20eca4217..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+nurbsBase.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/nurbsBase.h.orig	Thu Aug  7 09:34:49 2003
-+++ cgx_1.1/src/nurbsBase.h	Thu Aug  7 09:35:13 2003
-@@ -27,7 +27,7 @@
- #include "ctrlPoint.h"
- #include "nurbs.h"
- 
--#include <iostream.h>
-+#include <iostream>
- 
- //#define CDSM_COMMENT
- 
diff --git a/cad/calculix/files/patch-cgx_VER+src+readccx.c b/cad/calculix/files/patch-cgx_VER+src+readccx.c
deleted file mode 100644
index b1f5b39daa2b..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+readccx.c
+++ /dev/null
@@ -1,127 +0,0 @@
---- cgx_1.1/src/readccx.c.org	Wed Apr  9 00:32:46 2003
-+++ cgx_1.1/src/readccx.c	Sun Jul 27 15:24:28 2003
-@@ -357,7 +357,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"NAME=",5)==5) { strcpy(set,&buffer[5]); } 
-   }
-   if(printFlag) printf("*SURFACE DEFINITION: %s\n",set);
-@@ -479,7 +479,7 @@
- 
- 
-   /* check if it is a node section */
--  for(j=0;j<strlen(rec_str); j++) { if(rec_str[j]==',') break; rec_str[j]=_toupper(rec_str[j]);}
-+  for(j=0;j<strlen(rec_str); j++) { if(rec_str[j]==',') break; rec_str[j]=toupper(rec_str[j]);}
-   if((compare(rec_str,"*NODE PRINT",11)==11)||
-      (compare(rec_str,"*NODE FILE",10)==10))
-   {
-@@ -500,7 +500,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"NSET=",5)==5) { setFlag=1; strcpy(set,&buffer[5]); } 
-   }
-   if(printFlag) printf("*NODE: NSET=%s\n", set);
-@@ -815,7 +815,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"TYPE=",5)==5) strcpy(elemtyp,&buffer[5]);
-     if(compare(dat[i],"ELSET=",6)==6) { strcpy(set,&buffer[6]); setFlag=1; } 
-   }
-@@ -977,7 +977,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"NAME=",5)==5) strcpy(mname,&buffer[5]);
-   }
-   if(printFlag) printf("*MATERIAL:%s\n", mname);
-@@ -1021,7 +1021,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"TYPE=",5)==5) strcpy(type,&buffer[5]);
-   }
-   if(printFlag) printf("*ELASTIC: TYPE:%s\n", type);
-@@ -1073,7 +1073,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"TYPE=",5)==5) strcpy(type,&buffer[5]);
-   }
-   if(printFlag) printf("*EXPANSION:TYPE:%s\n", type);
-@@ -1480,7 +1480,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"ELSET=",6)==6) strcpy(set,&buffer[6]);
-     if(compare(dat[i],"GENERATE",5)==5) generate=1;
-   }
-@@ -1537,7 +1537,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"NSET=",5)==5) strcpy(set,&buffer[5]);
-     if(compare(dat[i],"GENERATE",5)==5) generate=1;
-   }
-@@ -1605,7 +1605,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"ELSET=",6)==6) strcpy(elset,&buffer[6]);
-     if(compare(dat[i],"MATERIAL=",9)==9) strcpy(material,&buffer[9]);
-     if((compare(buffer,"NODAL",5)==5)||
-@@ -1672,7 +1672,7 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"ELSET=",6)==6) strcpy(elset,&buffer[6]);
-     if(compare(dat[i],"MATERIAL=",9)==9) strcpy(material,&buffer[9]);
-     if((compare(buffer,"COMPOS",5)==5)||
-@@ -1726,14 +1726,14 @@
-     /* delete blanks */
-     n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-     buffer[n]=(unsigned char)NULL;
--    for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+    for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-     if(compare(dat[i],"TYPE=",5)==5)
-     {
-       strcpy(dat[i],&buffer[5]);
-       /* delete blanks */
-       n=0; for(j=0;j<strlen(dat[i]); j++) if(dat[i][j]!=' ') { buffer[n]=dat[i][j]; n++; }
-       buffer[n]=(unsigned char)NULL;
--      for(j=0;j<strlen(buffer); j++) dat[i][j]=_toupper(buffer[j]);
-+      for(j=0;j<strlen(buffer); j++) dat[i][j]=toupper(buffer[j]);
-       if(compare(dat[i],"TEMPERATURE",6)==6)
-       {
-         if(printFlag) printf("*INITIAL CONDITIONS: TYPE:%s \n", buffer);
-@@ -1914,7 +1914,7 @@
-     args=crecord(rec_str, dat);
- 
-     /* get the arguments of the string */
--    i=0; while(dat[0][i]!=(unsigned char)NULL) { dat[0][i]=_toupper(dat[0][i]); i++; }
-+    i=0; while(dat[0][i]!=(unsigned char)NULL) { dat[0][i]=toupper(dat[0][i]); i++; }
- 
-     /* get the nodes */
-     if (compare(dat[0], "*NODE",5)==5) { length=getNodes(rec_str); goto checknextstr; }
diff --git a/cad/calculix/files/patch-cgx_VER+src+smeUndo.cpp b/cad/calculix/files/patch-cgx_VER+src+smeUndo.cpp
deleted file mode 100644
index 042a77e43d43..000000000000
--- a/cad/calculix/files/patch-cgx_VER+src+smeUndo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.1/src/smeUndo.cpp.orig	Thu Aug  7 15:41:36 2003
-+++ cgx_1.1/src/smeUndo.cpp	Thu Aug  7 15:50:42 2003
-@@ -23,7 +23,7 @@
- 
- #include "smeUndo.h"
- 
--#include <iostream.h>
-+#include <iostream>
- 
- bool smeUndoItemBase::isOwner ( const char* ownerString )
- {
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 3fb309db535e..40318f02c8f4 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.1.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.2.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -197,6 +197,70 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node192.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node193.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node194.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node195.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node196.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node197.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node198.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node199.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node200.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node201.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node202.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node203.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node204.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node205.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node206.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node207.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node208.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node209.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node210.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node211.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node212.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node213.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node214.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node215.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node216.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node217.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node218.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node219.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node220.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node221.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node222.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node223.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node224.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node225.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node226.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node227.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node228.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node229.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node230.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node231.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node232.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node233.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node234.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node235.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node236.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node237.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node238.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node239.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node240.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node241.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node242.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node243.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node244.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node245.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node246.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node247.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node248.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node249.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node250.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node251.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node252.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node253.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node254.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node255.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node256.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node257.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node258.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img10.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img100.png
@@ -536,6 +600,165 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img337.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img338.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img339.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img340.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img341.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img342.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img343.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img344.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img345.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img346.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img347.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img348.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img349.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img350.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img351.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img352.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img353.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img354.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img355.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img356.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img357.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img358.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img359.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img360.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img361.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img362.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img363.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img364.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img365.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img366.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img367.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img368.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img369.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img370.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img371.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img372.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img373.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img374.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img375.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img376.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img377.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img378.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img379.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img380.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img381.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img382.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img383.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img384.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img385.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img386.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img387.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img388.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img389.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img390.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img391.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img392.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img393.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img394.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img395.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img396.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img397.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img398.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img399.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img400.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img401.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img402.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img403.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img404.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img405.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img406.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img407.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img408.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img409.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img410.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img411.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img412.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img413.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img414.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img415.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img416.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img417.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img418.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img419.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img420.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img421.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img422.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img423.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img424.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img425.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img426.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img427.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img428.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img429.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img430.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img431.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img432.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img433.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img434.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img435.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img436.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img437.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img438.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img439.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img440.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img441.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img442.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img443.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img444.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img445.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img446.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img447.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img448.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img449.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img450.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img451.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img452.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img453.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img454.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img455.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img456.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img457.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img458.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img459.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img460.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img461.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img462.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img463.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img464.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img465.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img466.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img467.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img468.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img469.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img470.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img471.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img472.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img473.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img474.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img475.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img476.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img477.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img478.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img479.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img480.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img481.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img482.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img483.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img484.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img485.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img486.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img487.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img488.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img489.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img490.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img491.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img492.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img493.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img494.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img495.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img496.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img497.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img498.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
 %%PORTDOCS%%%%DOCSDIR%%/cgx.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
@@ -688,37 +911,40 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node147.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node148.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node149.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node150.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node151.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node152.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node153.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node154.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node155.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
 %%PORTDOCS%%%%DOCSDIR%%/cgx/internals.pl
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img3.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img18.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img1.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img12.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img17.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img14.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img15.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img16.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img13.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img5.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img4.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img7.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img9.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img6.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/node150.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img8.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img2.gif
 %%PORTDOCS%%%%DOCSDIR%%/cgx/labels.pl
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.pl
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
 %%PORTDOCS%%%%DOCSDIR%%/cgx/index.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img11.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img10.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/node151.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img19.gif
-%%PORTDOCS%%%%DOCSDIR%%/cgx/img20.gif
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img1.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img2.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img3.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img7.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img8.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img9.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img10.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img11.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img12.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img13.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img14.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img15.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img16.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img17.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img18.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img19.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img20.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
@@ -750,6 +976,8 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtelg.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtelp.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtelp.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aircolumn.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aircolumn.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aniso.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aniso.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/anipla.dat.ref
@@ -758,10 +986,20 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axial.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axiplane.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axiplane.inp
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam.dat.ref
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbo.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbo.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtcr.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtcr.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtfc.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtfc.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beammrco.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beammrco.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamread.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamread.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamth.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamth.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamtor.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamtor.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam10p.dat.ref
@@ -776,8 +1014,6 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8f.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8p.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8p.inp
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8rp.dat.ref
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8rp.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8t.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beam8t.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamb.dat.ref
@@ -878,10 +1114,24 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamt4.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamu.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamu.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamwrite.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamwrite.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d15.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d15.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d6.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d6.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/compare
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/fullseg.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/fullseg.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/numcheck.awk
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20cf.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20cf.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20df.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20df.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20fi.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20fi.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel8ra.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel8ra.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/sc123.dat.ref