11 files changed, 274 insertions, 109 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 5ef8473bc89e..be354fd47990 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -51,7 +50,6 @@ DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}	\
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
 USE_GL=	yes
-USE_REINPLACE=	yes
 BLAS_LIBS?=	-lf77blas -latlas
 
 BROWSER?=	mozilla
@@ -63,6 +61,11 @@ PSVIEWER?=	gv
 USE_GCC=	3.4
 .endif
 
+.if ${ARCH} == "amd64"
+FFLAGS+=	-fPIC
+CFLAGS+=	-fPIC
+.endif
+
 .if !defined(WITH_EXAMPLES)
 PLIST_SUB=	WITH_EXAMPLES="@comment "
 .else
@@ -89,20 +92,6 @@ pre-build:
 	s+"mozilla"+"${BROWSER}"+ ; \
 	s+"ghostview"+"${PSVIEWER}"+ ;' \
 		${WRKSRC}/cgx_${PORTVERSION}/src/cgx.h
-# This fixes bugs in ccx 1.4
-	@${REINPLACE_CMD} -e 's+description[12]+description[13]+g;' \
-		${WRKSRC}/ccx_1.4/src/arpackbu.c	\
-		${WRKSRC}/ccx_1.4/src/arpack.c	\
-		${WRKSRC}/ccx_1.4/src/arpackcs.c	\
-		${WRKSRC}/ccx_1.4/src/dyna.c		\
-		${WRKSRC}/ccx_1.4/src/frdcyc.c	\
-		${WRKSRC}/ccx_1.4/src/nonlingeo.c	\
-		${WRKSRC}/ccx_1.4/src/prespooles.c	\
-		${WRKSRC}/ccx_1.4/src/profile.c	\
-		${WRKSRC}/ccx_1.4/src/sensitivity.c	\
-		${WRKSRC}/ccx_1.4/src/steadystate.c
-	@${REINPLACE_CMD} -e 's+output[3]+output[4]+g;' \
-		${WRKSRC}/ccx_1.4/src/ccx_1.4.c
 
 do-build:
 	@(cd ${WRKSRC}/ccx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(GMAKE) )
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 93b06e2f2328..9c8691b07aee 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,18 +1,24 @@
-MD5 (calculix/ccx_1.4.src.tar.bz2) = 2ce03b71a2b20ec8cb9d9ba8089c5712
-SHA256 (calculix/ccx_1.4.src.tar.bz2) = a3e74114f650eea0a0cda47827933806321e57e7759fe744c3d0d138eb88092c
-SIZE (calculix/ccx_1.4.src.tar.bz2) = 323632
-MD5 (calculix/cgx_1.4.all.tar.bz2) = 295f49929017e55615928e533afba7ed
-SHA256 (calculix/cgx_1.4.all.tar.bz2) = 517b4260f9d087458f3f48337d36f5c0ffb95aa4ff510b6be544412e500e22f3
-SIZE (calculix/cgx_1.4.all.tar.bz2) = 1022316
-MD5 (calculix/ccx_1.4.htm.tar.bz2) = 42d42e633c935d3219fb163aa6a59042
-SHA256 (calculix/ccx_1.4.htm.tar.bz2) = aea542fb017f2238d4488d26d46425f9fbfe8d7a4c7867f7ae1fdb547e37849d
-SIZE (calculix/ccx_1.4.htm.tar.bz2) = 757108
-MD5 (calculix/cgx_1.4.htm.tar.bz2) = 3141024f344e13e58a31ab17949e6110
-SHA256 (calculix/cgx_1.4.htm.tar.bz2) = 1d1b58b52966bb980f36babcd171f669f327a4f9921f57b4f45d722728d4ce04
-SIZE (calculix/cgx_1.4.htm.tar.bz2) = 215788
-MD5 (calculix/ccx_1.4.ps.tar.bz2) = 8e1adaa2ed241e6bab923f268f48a770
-SHA256 (calculix/ccx_1.4.ps.tar.bz2) = 990f0463a0b67702bd89784252d2d9c8bdd615d23db690b0c8cb9857daa1610b
-SIZE (calculix/ccx_1.4.ps.tar.bz2) = 714211
-MD5 (calculix/cgx_1.4.ps.bz2) = d648522ef7db12127138e6d1e4fe3d24
-SHA256 (calculix/cgx_1.4.ps.bz2) = f0bc575cfa576575973999d8fcc7f351291874acb06572b216c0cc1cb9a41516
-SIZE (calculix/cgx_1.4.ps.bz2) = 277905
+MD5 (calculix/ccx_1.5.src.tar.bz2) = 7292cf0f4a8dda1ea27f118eb1cfbe0c
+SHA256 (calculix/ccx_1.5.src.tar.bz2) = 5963e24b6b6d112559f8f3647986b532da73483627a915dd8ebbb60ecea5b4ee
+SIZE (calculix/ccx_1.5.src.tar.bz2) = 334330
+MD5 (calculix/cgx_1.5.all.tar.bz2) = bd19b5bd80c8ddaf60c6b676e77d13b2
+SHA256 (calculix/cgx_1.5.all.tar.bz2) = 9b9f90de8f3c46e3e4038af7ceb27471686f463c7ae229d1430bfa81e94f047b
+SIZE (calculix/cgx_1.5.all.tar.bz2) = 1007851
+MD5 (calculix/ccx_1.5.htm.tar.bz2) = da0315a4fa4dbd6f64d431a4097016af
+SHA256 (calculix/ccx_1.5.htm.tar.bz2) = 38fa52c3394650520e651acd17188819a5a4e811cd14bfe00f4fcaa0a83d4d27
+SIZE (calculix/ccx_1.5.htm.tar.bz2) = 861444
+MD5 (calculix/cgx_1.5.htm.tar.bz2) = 366863b01210e1556cf10cac527cbd80
+SHA256 (calculix/cgx_1.5.htm.tar.bz2) = 84c6b3bed1813c66848c7f15bfb978b142130f3c39114eb7960b852b7f61f611
+SIZE (calculix/cgx_1.5.htm.tar.bz2) = 216952
+MD5 (calculix/ccx_1.5.ps.tar.bz2) = ee205420b894e238f9a334acf9b14750
+SHA256 (calculix/ccx_1.5.ps.tar.bz2) = e7460d9a605c59a2bfb319741469e26c584fcb484d36c6c236af334a38e15b27
+SIZE (calculix/ccx_1.5.ps.tar.bz2) = 1272168
+MD5 (calculix/cgx_1.5.ps.bz2) = 947079379df4fad0b42f4486777ff6ee
+SHA256 (calculix/cgx_1.5.ps.bz2) = eb447f4505720ee83f6dca56831626b37e5d701b3cbe3e7c9900f27c3fac751b
+SIZE (calculix/cgx_1.5.ps.bz2) = 281369
+MD5 (calculix/ccx_1.5.test.tar.bz2) = c47f83e4763141bd66bbb6029400eb3b
+SHA256 (calculix/ccx_1.5.test.tar.bz2) = 09dce4bbe73a2c515c256805bd3585ec0d50a5a2481ba4a6ddb8dfcad46c35e8
+SIZE (calculix/ccx_1.5.test.tar.bz2) = 1011067
+MD5 (calculix/cgx_1.5.exa.tar.bz2) = f5ee120697869c20adb868899608527e
+SHA256 (calculix/cgx_1.5.exa.tar.bz2) = a2e85ddfbf85f226b273f303f18e3a6f5334e98975923e919d4089d714d0a861
+SIZE (calculix/cgx_1.5.exa.tar.bz2) = 239408
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 08678fb3e544..b62accabade1 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.4/src/CalculiX.h.orig	Sat Aug 13 05:39:08 2005
-+++ ccx_1.4/src/CalculiX.h	Mon Oct 10 16:07:52 2005
+--- ccx_1.5/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_1.5/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 ac4deea2a91c..5bacc85e5d54 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,37 +1,36 @@
---- ccx_1.4/src/Makefile.orig	Mon Oct 10 16:08:51 2005
-+++ ccx_1.4/src/Makefile	Mon Oct 10 16:12:15 2005
+--- ccx_1.5/src/Makefile.orig	Sun Feb 19 09:28:07 2006
++++ ccx_1.5/src/Makefile	Mon Feb 20 16:58:56 2006
 @@ -1,8 +1,10 @@
 -CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
 -FFLAGS = -Wall -O 
-+CFLAGS +=	-I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles \
++CFLAGS += -O  -I. -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles \
 +		-DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DTAUCS	\
 +		%%PTHREAD_CFLAGS%%
-+FFLAGS += -O
++FFLAGS += -O 
  
 -CC=cc
 -FC=g77
-+CC=%%CC%%
-+FC=%%FC%%
++CC?=%%CC%%
++FC?=%%FC%%
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -289,15 +291,12 @@
+@@ -297,15 +299,13 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
 -DIR=../../../SPOOLES.2.2
--
++DIR=%%LOCALBASE%%/lib
+ 
 -LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
--       -lm
-+DIR=%%LOCALBASE%%/lib
-+  
-+LIBS =	-lspooles -larpack -ltaucs -llapack -lmetis %%BLAS_LIBS%% -lm
++LIBS = -lspooles -larpack -ltaucs -llapack -lmetis %%BLAS_LIBS%%	\
+        -lm
+ 
+ ccx_1.5: $(OCCXMAIN) ccx_1.5.a  $(LIBS)
+-	g77 -Wall -O  -o $@ $(OCCXMAIN) ccx_1.5.a  $(LIBS)
++	${FC} ${FFLAGS}  -o $@ $(OCCXMAIN) ccx_1.5.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
  
- ccx_1.4: $(OCCXMAIN) ccx_1.4.a  $(LIBS)
--	g77 -Wall -O  -o $@ $(OCCXMAIN) ccx_1.4.a  $(LIBS)
-+	${FC} $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.4.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
-
- ccx_1.4.a: $(OCCXF) $(OCCXC)
+ ccx_1.5.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?
diff --git a/cad/calculix/files/patch-cgx_1.4+src+readFoam.c b/cad/calculix/files/patch-cgx_1.4+src+readFoam.c
deleted file mode 100644
index d8f0efafc1f4..000000000000
--- a/cad/calculix/files/patch-cgx_1.4+src+readFoam.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- cgx_1.4/src/readFoam.c	Tue Sep 13 06:34:28 2005
-+++ cgx_1.4/src/readFoam.c	Sun Nov 20 08:27:42 2005
-@@ -4,7 +4,13 @@
- 
- 
- #include <cgx.h>
-+//dirent.h should oveeride sys/dir.h...
-+#include <osreldate.h>
-+#if __FreeBSD_version > 500000
- #include <sys/dir.h>
-+#else
-+#include <dirent.h>
-+#endif
- 
- #define R_GAS    287.1
- #define kappa    1.4
diff --git a/cad/calculix/files/patch-cgx_1.4+src+sendSet.c b/cad/calculix/files/patch-cgx_1.4+src+sendSet.c
deleted file mode 100644
index b28202aa0725..000000000000
--- a/cad/calculix/files/patch-cgx_1.4+src+sendSet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- cgx_1.4/src/sendSet.c.orig	Sun Oct 30 16:53:40 2005
-+++ cgx_1.4/src/sendSet.c	Sun Oct 30 16:54:24 2005
-@@ -965,7 +965,7 @@
-   int   setNr;
-   int  length, i,j;
-   unsigned char prognam[MAX_LINE_LENGTH];
--  float *temp, *alpha;
-+  static float *temp, *alpha;
-   FILE *handle;
-   int  n, lc, entity;
- 
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile
index 3f4bfbd51f3b..7039583b1155 100644
--- a/cad/calculix/files/patch-cgx_VER+src+Makefile
+++ b/cad/calculix/files/patch-cgx_VER+src+Makefile
@@ -1,7 +1,8 @@
---- cgx_1.4/src/Makefile.orig	Tue Sep 13 02:24:07 2005
-+++ cgx_1.4/src/Makefile	Sun Nov  6 22:42:56 2005
+--- cgx_1.5/src/Makefile.orig	Sun Feb 19 22:13:12 2006
++++ cgx_1.5/src/Makefile	Sun Feb 19 22:20:42 2006
 @@ -1,13 +1,13 @@
- CFLAGS = -O2 -Wall \
+-CFLAGS = -O2 -Wall \
++CFLAGS += -O2 -Wall \
    -I./ \
    -I/usr/include \
 -  -I/usr/include/GL \
@@ -10,15 +11,16 @@
 -  -I/usr/X11/include 
 +  -I%%X11BASE%%/include 
  
- LFLAGS = \
+-LFLAGS = \
 -  -L/usr/lib -lGL -lGLU -lglut \
 -  -L/usr/X11/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
++LFLAGS += \
 +  -L%%X11BASE%%/lib -lGL -lGLU -lglut \
-+  -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
++  -L%%X11BASE%%/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
    -lm 
  
  # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-@@ -118,42 +118,6 @@
+@@ -115,42 +115,6 @@
   write2nas.c \
   write2tochnog.c \
   writefbd.c \
@@ -61,12 +63,12 @@
   uselibSNL.cpp \
   ../../libSNL/src/*.cpp
  
-@@ -161,7 +125,7 @@
+@@ -158,7 +122,7 @@
  OLIB = $(SLIB:.c=.o)
  
  cgx: $(OLIB)
 -	g++   $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
-+	$(CXX)   $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
++	${CXX}  $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
  
  
  
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgx.h b/cad/calculix/files/patch-cgx_VER+src+cgx.h
index 2c9a19f5f098..d3125d99d579 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.4/src/cgx.h.orig	Mon Oct 10 15:46:23 2005
-+++ cgx_1.4/src/cgx.h	Mon Oct 10 16:06:53 2005
-@@ -77,8 +77,8 @@
- #define     MILLISECONDS_PER_PERIOD 1200 
- 
- /* default location of the help files, please insert the actual one */
--#define     HELPFILE        {"/usr/local/CalculiX/cgx_1.4/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_1.4/doc/ccx/ccx.html"}
-+#define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
-+     "%%DOCSDIR%%/ccx/ccx.html"} 
- 
+--- cgx_1.5/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
++++ cgx_1.5/src/cgx.h	Sun Feb 19 22:09:50 2006
+@@ -86,8 +86,8 @@
+                              "/yaprod/cae/application/CalculiX/doc/ccx/ccx.html"}
+   #endif
+ #else
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_1.5/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_1.5/doc/ccx/ccx.html"}
++  #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
++    "%%DOCSDIR%%/ccx/ccx.html"}
+ #endif
  
  /* html browser, change if necessary */
