Update to 1.3

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

7 files changed, 38 insertions, 67 deletions

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 = \