Make fetchable

Two distfiles (ccx_1.6.src.tar.bz2 cgx_1.6.all.tar.bz2)
are rerolled without changing filename.

Changes in ccx_1.6.src.tar.bz2
According to ccx_1.6/src/LOG-BOOK:
> 22 Feb 2006     - corrected an error in mafillsm.f
> 25 Feb 2006     - made a change in map3dto1d2d.f, arpack.c and arpackcs.c
>                  (rotational speed needed for stiffness matrix in
>                   frequency calculations)

Changes in cgx_1.6.all.tar.bz2
All are just minor fixes.

Spotted by: kris

4 files changed, 25 insertions, 28 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 00d16340625..a3c1a0693a0 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -34,8 +34,6 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut \
 		metis.1:${PORTSDIR}/math/metis	\
 		taucs.1:${PORTSDIR}/math/taucs
 
-BROKEN=		Unfetchable
-
 USE_BZIP2=	yes
 
 DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}	\
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 95a3435b310..d18a2dfff7a 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-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.src.tar.bz2) = 470612eb89f71a38649c57e4aa2cd9e3
+SHA256 (calculix/ccx_1.6.src.tar.bz2) = e6e3fd6344429e17771982fbd72f0e178f700d9421be1e841bc659debb9d1732
+SIZE (calculix/ccx_1.6.src.tar.bz2) = 411519
+MD5 (calculix/cgx_1.6.all.tar.bz2) = 76f20136373357b1f57095ec3390fb09
+SHA256 (calculix/cgx_1.6.all.tar.bz2) = 96e4e43e8050db15499de70d8c0c2e5c1ab36ecc1c956f98953fe865e018dfdf
+SIZE (calculix/cgx_1.6.all.tar.bz2) = 1101496
 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
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile
index 7a5a09afd2f..b403ca7eeac 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,12 +1,10 @@
---- 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 -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%%
-+FFLAGS += -O 
+--- ccx_1.6/src/Makefile.orig	Sun Mar  4 02:34:11 2007
++++ ccx_1.6/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 
++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
@@ -15,21 +13,22 @@
  
  .c.o :
  	$(CC) $(CFLAGS) -c $<
-@@ -379,15 +381,12 @@
+@@ -379,15 +379,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
  
  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; g77 -Wall -O -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.6.a: $(OCCXF) $(OCCXC)
diff --git a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
index b6875561e0a..6be78e9f473 100644
--- a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
+++ b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
@@ -1,11 +1,11 @@
---- 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 @@
- 
+--- cgx_1.6/src/uselibSNL.cpp.orig	Mon Feb 26 17:01:57 2007
++++ cgx_1.6/src/uselibSNL.cpp	Sun Mar 25 14:27:21 2007
+@@ -27,7 +27,7 @@
  #include <extUtil.h>
- #include <snlCtrlPoint.h>
+ #include "uselibSNL.h"
+ 
 -#include <iostream.h>
 +#include <iostream>
  
- #include "uselibSNL.h"
- #include "snlKnotVector.h"
+ #include <snlSurface.h>
+ #include <snlUtil.h>