aboutsummaryrefslogtreecommitdiff
path: root/cad/calculix
diff options
context:
space:
mode:
authorMaho Nakata <maho@FreeBSD.org>2005-11-19 23:36:03 +0000
committerMaho Nakata <maho@FreeBSD.org>2005-11-19 23:36:03 +0000
commit7c26a79b27a8dfb41d5116eb756109214a228231 (patch)
tree750acb4ae861a0404e04c84fee8386c2be9eb78e /cad/calculix
parenta01ed8fdc4ada86ce7725f95d9fae234eba25f0a (diff)
downloadports-7c26a79b27a8dfb41d5116eb756109214a228231.tar.gz
ports-7c26a79b27a8dfb41d5116eb756109214a228231.zip
Notes
Diffstat (limited to 'cad/calculix')
-rw-r--r--cad/calculix/Makefile24
-rw-r--r--cad/calculix/distinfo28
-rw-r--r--cad/calculix/files/patch-ccx_VER+src+CalculiX.h6
-rw-r--r--cad/calculix/files/patch-ccx_VER+src+Makefile21
-rw-r--r--cad/calculix/files/patch-cgx_1.4+src+readFoam.c16
-rw-r--r--cad/calculix/files/patch-cgx_1.4+src+sendSet.c11
-rw-r--r--cad/calculix/files/patch-cgx_VER+src+Makefile49
-rw-r--r--cad/calculix/files/patch-cgx_VER+src+cgx.h14
-rw-r--r--cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp7
-rw-r--r--cad/calculix/pkg-plist33
10 files changed, 161 insertions, 48 deletions
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index c25fefc09dea..4ffb804408f4 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= CalculiX
-PORTVERSION= 1.3
+PORTVERSION= 1.4
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
DISTFILES= ${DIST_SOURCES}
@@ -56,6 +56,12 @@ BLAS_LIBS= -lf77blas -latlas
BROWSER?= mozilla
PSVIEWER?= gv
+.include <bsd.port.pre.mk>
+
+.if ${OSREL} < 5.0
+USE_GCC= 3.4
+.endif
+
.if !defined(WITH_EXAMPLES)
PLIST_SUB= WITH_EXAMPLES="@comment "
.else
@@ -82,6 +88,20 @@ pre-build:
s+"mozilla"+"${BROWSER}"+ ; \
s+"ghostview"+"${PSVIEWER}"+ ;' \
${WRKSRC}/cgx_${PORTVERSION}/src/cgx.h
+# This fixes bugs in ccx 1.4
+ @${REINPLACE_CMD} -e 's+description[12]+description[13]+g;' \
+ ${WRKSRC}/ccx_1.4/src/arpackbu.c \
+ ${WRKSRC}/ccx_1.4/src/arpack.c \
+ ${WRKSRC}/ccx_1.4/src/arpackcs.c \
+ ${WRKSRC}/ccx_1.4/src/dyna.c \
+ ${WRKSRC}/ccx_1.4/src/frdcyc.c \
+ ${WRKSRC}/ccx_1.4/src/nonlingeo.c \
+ ${WRKSRC}/ccx_1.4/src/prespooles.c \
+ ${WRKSRC}/ccx_1.4/src/profile.c \
+ ${WRKSRC}/ccx_1.4/src/sensitivity.c \
+ ${WRKSRC}/ccx_1.4/src/steadystate.c
+ @${REINPLACE_CMD} -e 's+output[3]+output[4]+g;' \
+ ${WRKSRC}/ccx_1.4/src/ccx_1.4.c
do-build:
@(cd ${WRKSRC}/ccx_${PORTVERSION}/src; ${SETENV} ${MAKE_ENV} $(MAKE) )
@@ -116,4 +136,4 @@ do-install:
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 23ce258922da..fc12379196dc 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,16 +1,12 @@
-MD5 (calculix/ccx_1.3.src.tar.bz2) = 2d88eeba9ea5ba8052c0ec0c2871bfa0
-SIZE (calculix/ccx_1.3.src.tar.bz2) = 279067
-MD5 (calculix/cgx_1.3.all.tar.bz2) = e2d0cef943c78d535e657eab82c0cf9b
-SIZE (calculix/cgx_1.3.all.tar.bz2) = 806417
-MD5 (calculix/ccx_1.3.htm.tar.bz2) = 2c592cb5702b7480c4e30052cfd69fc0
-SIZE (calculix/ccx_1.3.htm.tar.bz2) = 745766
-MD5 (calculix/cgx_1.3.htm.tar.bz2) = 238804dc0ed34a94b2a595666500b61a
-SIZE (calculix/cgx_1.3.htm.tar.bz2) = 217894
-MD5 (calculix/ccx_1.3.ps.tar.bz2) = 1529fbacd548b2087b3eee03f70a6486
-SIZE (calculix/ccx_1.3.ps.tar.bz2) = 698255
-MD5 (calculix/cgx_1.3.ps.bz2) = 4501c42614c14e6417b4f46a9a66382b
-SIZE (calculix/cgx_1.3.ps.bz2) = 283724
-MD5 (calculix/ccx_1.3.test.tar.bz2) = 3da5d5781540dc0181ce956cc2063157
-SIZE (calculix/ccx_1.3.test.tar.bz2) = 855765
-MD5 (calculix/cgx_1.3.exa.tar.bz2) = 283ac6ad580db74fc186dac93d2229b4
-SIZE (calculix/cgx_1.3.exa.tar.bz2) = 232645
+MD5 (calculix/ccx_1.4.src.tar.bz2) = 2ce03b71a2b20ec8cb9d9ba8089c5712
+SIZE (calculix/ccx_1.4.src.tar.bz2) = 323632
+MD5 (calculix/cgx_1.4.all.tar.bz2) = 295f49929017e55615928e533afba7ed
+SIZE (calculix/cgx_1.4.all.tar.bz2) = 1022316
+MD5 (calculix/ccx_1.4.htm.tar.bz2) = 42d42e633c935d3219fb163aa6a59042
+SIZE (calculix/ccx_1.4.htm.tar.bz2) = 757108
+MD5 (calculix/cgx_1.4.htm.tar.bz2) = 3141024f344e13e58a31ab17949e6110
+SIZE (calculix/cgx_1.4.htm.tar.bz2) = 215788
+MD5 (calculix/ccx_1.4.ps.tar.bz2) = 8e1adaa2ed241e6bab923f268f48a770
+SIZE (calculix/ccx_1.4.ps.tar.bz2) = 714211
+MD5 (calculix/cgx_1.4.ps.bz2) = d648522ef7db12127138e6d1e4fe3d24
+SIZE (calculix/cgx_1.4.ps.bz2) = 277905
diff --git a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
index 85838c696a61..08678fb3e544 100644
--- a/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
+++ b/cad/calculix/files/patch-ccx_VER+src+CalculiX.h
@@ -1,6 +1,6 @@
---- 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 @@
+--- ccx_1.4/src/CalculiX.h.orig Sat Aug 13 05:39:08 2005
++++ ccx_1.4/src/CalculiX.h Mon Oct 10 16:07:52 2005
+@@ -26,6 +26,8 @@
#define FORTRAN(A,B) A##_##B
#elif ARCH == HP
#define FORTRAN(A,B) A##B
diff --git a/cad/calculix/files/patch-ccx_VER+src+Makefile b/cad/calculix/files/patch-ccx_VER+src+Makefile
index a1e4f05d3f5f..ac4deea2a91c 100644
--- a/cad/calculix/files/patch-ccx_VER+src+Makefile
+++ b/cad/calculix/files/patch-ccx_VER+src+Makefile
@@ -1,5 +1,5 @@
---- 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
+--- ccx_1.4/src/Makefile.orig Mon Oct 10 16:08:51 2005
++++ ccx_1.4/src/Makefile Mon Oct 10 16:12:15 2005
@@ -1,8 +1,10 @@
-CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-FFLAGS = -Wall -O
@@ -15,22 +15,23 @@
.c.o :
$(CC) $(CFLAGS) -c $<
-@@ -272,15 +274,12 @@
+@@ -289,15 +291,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 -llapack -lmetis %%BLAS_LIBS%% -lm
- 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.3.a: $(OCCXF) $(OCCXC)
+ ccx_1.4: $(OCCXMAIN) ccx_1.4.a $(LIBS)
+- g77 -Wall -O -o $@ $(OCCXMAIN) ccx_1.4.a $(LIBS)
++ ${FC} $(FFLAGS) -o $@ $(OCCXMAIN) ccx_1.4.a %%PTHREAD_LIBS%% $(LIBS) -L$(DIR) -lcompat
+
+ ccx_1.4.a: $(OCCXF) $(OCCXC)
ar vr $@ $?
diff --git a/cad/calculix/files/patch-cgx_1.4+src+readFoam.c b/cad/calculix/files/patch-cgx_1.4+src+readFoam.c
new file mode 100644
index 000000000000..d8f0efafc1f4
--- /dev/null
+++ b/cad/calculix/files/patch-cgx_1.4+src+readFoam.c
@@ -0,0 +1,16 @@
+--- cgx_1.4/src/readFoam.c Tue Sep 13 06:34:28 2005
++++ cgx_1.4/src/readFoam.c Sun Nov 20 08:27:42 2005
+@@ -4,7 +4,13 @@
+
+
+ #include <cgx.h>
++//dirent.h should oveeride sys/dir.h...
++#include <osreldate.h>
++#if __FreeBSD_version > 500000
+ #include <sys/dir.h>
++#else
++#include <dirent.h>
++#endif
+
+ #define R_GAS 287.1
+ #define kappa 1.4
diff --git a/cad/calculix/files/patch-cgx_1.4+src+sendSet.c b/cad/calculix/files/patch-cgx_1.4+src+sendSet.c
new file mode 100644
index 000000000000..b28202aa0725
--- /dev/null
+++ b/cad/calculix/files/patch-cgx_1.4+src+sendSet.c
@@ -0,0 +1,11 @@
+--- cgx_1.4/src/sendSet.c.orig Sun Oct 30 16:53:40 2005
++++ cgx_1.4/src/sendSet.c Sun Oct 30 16:54:24 2005
+@@ -965,7 +965,7 @@
+ int setNr;
+ int length, i,j;
+ unsigned char prognam[MAX_LINE_LENGTH];
+- float *temp, *alpha;
++ static float *temp, *alpha;
+ FILE *handle;
+ int n, lc, entity;
+
diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile
index 461983d62f81..3f4bfbd51f3b 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.3/src/Makefile.orig Fri Feb 25 22:06:01 2005
-+++ cgx_1.3/src/Makefile Sat Feb 26 20:40:28 2005
+--- cgx_1.4/src/Makefile.orig Tue Sep 13 02:24:07 2005
++++ cgx_1.4/src/Makefile Sun Nov 6 22:42:56 2005
@@ -1,13 +1,13 @@
CFLAGS = -O2 -Wall \
-I./ \
@@ -18,7 +18,50 @@
-lm
# -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
-@@ -121,7 +121,7 @@
+@@ -118,42 +118,6 @@
+ write2nas.c \
+ write2tochnog.c \
+ writefbd.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
+
+@@ -161,7 +125,7 @@
OLIB = $(SLIB:.c=.o)
cgx: $(OLIB)
diff --git a/cad/calculix/files/patch-cgx_VER+src+cgx.h b/cad/calculix/files/patch-cgx_VER+src+cgx.h
index b40f68cee11d..2c9a19f5f098 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.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 @@
+--- cgx_1.4/src/cgx.h.orig Mon Oct 10 15:46:23 2005
++++ cgx_1.4/src/cgx.h Mon Oct 10 16:06:53 2005
+@@ -77,8 +77,8 @@
#define MILLISECONDS_PER_PERIOD 1200
/* default location of the help files, please insert the actual one */
--#define HELPFILE {"/usr/local/CalculiX/cgx_1.3/doc/cgx/cgx.html",\
-- "/usr/local/CalculiX/ccx_1.3/doc/ccx/ccx.html"}
+-#define HELPFILE {"/usr/local/CalculiX/cgx_1.4/doc/cgx/cgx.html",\
+- "/usr/local/CalculiX/ccx_1.4/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 cc1498fe9c94..fbdb04c42a1d 100644
--- a/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
+++ b/cad/calculix/files/patch-cgx_VER+src+uselibSNL.cpp
@@ -1,6 +1,7 @@
---- 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 @@
+--- cgx_1.4/src/uselibSNL.cpp.orig Tue Sep 13 06:34:28 2005
++++ cgx_1.4/src/uselibSNL.cpp Mon Oct 10 16:05:10 2005
+@@ -26,7 +26,7 @@
+
#include <extUtil.h>
#include <snlCtrlPoint.h>
-#include <iostream.h>
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 8fed710f8300..1077d68589e0 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,6 +1,6 @@
bin/ccx
bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/ccx_1.3.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ccx_1.4.ps.gz
%%PORTDOCS%%%%DOCSDIR%%/ccx/ccx.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/index.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node1.html
@@ -295,6 +295,24 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node290.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node291.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node292.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node293.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node294.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node295.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node296.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node297.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node298.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node299.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node300.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node301.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node302.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node303.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node304.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node305.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node306.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node307.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node308.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node309.html
+%%PORTDOCS%%%%DOCSDIR%%/ccx/node310.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img10.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img100.png
@@ -860,8 +878,17 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/ccx/img563.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img564.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img565.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img566.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img567.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img568.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img569.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img570.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img571.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img572.png
+%%PORTDOCS%%%%DOCSDIR%%/ccx/img573.png
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
-%%PORTDOCS%%%%DOCSDIR%%/cgx_1.3.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx_1.4.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node1.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
@@ -1023,8 +1050,6 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node158.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node159.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node160.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx/node161.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx/node162.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 20:29:00 +0000