8 files changed, 131 insertions, 48 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 3b128777061c..cc3bdba7e962 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.7
+PORTVERSION=	1.8
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 7537e21397cc..e169dfd2f1a2 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,18 +1,18 @@
-MD5 (calculix/ccx_1.7.src.tar.bz2) = c216bf34b3b880d593fed80d40ef66a9
-SHA256 (calculix/ccx_1.7.src.tar.bz2) = a13ac573252abd3e252086f7ed4be5f148a393a452378f6157438bbe606ec211
-SIZE (calculix/ccx_1.7.src.tar.bz2) = 543798
-MD5 (calculix/cgx_1.7.all.tar.bz2) = 2eb6bd8561568ca3709905baa56f53ff
-SHA256 (calculix/cgx_1.7.all.tar.bz2) = 1419dd1af7c471d6b46e86709c344133f56152841dcf6be17754895aba951748
-SIZE (calculix/cgx_1.7.all.tar.bz2) = 1148005
-MD5 (calculix/ccx_1.7.htm.tar.bz2) = da2442aaa5edff56381a13a1d046808b
-SHA256 (calculix/ccx_1.7.htm.tar.bz2) = bdc934f2be2e11675c94e7197028ffa2a6ec8877af99649155d33070098ef6ed
-SIZE (calculix/ccx_1.7.htm.tar.bz2) = 1193865
-MD5 (calculix/cgx_1.7.htm.tar.bz2) = b3c0064ab8bd2417eb49e4fabc4008da
-SHA256 (calculix/cgx_1.7.htm.tar.bz2) = 5153386074f7f18110f604b08b9996c7f2507cbb7484f1cf529f3a83ea9afa7e
-SIZE (calculix/cgx_1.7.htm.tar.bz2) = 222652
-MD5 (calculix/ccx_1.7.ps.tar.bz2) = 4847a998261f2351dce70f79b8d703b6
-SHA256 (calculix/ccx_1.7.ps.tar.bz2) = f948231446ea2c49d51a136c5db36bc8aa374be917332b4a133283aeb9bee4f2
-SIZE (calculix/ccx_1.7.ps.tar.bz2) = 1491970
-MD5 (calculix/cgx_1.7.ps.bz2) = daab735645eb61006bc13b00b26cd546
-SHA256 (calculix/cgx_1.7.ps.bz2) = 31f1e07a925c0e569b02099efbb950784633b6995a03cdf166fd1217bc84be9e
-SIZE (calculix/cgx_1.7.ps.bz2) = 286585
+MD5 (calculix/ccx_1.8.src.tar.bz2) = 2a594ea3d9e93990197c727fdfb70ebe
+SHA256 (calculix/ccx_1.8.src.tar.bz2) = eed476daf2453340bafa14b0d49f9e9825c88fc66739fbf686b3c08c0ceaf0ff
+SIZE (calculix/ccx_1.8.src.tar.bz2) = 591107
+MD5 (calculix/cgx_1.8.all.tar.bz2) = 725fdecb216b7b6f6042c87c76a66608
+SHA256 (calculix/cgx_1.8.all.tar.bz2) = eb5b19954abaa616f4b88a3eb40c06c1f2be6e99ffa673cb94362c0a2467981d
+SIZE (calculix/cgx_1.8.all.tar.bz2) = 1127967
+MD5 (calculix/ccx_1.8.htm.tar.bz2) = 23b358433f113f9f7b0efbbac54df10b
+SHA256 (calculix/ccx_1.8.htm.tar.bz2) = a3be6a55ecb0129b2591b0bfa276960eaa035b6cecfdf4abc62646b29714b1e8
+SIZE (calculix/ccx_1.8.htm.tar.bz2) = 1148338
+MD5 (calculix/cgx_1.8.htm.tar.bz2) = c59165759c23385d82e62ab1795014d3
+SHA256 (calculix/cgx_1.8.htm.tar.bz2) = 6e59b4fc2e3d09e683b67e3fc96aa15a89a83464456a8d5d0d48f812be14e5d8
+SIZE (calculix/cgx_1.8.htm.tar.bz2) = 222492
+MD5 (calculix/ccx_1.8.ps.tar.bz2) = e62ce9b0bc461f80d17231643f552ea7
+SHA256 (calculix/ccx_1.8.ps.tar.bz2) = b0ccc40e6de59dfa87d85f282dc786f9068c9a0302219a3900dba00e1eac1720
+SIZE (calculix/ccx_1.8.ps.tar.bz2) = 1570848
+MD5 (calculix/cgx_1.8.ps.bz2) = f8a70988796e6a6fd0a474a5612fa59b
+SHA256 (calculix/cgx_1.8.ps.bz2) = 4b1ebda82f2cd5c19c25a9ff03aec388208a63f118b757279ad1e11634102aa9
+SIZE (calculix/cgx_1.8.ps.bz2) = 287607
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 5c3dd0ff87d6..c9db1806e5cf 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.7/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
-+++ ccx_1.7/src/CalculiX.h	Sun Feb 19 22:27:54 2006
+--- ccx_1.8/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_1.8/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 0ef4089fa5cf..bbf2e4e44887 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,35 +1,35 @@
---- ccx_1.7/src/Makefile.orig	Sun Mar  4 02:34:11 2007
-+++ ccx_1.7/src/Makefile	Sun Mar 25 14:25:45 2007
-@@ -1,8 +1,8 @@
+--- ccx_1.8/src/Makefile.orig	2008-08-01 04:24:46.000000000 +0900
++++ ccx_1.8/src/Makefile	2008-09-02 10:20:15.000000000 +0900
+@@ -1,9 +1,9 @@
+ 
 -CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
 -FFLAGS = -Wall -O 
 +CFLAGS+= -Wall -O  -I. -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE %%PTHREAD_CFLAGS%%
 +FFLAGS+= -Wall -O 
  
 -CC=cc
