Update to 1.7.

svn path=/head/; revision=199877

cad/calculix/Makefile

@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	1.6
+PORTVERSION=	1.7
-PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}

cad/calculix/distinfo

@@ -1,24 +1,18 @@
-MD5 (calculix/ccx_1.6.src.tar.bz2) = 470612eb89f71a38649c57e4aa2cd9e3
+MD5 (calculix/ccx_1.7.src.tar.bz2) = c216bf34b3b880d593fed80d40ef66a9
-SHA256 (calculix/ccx_1.6.src.tar.bz2) = e6e3fd6344429e17771982fbd72f0e178f700d9421be1e841bc659debb9d1732
+SHA256 (calculix/ccx_1.7.src.tar.bz2) = a13ac573252abd3e252086f7ed4be5f148a393a452378f6157438bbe606ec211
-SIZE (calculix/ccx_1.6.src.tar.bz2) = 411519
+SIZE (calculix/ccx_1.7.src.tar.bz2) = 543798
-MD5 (calculix/cgx_1.6.all.tar.bz2) = 76f20136373357b1f57095ec3390fb09
+MD5 (calculix/cgx_1.7.all.tar.bz2) = 2eb6bd8561568ca3709905baa56f53ff
-SHA256 (calculix/cgx_1.6.all.tar.bz2) = 96e4e43e8050db15499de70d8c0c2e5c1ab36ecc1c956f98953fe865e018dfdf
+SHA256 (calculix/cgx_1.7.all.tar.bz2) = 1419dd1af7c471d6b46e86709c344133f56152841dcf6be17754895aba951748
-SIZE (calculix/cgx_1.6.all.tar.bz2) = 1101496
+SIZE (calculix/cgx_1.7.all.tar.bz2) = 1148005
-MD5 (calculix/ccx_1.6.htm.tar.bz2) = 9f46103b29cb508023417f46e8e82477
+MD5 (calculix/ccx_1.7.htm.tar.bz2) = da2442aaa5edff56381a13a1d046808b
-SHA256 (calculix/ccx_1.6.htm.tar.bz2) = e05a05b7b5e16faa1cf6dd574a7fd8dd9dc3f8af892e89c893ddb74999259235
+SHA256 (calculix/ccx_1.7.htm.tar.bz2) = bdc934f2be2e11675c94e7197028ffa2a6ec8877af99649155d33070098ef6ed
-SIZE (calculix/ccx_1.6.htm.tar.bz2) = 1035475
+SIZE (calculix/ccx_1.7.htm.tar.bz2) = 1193865
-MD5 (calculix/cgx_1.6.htm.tar.bz2) = 0267351a959ad95a98e87f45dca0526c
+MD5 (calculix/cgx_1.7.htm.tar.bz2) = b3c0064ab8bd2417eb49e4fabc4008da
-SHA256 (calculix/cgx_1.6.htm.tar.bz2) = e990af39b13dca67a45362a7acf8aa0dac9167079c0a7acb1ce78443fa594d11
+SHA256 (calculix/cgx_1.7.htm.tar.bz2) = 5153386074f7f18110f604b08b9996c7f2507cbb7484f1cf529f3a83ea9afa7e
-SIZE (calculix/cgx_1.6.htm.tar.bz2) = 221298
+SIZE (calculix/cgx_1.7.htm.tar.bz2) = 222652
-MD5 (calculix/ccx_1.6.ps.tar.bz2) = 56a8975536a598c0e941941fb6745b53
+MD5 (calculix/ccx_1.7.ps.tar.bz2) = 4847a998261f2351dce70f79b8d703b6
-SHA256 (calculix/ccx_1.6.ps.tar.bz2) = cab89ee7e87ef5007244c9261ad72b9edc7972f5d6a6159ccf8a21da20eef94e
+SHA256 (calculix/ccx_1.7.ps.tar.bz2) = f948231446ea2c49d51a136c5db36bc8aa374be917332b4a133283aeb9bee4f2
-SIZE (calculix/ccx_1.6.ps.tar.bz2) = 1447952
+SIZE (calculix/ccx_1.7.ps.tar.bz2) = 1491970
-MD5 (calculix/cgx_1.6.ps.bz2) = 38161760a8a1c37c70a652740dd44531
+MD5 (calculix/cgx_1.7.ps.bz2) = daab735645eb61006bc13b00b26cd546
-SHA256 (calculix/cgx_1.6.ps.bz2) = 37e8623ceb8310c9fa12652b0f871c6e0132e416aa966157bd032d1b0f31fa45
+SHA256 (calculix/cgx_1.7.ps.bz2) = 31f1e07a925c0e569b02099efbb950784633b6995a03cdf166fd1217bc84be9e
-SIZE (calculix/cgx_1.6.ps.bz2) = 285622
+SIZE (calculix/cgx_1.7.ps.bz2) = 286585
-MD5 (calculix/ccx_1.6.test.tar.bz2) = a0649bf58fc84c478b1da92b8a8868f1
-SHA256 (calculix/ccx_1.6.test.tar.bz2) = e40a336b7aa47cfbf61d59c03200e6c562e0d5be3512f03bd7c9e76f329a7b9b
-SIZE (calculix/ccx_1.6.test.tar.bz2) = 1155400
-MD5 (calculix/cgx_1.6.exa.tar.bz2) = 2167e6c260ec74264f6f8cd3649ca155
-SHA256 (calculix/cgx_1.6.exa.tar.bz2) = d98269295fdba59360d5452dc3da9b937a20d0da2e2fe9a92b0092b69e4f09fe
-SIZE (calculix/cgx_1.6.exa.tar.bz2) = 239874

cad/calculix/files/patch-ccx_VER+src+CalculiX.h

@@ -1,5 +1,5 @@
---- ccx_1.6/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
+--- ccx_1.7/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
-+++ ccx_1.6/src/CalculiX.h	Sun Feb 19 22:27:54 2006
++++ ccx_1.7/src/CalculiX.h	Sun Feb 19 22:27:54 2006
 @@ -26,6 +26,8 @@
  #define FORTRAN(A,B) A##_##B
  #elif ARCH == HP

cad/calculix/files/patch-ccx_VER+src+Makefile

@@ -1,5 +1,5 @@
---- ccx_1.6/src/Makefile.orig	Sun Mar  4 02:34:11 2007
+--- ccx_1.7/src/Makefile.orig	Sun Mar  4 02:34:11 2007
-+++ ccx_1.6/src/Makefile	Sun Mar 25 14:25:45 2007
++++ ccx_1.7/src/Makefile	Sun Mar 25 14:25:45 2007
 @@ -1,8 +1,8 @@
 -CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
 -FFLAGS = -Wall -O 
@@ -27,9 +27,9 @@
 +  
 +LIBS = -lspooles -larpack -ltaucs -lmetis %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
  
- ccx_1.6: $(OCCXMAIN) ccx_1.6.a  $(LIBS)
+ ccx_1.7: $(OCCXMAIN) ccx_1.7.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_1.6.c; g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.6.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.6.c; ${FC} ${FFLAGS} -o $@ $(OCCXMAIN) ccx_1.6.a  %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
++	./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.6.a: $(OCCXF) $(OCCXC)
+ ccx_1.7.a: $(OCCXF) $(OCCXC)
  	ar vr $@ $?

cad/calculix/files/patch-cgx_VER+src+Makefile

@@ -1,5 +1,5 @@
---- cgx_1.6/src/Makefile.orig	Sun Feb 19 22:13:12 2006
+--- cgx_1.7/src/Makefile.orig	2007-08-25 07:37:49.000000000 +0900
-+++ cgx_1.6/src/Makefile	Sun Feb 19 22:20:42 2006
++++ cgx_1.7/src/Makefile	2007-09-22 07:28:34.000000000 +0900
 @@ -1,13 +1,13 @@
 -CFLAGS = -O2 -Wall \
 +CFLAGS += -O2 -Wall \