diff --git a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
index fbdb04c42a1d..08675bee3d45 100644
--- a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
+++ b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
@@ -1,5 +1,5 @@
---- cgx_1.4/src/uselibSNL.cpp.orig	Tue Sep 13 06:34:28 2005
-+++ cgx_1.4/src/uselibSNL.cpp	Mon Oct 10 16:05:10 2005
+--- cgx_1.5/src/uselibSNL.cpp.orig	Sun Feb 19 22:06:07 2006
++++ cgx_1.5/src/uselibSNL.cpp	Sun Feb 19 22:06:38 2006
 @@ -26,7 +26,7 @@
  
  #include <extUtil.h>
diff --git a/cad/calculix/files/patch-libSNL+makefile b/cad/calculix/files/patch-libSNL+makefile
new file mode 100644
index 000000000000..3cdb000488f3
--- /dev/null
+++ b/cad/calculix/files/patch-libSNL+makefile
@@ -0,0 +1,18 @@
+--- libSNL/src/makefile.orig	Mon Feb 20 13:50:59 2006
++++ libSNL/src/makefile	Mon Feb 20 13:52:03 2006
+@@ -14,11 +14,11 @@
+ 
+ libName = libSNL.so.0.2
+ 
+-export cflags = -Wall -g
+-export cname = g++
++export cflags = -fPIC -Wall -g
++export cname = c++
+ 
+-CXXFLAGS := $(cflags)
+-CFLAGS := $(cflags)
++CXXFLAGS ?= $(cflags)
++CFLAGS ?= $(cflags)
+ 
+ libSNL:     $(objFiles)
+ 	        $(cname) $(cflags) -fPIC -shared -o $(libName) $(objFiles)
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 1077d68589e0..682ec1fde35c 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.4.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.5.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -100,6 +100,9 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node184.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node185.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node186.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node187.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node188.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node189.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node19.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node20.html
@@ -189,9 +192,6 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node187.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node188.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx/node189.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node190.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node191.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node192.html
@@ -313,6 +313,21 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node308.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node309.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node310.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node311.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node312.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node313.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node314.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node315.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node316.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node317.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node318.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node319.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node320.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node321.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node322.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node323.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node324.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node325.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img10.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img100.png
@@ -886,9 +901,129 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img571.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img572.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img573.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img574.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img575.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img576.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img577.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img578.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img579.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img580.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img581.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img582.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img583.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img584.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img585.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img586.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img587.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img588.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img589.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img590.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img591.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img592.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img593.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img594.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img595.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img596.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img597.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img598.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img599.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img600.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img601.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img602.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img603.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img604.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img605.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img606.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img607.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img608.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img609.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img610.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img611.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img612.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img613.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img614.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img615.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img616.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img617.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img618.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img619.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img620.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img621.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img622.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img623.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img624.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img625.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img626.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img627.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img628.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img629.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img630.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img631.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img632.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img633.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img634.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img635.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img636.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img637.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img638.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img639.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img640.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img641.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img642.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img643.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img644.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img645.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img646.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img647.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img648.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img649.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img650.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img651.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img652.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img653.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img654.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img655.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img656.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img657.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img658.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img659.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img660.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img661.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img662.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img663.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img664.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img665.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img666.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img667.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img668.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img669.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img670.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img671.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img672.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img673.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img674.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img675.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img676.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img677.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img678.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img679.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img680.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img681.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img682.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img683.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img684.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img685.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img686.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img687.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img688.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img689.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img690.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img691.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img692.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img693.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img694.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx_1.4.ps.gz
-%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.5.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -1050,6 +1185,10 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node158.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node159.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node160.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node161.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node162.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node163.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node164.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
@@ -1089,12 +1228,16 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/sphere_vol.fbd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/result.frd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/geometry.fbd
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/cgx/lavfm.fbd
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/README
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/isaac.fbl
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/rae2822.fbd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/ccx/lavfm_cyc.nam
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/ccx/lavfm_cyl.bou
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/ccx/lavfm.msh
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/ccx/cyc/ccx.fbl
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/ccx/cyc/lavfmcyc.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/compressor/cgx/lavfm.fbd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/nurbs/halter.fbd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtel2.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtel2.inp
@@ -1112,6 +1255,10 @@ 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/acou1.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/acou1.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/acou2.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/acou2.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aircolumn.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aircolumn.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aniso.dat.ref
@@ -1130,6 +1277,22 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axiplane.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamabq.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamabq.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdelay.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdelay.inp 
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy10.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy10.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy11.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy11.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy12.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy12.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy13.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy13.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy7.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy7.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy8.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy8.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy9.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamdy9.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbo.dat.ref
@@ -1269,6 +1432,8 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cube2.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cubenewt.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cubenewt.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/dam.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/dam.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/disk2.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/disk2.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/dist.dat.ref
@@ -1292,8 +1457,16 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress2.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress2.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress1.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress1.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress2.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress2.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress3.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/resstress3.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/sc123.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/sc123.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/section.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/section.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segment.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segment.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segment1.dat.ref
@@ -1304,6 +1477,10 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segmentf.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segmentm.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segmentm.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segmenttet.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segmenttet.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segststate.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segststate.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/shell1.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/shell1.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/shell2.dat.ref
@@ -1322,6 +1499,7 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/thermomech.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.inp
+%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/ISAAC
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/test
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/nurbs
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/compressor/cgx