--FC=g77
+-FC=gfortran
 +CC=%%CC%%
 +FC=%%FC%%
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -379,15 +379,12 @@
+@@ -462,15 +462,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
-+DIR=%%LOCALBASE%%/lib
-+  
-+LIBS = -lspooles -larpack -ltaucs -lmetis %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
++LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
  
- ccx_1.7: $(OCCXMAIN) ccx_1.7.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_1.7.c; g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.7.a  $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_1.7.c; ${FC} ${FFLAGS} -o $@ $(OCCXMAIN) ccx_1.7.a  %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
+ ccx_1.8: $(OCCXMAIN) ccx_1.8.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; gfortran -Wall -O -o $@ $(OCCXMAIN) ccx_1.8.a  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_1.8.c; ${FC} ${FFLAGS} -O -o $@ $(OCCXMAIN) ccx_1.8.a  %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
  
- ccx_1.7.a: $(OCCXF) $(OCCXC)
+ ccx_1.8.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 d93c74c37060..2975b194abd6 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.7/src/Makefile.orig	2007-08-25 07:37:49.000000000 +0900
-+++ cgx_1.7/src/Makefile	2007-09-22 07:28:34.000000000 +0900
+--- cgx_1.8/src/Makefile.orig	2007-08-25 07:37:49.000000000 +0900
++++ cgx_1.8/src/Makefile	2007-09-22 07:28:34.000000000 +0900
 @@ -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 760351407bf6..1434bfea9c32 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.7/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
-+++ cgx_1.7/src/cgx.h	Sun Feb 19 22:09:50 2006
+--- cgx_1.8/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
++++ cgx_1.8/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.7/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_1.7/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_1.8/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_1.8/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 5157e4b66d95..d18830da997c 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.7/src/uselibSNL.cpp.orig	Mon Feb 26 17:01:57 2007
-+++ cgx_1.7/src/uselibSNL.cpp	Sun Mar 25 14:27:21 2007
+--- cgx_1.8/src/uselibSNL.cpp.orig	Mon Feb 26 17:01:57 2007
++++ cgx_1.8/src/uselibSNL.cpp	Sun Mar 25 14:27:21 2007
 @@ -27,7 +27,7 @@
  #include <extUtil.h>
  #include "uselibSNL.h"
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 6b0b1b23eb71..96f2aac8c760 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.7.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.8.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -1226,10 +1226,90 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img896.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img897.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img898.png
-
-
-
-
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img899.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img900.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img901.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img902.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img903.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img904.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img905.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img906.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img907.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img908.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img909.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img910.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img911.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img912.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img913.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img914.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img915.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img916.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img917.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img918.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img919.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img920.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img921.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img922.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img923.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img924.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img925.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img926.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img927.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img928.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img929.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img930.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img931.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img932.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img933.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img934.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img935.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img936.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img937.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img938.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img939.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img940.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img941.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img942.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img943.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img944.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node426.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node427.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node428.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node429.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node430.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node431.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node432.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node433.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node434.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node435.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node436.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node437.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node438.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node439.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node440.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node441.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node442.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node443.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node444.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node445.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node446.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node447.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node448.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node449.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node450.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node451.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node452.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node453.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node454.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node455.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node456.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node457.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node458.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node459.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node460.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node461.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node462.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node463.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node326.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node327.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node328.html
@@ -1331,7 +1411,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node424.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node425.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx_1.7.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.8.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -1542,6 +1622,9 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node171.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node172.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node173.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node174.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node175.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd