1. Update to 1.6 and make fetchable[1]

2. WITH_ATLAS knobs works.

Submitted by:	Pedro F. Giffuni and fenner[1]

9 files changed, 253 insertions, 61 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index a21cb58142ec..a3c1a0693a0b 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	1.6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -34,17 +33,6 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
 		spooles.1:${PORTSDIR}/math/spooles \
 		metis.1:${PORTSDIR}/math/metis	\
 		taucs.1:${PORTSDIR}/math/taucs
-.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=             yes
-.endif
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=		atlas.2:${PORTSDIR}/math/atlas
-BLAS_LIBS?=		-lf77blas -latlas
-.else
-LIB_DEPENDS+=		blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=		lapack.4:${PORTSDIR}/math/lapack
-BLAS_LIBS=		-lblas
-.endif
 
 USE_BZIP2=	yes
 
@@ -66,6 +54,20 @@ PSVIEWER?=	gv
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=             yes
+.endif
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=		atlas.2:${PORTSDIR}/math/atlas
+BLAS_LIBS=		-lf77blas -latlas
+LAPACK_LIBS=		-lalapack -lcblas
+.else
+LIB_DEPENDS+=		blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=		lapack.4:${PORTSDIR}/math/lapack
+BLAS_LIBS=		-lblas
+LAPACK_LIBS=		-llapack
+.endif
+
 WANT_FORTRAN=	yes #dummy but future use
 BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
 FC=		gfortran42
@@ -95,6 +97,7 @@ pre-build:
 	s+%%PTHREAD_CFLAGS%%+-DUSE_MT ${PTHREAD_CFLAGS}+g; \
 	s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g; \
 	s+%%BLAS_LIBS%%+${BLAS_LIBS}+ ; \
+	s+%%LAPACK_LIBS%%+${LAPACK_LIBS}+ ; \
 	s+%%LOCALBASE%%+${LOCALBASE}+g;' \
 		${WRKSRC}/ccx_${PORTVERSION}/src/Makefile
 	@${REINPLACE_CMD} -e 's+%%X11BASE%%+${X11BASE}+g; \
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 9c8691b07aee..95a3435b3104 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,24 +1,18 @@
-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
+MD5 (calculix/ccx_1.6.src.tar.bz2) = 5775c31ea4e8170a090ef6902bbd8470
+SHA256 (calculix/ccx_1.6.src.tar.bz2) = 8ad77292b6974df3d347cf66fc04f9fa1658bdc016e6f324cb725df869ee487f
+SIZE (calculix/ccx_1.6.src.tar.bz2) = 410373
+MD5 (calculix/cgx_1.6.all.tar.bz2) = 01ce9a7aaad60c8d4ba22611c8aba08c
+SHA256 (calculix/cgx_1.6.all.tar.bz2) = c53de86428cf38fc7f622e669cb9eaf3c1195b764e777313e7f7d3ae596e1b96
+SIZE (calculix/cgx_1.6.all.tar.bz2) = 1072136
+MD5 (calculix/ccx_1.6.htm.tar.bz2) = 9f46103b29cb508023417f46e8e82477
+SHA256 (calculix/ccx_1.6.htm.tar.bz2) = e05a05b7b5e16faa1cf6dd574a7fd8dd9dc3f8af892e89c893ddb74999259235
+SIZE (calculix/ccx_1.6.htm.tar.bz2) = 1035475
+MD5 (calculix/cgx_1.6.htm.tar.bz2) = 0267351a959ad95a98e87f45dca0526c
+SHA256 (calculix/cgx_1.6.htm.tar.bz2) = e990af39b13dca67a45362a7acf8aa0dac9167079c0a7acb1ce78443fa594d11
+SIZE (calculix/cgx_1.6.htm.tar.bz2) = 221298
+MD5 (calculix/ccx_1.6.ps.tar.bz2) = 56a8975536a598c0e941941fb6745b53
+SHA256 (calculix/ccx_1.6.ps.tar.bz2) = cab89ee7e87ef5007244c9261ad72b9edc7972f5d6a6159ccf8a21da20eef94e
+SIZE (calculix/ccx_1.6.ps.tar.bz2) = 1447952
+MD5 (calculix/cgx_1.6.ps.bz2) = 38161760a8a1c37c70a652740dd44531
+SHA256 (calculix/cgx_1.6.ps.bz2) = 37e8623ceb8310c9fa12652b0f871c6e0132e416aa966157bd032d1b0f31fa45
+SIZE (calculix/cgx_1.6.ps.bz2) = 285622
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index b62accabade1..059d091e31f6 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.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
+--- ccx_1.6/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_1.6/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 d197f6d05183..7a5a09afd2f1 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,8 +1,8 @@
---- 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
+--- ccx_1.6/src/Makefile.orig	Sun Feb 18 20:54:41 2007
++++ ccx_1.6/src/Makefile	Tue Feb 27 11:10:10 2007
 @@ -1,8 +1,10 @@
--CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
--FFLAGS = -Wall -O 
+-CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+-FFLAGS = -Wall -O3 
 +CFLAGS += -O  -I. -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles \
 +		-DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DTAUCS	\
 +		%%PTHREAD_CFLAGS%%
@@ -15,7 +15,7 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -297,15 +299,13 @@
+@@ -379,15 +381,12 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
@@ -25,12 +25,12 @@
 -LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
-+LIBS = -lspooles -larpack -ltaucs -llapack -lmetis %%BLAS_LIBS%%	\
-        -lm
+-       -lm
++LIBS = -lspooles -larpack -ltaucs -lmetis %%BLAS_LIBS%% %%LAPACK_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.6: $(OCCXMAIN) ccx_1.6.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_1.6.c; g77 -Wall -O3 -o $@ $(OCCXMAIN) ccx_1.6.a  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_1.6.c; ${FC} ${FFLAGS} -o $@ $(OCCXMAIN) ccx_1.6.a  %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
  
- ccx_1.5.a: $(OCCXF) $(OCCXC)
+ ccx_1.6.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 7039583b1155..8c38c109222f 100644
--- a/cad/calculix/files/patch-cgx_VER+src+Makefile
+++ b/cad/calculix/files/patch-cgx_VER+src+Makefile
@@ -1,5 +1,5 @@
---- 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
+--- cgx_1.6/src/Makefile.orig	Sun Feb 19 22:13:12 2006
++++ cgx_1.6/src/Makefile	Sun Feb 19 22:20:42 2006
 @@ -1,13 +1,13 @@
 -CFLAGS = -O2 -Wall \
 +CFLAGS += -O2 -Wall \
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgx.h b/cad/calculix/files/patch-cgx_VER+src+cgx.h
index d3125d99d579..5c8064f9543d 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_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
+--- cgx_1.6/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
++++ cgx_1.6/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        {"/usr/local/CalculiX/cgx_1.6/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_1.6/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
 +    "%%DOCSDIR%%/ccx/ccx.html"}
  #endif
diff --git a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
index 08675bee3d45..b6875561e0a7 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.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
+--- cgx_1.6/src/uselibSNL.cpp.orig	Sun Feb 19 22:06:07 2006
++++ cgx_1.6/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
index 3cdb000488f3..f4c673950ee8 100644
--- a/cad/calculix/files/patch-libSNL+makefile
+++ b/cad/calculix/files/patch-libSNL+makefile
@@ -4,7 +4,7 @@
  
  libName = libSNL.so.0.2
  
--export cflags = -Wall -g
+-export cflags = -Wall -fPIC -O3 
 -export cname = g++
 +export cflags = -fPIC -Wall -g
 +export cname = c++
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index f3e8ac6d9ca6..0e2830cc99cb 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.5.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.6.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -1022,8 +1022,192 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img692.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img693.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img694.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img695.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img696.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img697.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img698.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img699.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img700.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img701.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img702.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img703.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img704.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img705.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img706.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img707.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img708.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img709.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img710.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img711.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img712.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img713.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img714.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img715.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img716.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img717.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img718.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img719.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img720.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img721.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img722.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img723.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img724.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img725.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img726.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img727.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img728.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img729.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img730.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img731.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img732.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img733.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img734.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img735.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img736.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img737.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img738.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img739.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img740.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img741.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img742.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img743.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img744.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img745.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img746.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img747.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img748.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img749.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img750.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img751.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img752.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img753.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img754.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img755.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img756.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img757.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img758.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img759.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img760.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img761.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img762.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img763.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img764.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img765.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img766.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img767.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img768.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img769.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img770.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img771.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img772.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img773.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img774.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img775.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img776.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img777.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img778.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img779.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img780.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img781.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img782.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img783.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img784.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img785.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img786.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img787.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img788.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img789.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img790.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img791.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img792.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img793.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img794.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img795.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img796.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img797.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img798.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img799.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img800.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img801.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img802.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img803.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img804.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img805.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img806.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img807.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img808.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img809.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img810.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img811.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img812.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img813.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img814.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img815.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img816.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img817.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img818.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img819.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img820.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img821.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img822.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img823.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img824.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img825.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img826.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node326.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node327.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node328.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node329.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node330.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node331.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node332.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node333.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node334.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node335.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node336.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node337.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node338.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node339.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node340.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node341.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node342.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node343.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node344.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node345.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node346.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node347.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node348.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node349.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node350.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node351.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node352.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node353.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node354.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node355.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node356.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node357.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node358.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node359.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node360.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node361.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node362.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node363.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node364.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node365.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node366.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node367.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node368.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node369.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node370.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node371.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node372.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node373.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node374.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node375.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node376.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node377.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx_1.5.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.6.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -1219,6 +1403,17 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img20.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img21.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img22.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img23.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img24.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img25.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img26.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img27.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node165.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node166.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node167.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node168.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node169.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node170.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd