Update to 2.1.

7 files changed, 85 insertions, 91 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 94fa0eeca5b4..767052386551 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CalculiX
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -34,7 +33,6 @@ LIB_DEPENDS=	arpack.1:${PORTSDIR}/math/arpack	\
 		metis.1:${PORTSDIR}/math/metis	\
 		taucs.1:${PORTSDIR}/math/taucs
 
-
 USE_BZIP2=	yes
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}	\
@@ -70,7 +68,7 @@ LAPACK_LIBS=		-llapack
 .endif
 
 USE_FORTRAN=	yes
-USE_GCC=	4.4
+USE_GCC=	4.4+
 
 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 6394ec689fed..0284815c5c83 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,18 +1,18 @@
-MD5 (calculix/ccx_2.0.src.tar.bz2) = 8f4debec957aefc26aaeed42074da66e
-SHA256 (calculix/ccx_2.0.src.tar.bz2) = f44c9b319a8499b01eb091decc6d5b412622a5941958a50eb90d9ebb3dce7aac
-SIZE (calculix/ccx_2.0.src.tar.bz2) = 656890
-MD5 (calculix/cgx_2.0.all.tar.bz2) = 8c754fd5bdc05d2703c424fe07495f80
-SHA256 (calculix/cgx_2.0.all.tar.bz2) = 1120ccfad431f783c2c3acb1be7c90abbdfc4c344091d2858d856149f43fa73f
-SIZE (calculix/cgx_2.0.all.tar.bz2) = 1130447
-MD5 (calculix/ccx_2.0.htm.tar.bz2) = 6258acef18d284029c05cb15cc8f93e4
-SHA256 (calculix/ccx_2.0.htm.tar.bz2) = 40011eafb181fad9297f103a1bfab87f98a5df81f876c3e423cd44a3d7162c46
-SIZE (calculix/ccx_2.0.htm.tar.bz2) = 1351165
-MD5 (calculix/cgx_2.0.htm.tar.bz2) = 9cb5355dcb7d45c8a38b1770905fb00a
-SHA256 (calculix/cgx_2.0.htm.tar.bz2) = c78407c090e11a1f089b5433a56fd69fa374889183d1399980c49b68f22ffe9e
-SIZE (calculix/cgx_2.0.htm.tar.bz2) = 204237
-MD5 (calculix/ccx_2.0.ps.tar.bz2) = 82a4631f5b14700ef4e6ac620a156c3d
-SHA256 (calculix/ccx_2.0.ps.tar.bz2) = 8b2a3703fd3523ac4c26cddc3c683a83f15dfdc08f5265780dba519e04dc439e
-SIZE (calculix/ccx_2.0.ps.tar.bz2) = 1752660
-MD5 (calculix/cgx_2.0.ps.bz2) = 0f8428ab87446395088e025a0117988d
-SHA256 (calculix/cgx_2.0.ps.bz2) = dda54b0603ad2ef669e7408d7cba7f560eaca0fb11586c6826e2d23567397bb2
-SIZE (calculix/cgx_2.0.ps.bz2) = 308416
+MD5 (calculix/ccx_2.1.src.tar.bz2) = bc653470ea8e8dc25a612048d8bfca98
+SHA256 (calculix/ccx_2.1.src.tar.bz2) = 35214971c2e29f0963451aebe6151d605670fe7892ca624a343bbc3a4cf11ade
+SIZE (calculix/ccx_2.1.src.tar.bz2) = 681426
+MD5 (calculix/cgx_2.1.all.tar.bz2) = 1940738da19e53132329006f0be76c3c
+SHA256 (calculix/cgx_2.1.all.tar.bz2) = f602504c62676e419f69d631cbafa16191f5b4984f146c1c17e25f4c94481fca
+SIZE (calculix/cgx_2.1.all.tar.bz2) = 1034690
+MD5 (calculix/ccx_2.1.htm.tar.bz2) = f6ec4757159265506fd89decd6a40135
+SHA256 (calculix/ccx_2.1.htm.tar.bz2) = 61b68bd51ba94fc6602db9314334de14a35229ea058894da7e389751bbc36666
+SIZE (calculix/ccx_2.1.htm.tar.bz2) = 1359902
+MD5 (calculix/cgx_2.1.htm.tar.bz2) = d6c34d0bd57082f3c8978616bf18e35a
+SHA256 (calculix/cgx_2.1.htm.tar.bz2) = 1dc25d98c831d9bbaecdffcbbfd2ac78773ac66176618eaf5f0821a407805b02
+SIZE (calculix/cgx_2.1.htm.tar.bz2) = 229978
+MD5 (calculix/ccx_2.1.ps.tar.bz2) = 17c3d63c2d86126a79ab52d33811c830
+SHA256 (calculix/ccx_2.1.ps.tar.bz2) = ad92bc1ad52ea6b2b14f8b73a550e9b564abd38cb2333d0691cbfbc8f2370477
+SIZE (calculix/ccx_2.1.ps.tar.bz2) = 1762209
+MD5 (calculix/cgx_2.1.ps.bz2) = faae3b7dd8cbf300ab2836b75e976fcf
+SHA256 (calculix/cgx_2.1.ps.bz2) = 2471abba7b3dee0f66160219bb9bd34ad3fdf33abd417d53e2595190223517e8
+SIZE (calculix/cgx_2.1.ps.bz2) = 344994
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index b290363f23d9..986f3dd92340 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_2.0/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
-+++ ccx_2.0/src/CalculiX.h	Sun Feb 19 22:27:54 2006
+--- ccx_2.1/src/CalculiX.h.orig	Sun Feb 19 22:25:48 2006
++++ ccx_2.1/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 e23333a134d1..d4074258e64b 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,10 +1,10 @@
---- ccx_2.0/src/Makefile.orig	2009-08-13 04:54:17.000000000 +0900
-+++ ccx_2.0/src/Makefile	2009-09-03 15:03:05.000000000 +0900
+--- ccx_2.1/src/Makefile.orig	2010-02-21 23:46:55.000000000 +0900
++++ ccx_2.1/src/Makefile	2010-06-06 08:45:41.000000000 +0900
 @@ -1,9 +1,9 @@
  
--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-+CFLAGS = -Wall -O3  -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE %%PTHREAD_CFLAGS%%
- FFLAGS = -Wall -O3 -fopenmp
+-CFLAGS = -Wall -O  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
++CFLAGS = -Wall -O -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+ FFLAGS = -Wall -O -fopenmp
  
 -CC=cc
 -FC=gfortran
@@ -13,22 +13,21 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -18,15 +18,12 @@
+@@ -18,15 +18,10 @@
  OCCXC = $(SCCXC:.c=.o)
  OCCXMAIN = $(SCCXMAIN:.c=.o)
  
 -DIR=../../../SPOOLES.2.2
-+DIR=%%LOCALBASE%%/lib
- 
+-
 -LIBS = \
 -       $(DIR)/spooles.a \
 -	../../../ARPACK/libarpack_INTEL.a \
 -       -lm -lc
 +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
  
- ccx_2.0: $(OCCXMAIN) ccx_2.0.a  $(LIBS)
--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.0.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.0.a  -lpthread  $(LIBS)
-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.0.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.0.a -L$(DIR) %%PTHREAD_LIBS%% $(LIBS)
+ ccx_2.1: $(OCCXMAIN) ccx_2.1.a  $(LIBS)
+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.1.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.1.a  -lpthread  $(LIBS)
++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.1.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.1.a %%PTHREAD_LIBS%%  -L%%LOCALBASE%%/lib $(LIBS)
  
- ccx_2.0.a: $(OCCXF) $(OCCXC)
+ ccx_2.1.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 281079976fe6..d8128b89660e 100644
--- a/cad/calculix/files/patch-cgx_VER+src+Makefile
+++ b/cad/calculix/files/patch-cgx_VER+src+Makefile
@@ -1,5 +1,5 @@
---- cgx_2.0/src/Makefile.orig	2009-08-11 12:01:35.000000000 +0900
-+++ cgx_2.0/src/Makefile	2009-09-03 15:05:58.000000000 +0900
+--- cgx_2.1/src/Makefile.orig	2010-02-27 06:46:21.000000000 +0900
++++ cgx_2.1/src/Makefile	2010-06-06 08:44:12.000000000 +0900
 @@ -1,14 +1,14 @@
  CFLAGS = -O3 -Wall \
    -I./ \
@@ -19,54 +19,12 @@
    -lm 
  
  # on 32bit systems change lib64 to lib
-@@ -126,49 +126,13 @@
-  writebp.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 \
-- ../../glut-3.5/src/glut_mesa.c \
-- ../../glut-3.5/src/glut_menu.c \
-- ../../glut-3.5/src/glut_modifier.c \
-- ../../glut-3.5/src/glut_space.c \
-- ../../glut-3.5/src/glut_shapes.c \
-- ../../glut-3.5/src/glut_tablet.c \
-- ../../glut-3.5/src/glut_vidresize.c \
-- ../../glut-3.5/src/glut_warp.c \
-- ../../glut-3.5/src/glut_8x13.c \
-- ../../glut-3.5/src/glut_9x15.c \
-- ../../glut-3.5/src/glut_hel10.c \
-- ../../glut-3.5/src/glut_hel18.c \
-- ../../glut-3.5/src/glut_hel12.c \
-- ../../glut-3.5/src/glut_tr10.c \
-- ../../glut-3.5/src/glut_tr24.c \
-- ../../glut-3.5/src/glut_bitmap.c \
-- ../../glut-3.5/src/glut_cursor.c \
-- ../../glut-3.5/src/glut_event.c \
-- ../../glut-3.5/src/glut_get.c \
-- ../../glut-3.5/src/glut_overlay.c \
-- ../../glut-3.5/src/glut_input.c \
-- ../../glut-3.5/src/glut_stroke.c \
-- ../../glut-3.5/src/glut_teapot.c \
-- ../../glut-3.5/src/glut_winmisc.c \
-- ../../glut-3.5/src/glut_fullscrn.c \
-- ../../glut-3.5/src/glut_cindex.c \
-- ../../glut-3.5/src/glut_roman.c \
-- ../../glut-3.5/src/glut_mroman.c \
-- ../../glut-3.5/src/glut_swidth.c \
-- ../../glut-3.5/src/glut_bwidth.c \
-- ../../glut-3.5/src/glut_win.c \
-- ../../glut-3.5/src/glut_init.c \
-- ../../glut-3.5/src/glut_util.c \
-  uselibSNL.cpp \
-  ../../libSNL/src/*.cpp
+@@ -60,7 +60,7 @@
+ OUTIL = $(SUTIL:.c=.o)
  
- OLIB = $(SLIB:.c=.o)
- 
- cgx: $(OLIB)
--	g++   $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
-+	${CXX}  $(OLIB)  $(CFLAGS) $(LFLAGS) -o  $@
+ cgx: $(OLIB) $(OUTIL)
+-	g++   $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
++	${CXX} $(OLIB) $(OUTIL)  $(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 a1fc0a7fe80b..06485922803b 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_2.0/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
-+++ cgx_2.0/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
+--- cgx_2.1/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
++++ cgx_2.1/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
 @@ -86,8 +86,8 @@
                               "/yaprod/cae/application/CalculiX/doc/ccx_2.0/ccx.html"}
    #endif
  #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.0/doc/cgx/cgx.html",\
--    "/usr/local/CalculiX/ccx_2.0/doc/ccx/ccx.html"}
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.1/doc/cgx/cgx.html",\
+-    "/usr/local/CalculiX/ccx_2.1/doc/ccx/ccx.html"}
 +   #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
 +     "%%DOCSDIR%%/ccx/ccx.html"}
  #endif
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index be1a169d6182..87c7106d9581 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -88,7 +88,20 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1074.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1075.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img1076.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1077.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1078.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1079.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img108.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1080.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1081.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1082.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1083.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1084.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1085.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1086.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1087.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1088.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img1089.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img109.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img11.png
 %%PORTDOCS%%%%DOCSDIR%%/ccx/img110.png
@@ -1527,6 +1540,18 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node500.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node501.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node502.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node503.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node504.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node505.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node506.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node507.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node508.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node509.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node510.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node511.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node512.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node513.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node514.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node51.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node52.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node53.html
@@ -1580,7 +1605,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.0.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.1.ps.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
@@ -1611,7 +1636,11 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img26.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img27.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img28.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img29.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img3.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img30.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img31.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img32.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
 %%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
@@ -1706,7 +1735,17 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node173.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node174.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node175.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node176.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node177.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node178.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node179.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node18.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node180.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node181.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node182.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node183.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node184.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node185.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node19.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node20.html
@@ -1796,7 +1835,7 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.0.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.1.ps.gz
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat