Update to 1.3

PR:		78958
Submitted by:	Pedro F. Giffuni <giffunip@asme.org>

11 files changed, 230 insertions, 97 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 5ef09aaf3217..c25fefc09dea 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,28 +6,49 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.2
+PORTVERSION=	1.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
-DISTFILES=	ccx_${PORTVERSION}.src.tar.gz cgx_${PORTVERSION}.tar.gz
+DISTFILES=	${DIST_SOURCES}
 .if !defined(NOPORTDOCS)
-DISTFILES+=	ccx_${PORTVERSION}.ps.tar.gz cgx_${PORTVERSION}.ps.tar.gz \
-		ccx_${PORTVERSION}.htm.tar.gz cgx_${PORTVERSION}.htm.tar.gz
+DISTFILES+=	${DIST_HTM} ${DIST_PS}
 .endif
 .ifdef WITH_EXAMPLES
-DISTFILES+=	ccx_${PORTVERSION}.test.tar.gz
+DISTFILES+=	${DIST_EXAMPLES}
 .endif
 DIST_SUBDIR=	calculix
+EXTRACT_ONLY=	${DIST_SOURCES}
+.if !defined(NOPORTDOCS)
+EXTRACT_ONLY+=	${DIST_HTM} ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
+.endif
+.ifdef WITH_EXAMPLES
+EXTRACT_ONLY+=	${DIST_EXAMPLES}
+.endif
 
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	A Three-Dimensional Structural Finite Element Program
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles \
-		${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack
+BUILD_DEPENDS=	${LOCALBASE}/lib/libarpack.a:${PORTSDIR}/math/arpack	\
+		${LOCALBASE}/lib/liblapack.a:${PORTSDIR}/math/lapack	\
+		${LOCALBASE}/lib/libspooles.a:${PORTSDIR}/math/spooles	\
+		${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis	\
+		${LOCALBASE}/lib/libtaucs.a:${PORTSDIR}/math/taucs
 LIB_DEPENDS=    atlas.1:${PORTSDIR}/math/atlas \
 		glut.3:${PORTSDIR}/graphics/libglut
 
+USE_BZIP2=	yes
+
+DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}	\
+		cgx_${PORTVERSION}.all${EXTRACT_SUFX}
+DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}	\
+		cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
+DIST_PS=	ccx_${PORTVERSION}.ps${EXTRACT_SUFX}	\
+		cgx_${PORTVERSION}.ps.bz2
+DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}	\
+		cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_GMAKE=	yes
 USE_GL=	yes
 USE_REINPLACE=	yes
 BLAS_LIBS=	-lf77blas -latlas
@@ -48,7 +69,7 @@ pre-everything::
 
 pre-build:
 	@${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g ; s+%%CC%%+${CC}+g ; \
-	s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS} -DUSE_MT+g; \
+	s+%%PTHREAD_CFLAGS%%+-DUSE_MT ${PTHREAD_CFLAGS}+g; \
 	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g; \
 	s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
@@ -64,7 +85,7 @@ pre-build:
 
 do-build:
 	@(cd ${WRKSRC}/ccx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
-	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
+	@(cd ${WRKSRC}/libSNL/src; ${SETENV} ${MAKE_ENV} $(GMAKE) )
 	@(cd ${WRKSRC}/cgx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
 
 do-install:
@@ -81,7 +102,9 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/cgx_${PORTVERSION}/doc/cgx/* \
 	  ${DOCSDIR}/cgx
 	@${INSTALL_DATA} ${WRKSRC}/ccx_${PORTVERSION}/doc/*.ps ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/cgx.ps ${DOCSDIR}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.ps.bz2	\
+	  ${DOCSDIR}
+	bunzip2 ${DOCSDIR}/cgx_${PORTVERSION}.ps.bz2
 	@${GZIP_CMD} ${DOCSDIR}/*.ps
 .endif
 .ifdef WITH_EXAMPLES
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 8415ae2e9e7e..23ce258922da 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,14 +1,16 @@
-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
+MD5 (calculix/ccx_1.3.src.tar.bz2) = 2d88eeba9ea5ba8052c0ec0c2871bfa0
+SIZE (calculix/ccx_1.3.src.tar.bz2) = 279067
+MD5 (calculix/cgx_1.3.all.tar.bz2) = e2d0cef943c78d535e657eab82c0cf9b
+SIZE (calculix/cgx_1.3.all.tar.bz2) = 806417
+MD5 (calculix/ccx_1.3.htm.tar.bz2) = 2c592cb5702b7480c4e30052cfd69fc0
+SIZE (calculix/ccx_1.3.htm.tar.bz2) = 745766
+MD5 (calculix/cgx_1.3.htm.tar.bz2) = 238804dc0ed34a94b2a595666500b61a
+SIZE (calculix/cgx_1.3.htm.tar.bz2) = 217894
+MD5 (calculix/ccx_1.3.ps.tar.bz2) = 1529fbacd548b2087b3eee03f70a6486
+SIZE (calculix/ccx_1.3.ps.tar.bz2) = 698255
+MD5 (calculix/cgx_1.3.ps.bz2) = 4501c42614c14e6417b4f46a9a66382b
+SIZE (calculix/cgx_1.3.ps.bz2) = 283724
+MD5 (calculix/ccx_1.3.test.tar.bz2) = 3da5d5781540dc0181ce956cc2063157
+SIZE (calculix/ccx_1.3.test.tar.bz2) = 855765
+MD5 (calculix/cgx_1.3.exa.tar.bz2) = 283ac6ad580db74fc186dac93d2229b4
+SIZE (calculix/cgx_1.3.exa.tar.bz2) = 232645
diff --git a/cad/calculix/files/patch-ccx_1.2+src+spooles.h b/cad/calculix/files/patch-ccx_1.2+src+spooles.h
deleted file mode 100644
index 6906382fad74..000000000000
--- a/cad/calculix/files/patch-ccx_1.2+src+spooles.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- ccx_1.2/src/spooles.h.orig	Sat Dec 25 01:58:09 2004
-+++ ccx_1.2/src/spooles.h	Sat Dec 25 13:25:29 2004
-@@ -24,7 +24,9 @@
- #include <misc.h>
- #include <FrontMtx.h>
- #include <SymbFac.h>
-+#ifdef USE_MT
- #include <MT/spoolesMT.h>
-+#endif
- 
- /* increase this for debugging */
- #define DEBUG_LVL	0
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index afea7cd992f7..85838c696a61 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.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
+--- ccx_1.3/src/CalculiX.h.orig	Mon Mar  3 00:35:58 2003
++++ ccx_1.3/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 c1c0c36937f0..a1e4f05d3f5f 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,9 +1,11 @@
---- ccx_1.2/src/Makefile.orig	Sun Jul 25 09:55:36 2004
-+++ ccx_1.2/src/Makefile	Wed Feb  2 15:53:46 2005
-@@ -1,8 +1,8 @@
--CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux"
--FFLAGS = -Wall -O
-+CFLAGS += -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" %%PTHREAD_CFLAGS%%
+--- ccx_1.3/src/Makefile.orig	Sat Feb 26 14:30:42 2005
++++ ccx_1.3/src/Makefile	Wed Mar  2 00:36:02 2005
+@@ -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 \
++		-DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DTAUCS	\
++		%%PTHREAD_CFLAGS%%
 +FFLAGS += -O
  
 -CC=cc
@@ -13,7 +15,7 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -248,15 +248,12 @@
+@@ -272,15 +274,12 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
@@ -24,11 +26,11 @@
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lm
-+LIBS = -lspooles -larpack %%BLAS_LIBS%% -lm
++LIBS =	-lspooles -larpack -ltaucs -llapack -lmetis %%BLAS_LIBS%% -lm
  
- ccx_1.2: $(OCCXMAIN) ccx_1.2.a  $(LIBS)
--	g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS)
-+	$(FC) %%PTHREAD_LIBS%% $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.2.a  $(LIBS) -L$(DIR)
+ ccx_1.3: $(OCCXMAIN) ccx_1.3.a  $(LIBS)
+-	g77 -Wall -O  -o $@ $(OCCXMAIN) ccx_1.3.a  $(LIBS)
++	${FC} $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.3.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
  
- ccx_1.2.a: $(OCCXF) $(OCCXC)
+ ccx_1.3.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 13efc7acb957..461983d62f81 100644
--- a/cad/calculix/files/patch-cgx_VER+src+Makefile
+++ b/cad/calculix/files/patch-cgx_VER+src+Makefile
@@ -1,38 +1,29 @@
---- 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 \
+--- cgx_1.3/src/Makefile.orig	Fri Feb 25 22:06:01 2005
++++ cgx_1.3/src/Makefile	Sat Feb 26 20:40:28 2005
+@@ -1,13 +1,13 @@
+ CFLAGS = -O2 -Wall \
+   -I./ \
+   -I/usr/include \
 -  -I/usr/include/GL \
--  -I/usr/local/CalculiX/libSNL/src \
--  -I/usr/X11/include 
-+CFLAGS += -I./ \
-+  -I%%X11BASE%%/include \
 +  -I%%X11BASE%%/include/GL \
-+  -I../../libSNL/src \
+   -I../../libSNL/src \
+-  -I/usr/X11/include 
 +  -I%%X11BASE%%/include 
  
  LFLAGS = \
--  -L/usr/local/CalculiX/libSNL/src -lSNL \
 -  -L/usr/lib -lGL -lGLU -lglut \
--  -L/usr/X11/lib -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-+  -L../../libSNL/src -lSNL \
+-  -L/usr/X11/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
 +  -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
-+# -lpthread is needed if mesaGL is using threading, otherwise it reduces performance
- 
- SLIB = \
-    AsplitA.c \
-@@ -110,7 +109,7 @@
+ # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+@@ -121,7 +121,7 @@
  OLIB = $(SLIB:.c=.o)
  
- cgx:  $(OLIB)
+ cgx: $(OLIB)
 -	g++   $(OLIB)  $(CFLAGS) $(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 5c9f8b7dc90f..b40f68cee11d 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.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 @@
+--- cgx_1.3/src/cgx.h.orig	Fri Feb 25 20:00:16 2005
++++ cgx_1.3/src/cgx.h	Sat Feb 26 20:45:51 2005
+@@ -63,8 +63,8 @@
  #define     MILLISECONDS_PER_PERIOD 1200 
  
  /* default location of the help files, please insert the actual one */
--#define     HELPFILE        {"/usr/local/CalculiX/cgx_1.2/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_1.2/doc/ccx/ccx.html"}
+-#define     HELPFILE        {"/usr/local/CalculiX/cgx_1.3/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_1.3/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"} */
diff --git a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
index 0271e0096d86..cc1498fe9c94 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.2/src/uselibSNL.cpp.orig	Sat Dec 25 01:43:08 2004
-+++ cgx_1.2/src/uselibSNL.cpp	Sat Dec 25 01:47:02 2004
+--- cgx_1.3/src/uselibSNL.cpp.orig	Sat Dec 25 01:43:08 2004
++++ cgx_1.3/src/uselibSNL.cpp	Sat Dec 25 01:47:02 2004
 @@ -1,6 +1,6 @@
  #include <extUtil.h>
  #include <snlCtrlPoint.h>
diff --git a/cad/calculix/files/patch-libSNL+src+Makefile b/cad/calculix/files/patch-libSNL+src+Makefile
deleted file mode 100644
index d90d6758e7c8..000000000000
--- a/cad/calculix/files/patch-libSNL+src+Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- libSNL/src/Makefile.orig	Thu Dec 23 15:22:37 2004
-+++ libSNL/src/Makefile	Thu Dec 23 15:24:48 2004
-@@ -1,6 +1,6 @@
- # libSNL Source Directory Root Makefile
- # -------------------------------------
--CPPFLAGS = -O2 -c
-+CPPFLAGS = $(CXXFLAGS) -c
- 
- 
- srcfiles = \
diff --git a/cad/calculix/pkg-descr b/cad/calculix/pkg-descr
index 4d170bf0d10c..1c117b628d29 100644
--- a/cad/calculix/pkg-descr
+++ b/cad/calculix/pkg-descr
@@ -12,6 +12,6 @@ Results obtained from CalculiX are in no way connected to ABAQUS.
 
 WWW: http://www.calculix.de/
 
-note: By default, the single-threaded solver is used this can be changed by
-setting the CCX_NPROC environment variable with the number of processors
-you want to use.
+note: By default the single-threaded solver is used, this can be changed 
+by setting the CCX_NPROC environment variable with the number of 
+processors you want to use.
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 40318f02c8f4..8fed710f8300 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.2.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.3.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -261,6 +261,40 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node256.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node257.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node258.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node259.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node260.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node261.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node262.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node263.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node264.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node265.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node266.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node267.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node268.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node269.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node270.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node271.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node272.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node273.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node274.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node275.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node276.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node277.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node278.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node279.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node280.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node281.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node282.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node283.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node284.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node285.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node286.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node287.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node288.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node289.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node290.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node291.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node292.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img10.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img100.png
@@ -759,8 +793,75 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img496.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img497.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img498.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img499.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img500.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img501.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img502.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img503.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img504.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img505.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img506.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img507.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img508.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img509.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img510.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img511.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img512.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img513.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img514.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img515.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img516.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img517.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img518.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img519.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img520.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img521.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img522.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img523.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img524.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img525.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img526.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img527.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img528.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img529.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img530.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img531.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img532.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img533.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img534.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img535.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img536.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img537.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img538.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img539.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img540.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img541.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img542.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img543.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img544.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img545.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img546.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img547.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img548.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img549.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img550.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img551.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img552.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img553.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img554.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img555.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img556.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img557.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img558.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img559.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img560.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img561.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img562.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img563.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img564.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img565.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.3.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -917,6 +1018,13 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node153.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node154.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node155.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node156.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node157.html
+%%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/images.tex
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
@@ -945,6 +1053,8 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img18.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img19.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img20.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img21.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img22.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
@@ -958,6 +1068,7 @@ bin/cgx
 %%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%%/nurbs/halter.fbd
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/achtel2.dat.ref
@@ -982,10 +1093,18 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/aniso.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/anipla.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/anipla.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/ax6.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/ax6.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/ax6ht.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/ax6ht.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axrad.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axrad.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axial.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axial.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axiplane.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/axiplane.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamabq.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamabq.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbf.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/beamhtbo.dat.ref
@@ -1121,9 +1240,21 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d6.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/c3d6.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/compare
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cube2.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cube2.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cubenewt.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/cubenewt.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/disk2.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/disk2.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/dist.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/dist.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/fullseg.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/fullseg.inp
-%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/numcheck.awk
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/furnace.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/furnace.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/gap.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/gap.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/numcheck.pl
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20cf.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20cf.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel20df.dat.ref
@@ -1134,6 +1265,8 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/oneel8ra.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress2.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/planestress2.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/sc123.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/sc123.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/segment.dat.ref
@@ -1160,6 +1293,10 @@ bin/cgx
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/solidshell2.inp
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/swing.dat.ref
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/swing.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/thermomech.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/thermomech.inp
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.dat.ref
+%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.inp
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/test
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/nurbs
 %%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/compressor/cgx