mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-18 08:02:48 +00:00
Code Issues Releases Activity

Update to 2.3

Browse Source 
Notified by:	Pedro F. Giffuni
This commit is contained in:
Maho Nakata 2011-05-11 05:02:58 +00:00
parent c7611e68f6
commit 84f33e93fa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=273932
7 changed files with 131 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cad/calculix/Makefile
View File

@ -6,12 +6,12 @@
#
PORTNAME= CalculiX
PORTVERSION= 2.2
PORTVERSION= 2.3
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
DISTFILES= ${DIST_SOURCES}
.if !defined(NOPORTDOCS)
DISTFILES+= ${DIST_HTM} ${DIST_PS}
DISTFILES+= ${DIST_HTM} ${DIST_PS} ${DIST_PDF}
.endif
.ifdef WITH_EXAMPLES
DISTFILES+= ${DIST_EXAMPLES}
@ -39,8 +39,8 @@ DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX} \
cgx_${PORTVERSION}.all${EXTRACT_SUFX}
DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX} \
cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX} \
cgx_${PORTVERSION}.ps.bz2
DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
DIST_PDF= cgx_${PORTVERSION}.pdf
DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX} \
cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
@ -126,9 +126,9 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/cgx_${PORTVERSION}/doc/cgx/* \
${DOCSDIR}/cgx
@${INSTALL_DATA} ${WRKSRC}/ccx_${PORTVERSION}/doc/*.ps ${DOCSDIR}
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.ps.bz2 \
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \
${DOCSDIR}
bunzip2 ${DOCSDIR}/cgx_${PORTVERSION}.ps.bz2
#bunzip2 ${DOCSDIR}/cgx_${PORTVERSION}.ps.bz2
@${GZIP_CMD} ${DOCSDIR}/*.ps
.endif
.ifdef WITH_EXAMPLES

24
cad/calculix/distinfo
View File

@ -1,12 +1,12 @@
SHA256 (calculix/ccx_2.2.src.tar.bz2) = 88672b95b8241041cc12e90f8d7e3ad9cb05b11dbb07ae4f0230355f31dece0e
SIZE (calculix/ccx_2.2.src.tar.bz2) = 719861
SHA256 (calculix/cgx_2.2.all.tar.bz2) = 216a1102ac3d7765d10f1f4c78db11e974e50615d6cf08b4019000b6119a019a
SIZE (calculix/cgx_2.2.all.tar.bz2) = 1357357
SHA256 (calculix/ccx_2.2.htm.tar.bz2) = 4d63b77c7a5e08b3f5f70ae4bf5c9c11bffa0b8b2d4bdea61bbecb4029e07fc8
SIZE (calculix/ccx_2.2.htm.tar.bz2) = 1407424
SHA256 (calculix/cgx_2.2.htm.tar.bz2) = 760e2eada3058727902437b65af302818ae5c3092c4f0b3691c19ca6a3f04b33
SIZE (calculix/cgx_2.2.htm.tar.bz2) = 235270
SHA256 (calculix/ccx_2.2.ps.tar.bz2) = 13b3341bf059732059396061ce006a28c1296f085adba6624972e4899eca25fa
SIZE (calculix/ccx_2.2.ps.tar.bz2) = 1828966
SHA256 (calculix/cgx_2.2.ps.bz2) = 29ca4ac8bf613782eacc268084a0b2db5c6b4fdf14e345280d55a20d8754213b
SIZE (calculix/cgx_2.2.ps.bz2) = 356718
SHA256 (calculix/ccx_2.3.src.tar.bz2) = 6e63249d324cf7b75e144cb4ce264b1ca54dbcf863b357c0a18ca8fb9184c55f
SIZE (calculix/ccx_2.3.src.tar.bz2) = 756130
SHA256 (calculix/cgx_2.3.all.tar.bz2) = e7db0b5ed21f8ee35d7b3ee04c2241d5b6abc19a0b030dd68cd4bc7c93d031ba
SIZE (calculix/cgx_2.3.all.tar.bz2) = 1098026
SHA256 (calculix/ccx_2.3.htm.tar.bz2) = 29b2c2ea4464872de94a613d8ee062202c2fa7157cc878745a3b7789e8ccb26c
SIZE (calculix/ccx_2.3.htm.tar.bz2) = 1465591
SHA256 (calculix/cgx_2.3.htm.tar.bz2) = c79ac3e83d13a8cbb066511adad2ba712ab68b27132fa9f2d546ecba0fe9af58
SIZE (calculix/cgx_2.3.htm.tar.bz2) = 243747
SHA256 (calculix/ccx_2.3.ps.tar.bz2) = ecf53c105573b3dd585b2928cd6013cdfcceac8d0f92500f6c4c80e4dba16dee
SIZE (calculix/ccx_2.3.ps.tar.bz2) = 1877663
SHA256 (calculix/cgx_2.3.pdf) = 31c1382d52b54d775549a221406848bebde4c08099581c69e490cdedd664b59d
SIZE (calculix/cgx_2.3.pdf) = 859465

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

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

16
cad/calculix/files/patch-ccx_VER+src+Makefile
View File

@ -1,10 +1,10 @@
--- ccx_2.2/src/Makefile.orig 2010-08-07 21:20:37.000000000 +0900
+++ ccx_2.2/src/Makefile 2010-08-13 16:03:21.000000000 +0900
--- ccx_2.3/src/Makefile.orig 2011-03-27 02:19:21.000000000 +0900
+++ ccx_2.3/src/Makefile 2011-05-11 11:54:16.000000000 +0900
@@ -1,9 +1,9 @@
-CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
-CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
+CFLAGS = -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
FFLAGS = -Wall -O3 -fopenmp
FFLAGS = -Wall -O -fopenmp
-CC=cc
-FC=gfortran
@ -25,9 +25,9 @@
- -lm -lc
+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
ccx_2.2: $(OCCXMAIN) ccx_2.2.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.2.a -lpthread $(LIBS)
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.2.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.2.a %%PTHREAD_LIBS%% $(LIBS)
ccx_2.3: $(OCCXMAIN) ccx_2.3.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.3.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.3.a -lpthread $(LIBS)
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.3.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.3.a %%PTHREAD_LIBS%% $(LIBS)
ccx_2.2.a: $(OCCXF) $(OCCXC)
ccx_2.3.a: $(OCCXF) $(OCCXC)
ar vr $@ $?

10
cad/calculix/files/patch-cgx_VER+src+Makefile
View File

@ -1,5 +1,5 @@
--- cgx_2.2/src/Makefile.orig 2010-02-27 06:46:21.000000000 +0900
+++ cgx_2.2/src/Makefile 2010-06-06 08:44:12.000000000 +0900
--- cgx_2.3/src/Makefile.orig 2011-03-23 06:14:10.000000000 +0900
+++ cgx_2.3/src/Makefile 2011-05-11 11:56:10.000000000 +0900
@@ -1,14 +1,14 @@
CFLAGS = -O3 -Wall \
-I./ \
@ -13,9 +13,9 @@
LFLAGS = \
- -L/usr/lib64 -lGL -lGLU \
- -L/usr/X11R6/lib64 -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
+ -L$(LOCALBASE)/lib -lGL -lGLU -lglut \
+ -L$(LOCALBASE)/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \
- -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
+ -L$(LOCALBASE)/lib -lGL -lGLU \
+ -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
-lm
# on 32bit systems change lib64 to lib

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

@ -1,11 +1,11 @@
--- cgx_2.2/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900
+++ cgx_2.2/src/cgx.h 2009-09-03 15:07:10.000000000 +0900
--- cgx_2.3/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900
+++ cgx_2.3/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.2/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.2/doc/ccx/ccx.html"}
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.3/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.3/doc/ccx/ccx.html"}
+ #define HELPFILE {"%%DOCSDIR%%/cgx/cgx.html",\
+ "%%DOCSDIR%%/ccx/ccx.html"}
#endif

100
cad/calculix/pkg-plist
View File

@ -163,10 +163,50 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1141.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1142.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1143.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1144.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1145.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1146.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1147.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1148.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1149.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img115.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1150.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1151.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1152.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1153.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1154.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1155.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1156.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1157.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1158.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1159.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img116.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1160.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1161.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1162.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1163.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1164.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1165.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1166.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1167.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1168.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1169.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img117.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1170.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1171.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1172.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1173.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1174.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1175.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1176.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1177.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1178.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1179.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img118.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1180.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1181.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1182.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1183.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img119.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img12.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img120.png
@ -1639,10 +1679,47 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node541.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node542.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node543.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node544.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node545.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node546.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node547.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node548.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node549.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node55.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node550.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node551.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node552.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node553.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node554.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node555.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node556.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node557.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node558.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node559.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node56.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node560.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node561.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node562.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node563.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node564.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node565.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node566.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node567.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node568.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node569.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node57.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node570.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node571.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node572.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node573.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node574.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node575.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node576.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node577.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node578.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node579.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node58.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node580.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node59.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node6.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node60.html
@ -1688,8 +1765,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
%%PORTDOCS%%%%DOCSDIR%%/ccx_2.2.ps.gz
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx_2.3.ps.gz
%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
@ -1833,7 +1909,18 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node186.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node187.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node188.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node189.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node19.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node190.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node191.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node192.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node193.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node194.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node195.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node196.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node197.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node198.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node199.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node2.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node20.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node21.html
@ -1922,9 +2009,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.2.ps.gz
%%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.3.pdf
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/README
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/isaac.fbl
@ -2203,7 +2288,9 @@ bin/cgx
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/thermomech.inp
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.dat.ref
%%WITH_EXAMPLES%%%%EXAMPLESDIR%%/test/wire.inp
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/ISAAC
%%PORTDOCS%%@dirrm %%DOCSDIR%%/cgx
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ccx
%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/test
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/nurbs
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/compressor/cgx
@ -2211,4 +2298,5 @@ bin/cgx
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/compressor/ccx
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/compressor
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/basic
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%/ISAAC
%%WITH_EXAMPLES%%@dirrm %%EXAMPLESDIR%%