@@ -20,10 +20,10 @@
    -lm 
  
  # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-@@ -115,42 +115,6 @@
+@@ -122,42 +122,6 @@
-  write2nas.c \
-  write2tochnog.c \
   writefbd.c \
+  contact.c \
+  makeTriFromElems.c \
 - ../../glut-3.5/src/layerutil.c \
 - ../../glut-3.5/src/glut_dials.c \
 - ../../glut-3.5/src/glut_ext.c \
@@ -63,7 +63,7 @@
   uselibSNL.cpp \
   ../../libSNL/src/*.cpp
  
-@@ -158,7 +122,7 @@
+@@ -165,7 +129,7 @@
  OLIB = $(SLIB:.c=.o)
  
  cgx: $(OLIB)

cad/calculix/files/patch-cgx_VER+src+cgx.h

@@ -1,11 +1,11 @@
---- cgx_1.6/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
+--- cgx_1.7/src/cgx.h.orig	Sun Feb 19 22:07:26 2006
-+++ cgx_1.6/src/cgx.h	Sun Feb 19 22:09:50 2006
++++ cgx_1.7/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.6/doc/cgx/cgx.html",\
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_1.7/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_1.6/doc/ccx/ccx.html"}
+-    "/usr/local/CalculiX/ccx_1.7/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
 +    "%%DOCSDIR%%/ccx/ccx.html"}
  #endif

cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp

@@ -1,5 +1,5 @@
---- cgx_1.6/src/uselibSNL.cpp.orig	Mon Feb 26 17:01:57 2007
+--- cgx_1.7/src/uselibSNL.cpp.orig	Mon Feb 26 17:01:57 2007
-+++ cgx_1.6/src/uselibSNL.cpp	Sun Mar 25 14:27:21 2007
++++ cgx_1.7/src/uselibSNL.cpp	Sun Mar 25 14:27:21 2007
 @@ -27,7 +27,7 @@
  #include <extUtil.h>
  #include "uselibSNL.h"

cad/calculix/pkg-plist

@@ -1,6 +1,6 @@
 bin/ccx
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.6.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.7.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -1154,6 +1154,82 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img824.png	
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img825.png	
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img826.png	
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img827.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img828.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img829.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img830.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img831.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img832.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img833.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img834.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img835.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img836.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img837.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img838.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img839.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img840.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img841.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img842.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img843.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img844.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img845.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img846.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img847.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img848.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img849.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img850.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img851.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img852.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img853.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img854.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img855.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img856.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img857.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img858.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img859.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img860.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img861.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img862.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img863.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img864.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img865.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img866.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img867.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img868.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img869.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img870.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img871.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img872.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img873.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img874.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img875.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img876.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img877.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img878.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img879.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img880.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img881.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img882.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img883.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img884.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img885.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img886.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img887.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img888.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img889.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img890.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img891.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img892.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img893.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img894.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img895.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img896.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img897.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img898.png
+
+
+
+
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node326.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node327.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node328.html
@@ -1206,8 +1282,56 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node375.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node376.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node377.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node378.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node379.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node380.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node381.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node382.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node383.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node384.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node410.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node385.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node386.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node387.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node388.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node389.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node390.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node391.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node392.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node393.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node394.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node395.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node396.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node397.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node398.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node399.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node400.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node401.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node402.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node403.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node404.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node405.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node406.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node407.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node408.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node409.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node411.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node412.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node413.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node414.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node415.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node416.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node417.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node418.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node419.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node420.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node421.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node422.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node423.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node424.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node425.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx_1.6.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.7.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -1408,12 +1532,16 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img25.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img26.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img27.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img28.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%%%%DOCSDIR%%/cgx/node171.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node172.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node173.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd