Date: Tue, 5 Mar 2013 02:20:25 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r313428 - in head/cad/calculix: . files Message-ID: <201303050220.r252KPXl087343@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Tue Mar 5 02:20:24 2013 New Revision: 313428 URL: http://svnweb.freebsd.org/changeset/ports/313428 Log: Update cad/calculix to version 2.5 PR: 176649 Submitted by: pfg@ Modified: head/cad/calculix/Makefile head/cad/calculix/distinfo head/cad/calculix/files/patch-ccx_VER+src+CalculiX.h head/cad/calculix/files/patch-ccx_VER+src+Makefile head/cad/calculix/files/patch-cgx_VER+src+Makefile head/cad/calculix/files/patch-cgx_VER+src+cgx.h head/cad/calculix/pkg-plist Modified: head/cad/calculix/Makefile ============================================================================== --- head/cad/calculix/Makefile Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/Makefile Tue Mar 5 02:20:24 2013 (r313428) @@ -6,8 +6,7 @@ # PORTNAME= CalculiX -PORTVERSION= 2.4 -PORTREVISION= 2 +PORTVERSION= 2.5 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ DISTFILES= ${DIST_SOURCES} @@ -29,6 +28,8 @@ EXTRACT_ONLY+= ${DIST_EXAMPLES} MAINTAINER= maho@FreeBSD.org COMMENT= A Three-Dimensional Structural Finite Element Program +LICENSE= GPLv2 + LIB_DEPENDS= arpack.1:${PORTSDIR}/math/arpack \ spooles.1:${PORTSDIR}/math/spooles \ metis.1:${PORTSDIR}/math/metis4 \ @@ -50,7 +51,7 @@ USE_GMAKE= yes USE_XORG= xmu USE_GL= glut -BROWSER?= mozilla +BROWSER?= firefox PSVIEWER?= gv .include <bsd.port.pre.mk> Modified: head/cad/calculix/distinfo ============================================================================== --- head/cad/calculix/distinfo Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/distinfo Tue Mar 5 02:20:24 2013 (r313428) @@ -1,12 +1,16 @@ -SHA256 (calculix/ccx_2.4.src.tar.bz2) = cadcd0d71bb54c6d61c83ce3aaa7a3fb8c8517d40db3909778797fd05e25e7a4 -SIZE (calculix/ccx_2.4.src.tar.bz2) = 830747 -SHA256 (calculix/cgx_2.4.all.tar.bz2) = c8f7008b9be75110f6c491d1fdf83cf9a4b2c0fbda37a3f2249ea9bdaf825be9 -SIZE (calculix/cgx_2.4.all.tar.bz2) = 1148846 -SHA256 (calculix/ccx_2.4.htm.tar.bz2) = 18c3b3ab7dcedf096c7d2f1320985588fc906fd40755c037b77381459579995e -SIZE (calculix/ccx_2.4.htm.tar.bz2) = 1499249 -SHA256 (calculix/cgx_2.4.htm.tar.bz2) = 07b0029edcbeea5cfd4755325894100f22e28941e752f44bf72cab91bc3e7044 -SIZE (calculix/cgx_2.4.htm.tar.bz2) = 246556 -SHA256 (calculix/ccx_2.4.ps.tar.bz2) = 522d727ddfd5991ab4de6fa788e554e981223b3a657c6ee18936811c5b2a6805 -SIZE (calculix/ccx_2.4.ps.tar.bz2) = 1908642 -SHA256 (calculix/cgx_2.4.pdf) = e50e23801501bb91d8c3465ffd167cd07e4dbddfda4b6b4b26a8a1ff11463e6a -SIZE (calculix/cgx_2.4.pdf) = 876897 +SHA256 (calculix/ccx_2.5.src.tar.bz2) = 7b695c8dbcf3b7680dad31d2f5403c3115bc48d526815182245ba4d7986b24a5 +SIZE (calculix/ccx_2.5.src.tar.bz2) = 923149 +SHA256 (calculix/cgx_2.5.all.tar.bz2) = e3654991d527a14917da30f2b7f85382dbce33b5e2db9a67c9a27fc85f6ed319 +SIZE (calculix/cgx_2.5.all.tar.bz2) = 1279480 +SHA256 (calculix/ccx_2.5.htm.tar.bz2) = c1007b4c675d304c451b46520efce9d48f45b722c527c6dfef7bb5140a2684b9 +SIZE (calculix/ccx_2.5.htm.tar.bz2) = 1594504 +SHA256 (calculix/cgx_2.5.htm.tar.bz2) = bfd507c25fdf24faf8c6dcc8c3301d1ce984ea00a93907cd432fe1644c52b445 +SIZE (calculix/cgx_2.5.htm.tar.bz2) = 339355 +SHA256 (calculix/ccx_2.5.ps.tar.bz2) = 15849be1a5e4488216879c3c95e58edf3ae171244888529fbc31e6afa53ced30 +SIZE (calculix/ccx_2.5.ps.tar.bz2) = 2114004 +SHA256 (calculix/cgx_2.5.pdf) = 8795cd1a934512dad22779d638d4bd1e3d8e5d977aa941a1c12c15e80f7694df +SIZE (calculix/cgx_2.5.pdf) = 1047195 +SHA256 (calculix/ccx_2.5.test.tar.bz2) = 48e428a483e7d099bd19b5ebb2416c29437bad6e5f12dff5eeb4e0fb791756e7 +SIZE (calculix/ccx_2.5.test.tar.bz2) = 7630079 +SHA256 (calculix/cgx_2.5.exa.tar.bz2) = 10e73a42a6730f3d22237175513337117f3ad29bfdb4f6ec0771dbcacac90ba9 +SIZE (calculix/cgx_2.5.exa.tar.bz2) = 185001 Modified: head/cad/calculix/files/patch-ccx_VER+src+CalculiX.h ============================================================================== --- head/cad/calculix/files/patch-ccx_VER+src+CalculiX.h Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/files/patch-ccx_VER+src+CalculiX.h Tue Mar 5 02:20:24 2013 (r313428) @@ -1,6 +1,15 @@ ---- ccx_2.4/src/CalculiX.h.orig Sun Feb 19 22:25:48 2006 -+++ ccx_2.4/src/CalculiX.h Sun Feb 19 22:27:54 2006 -@@ -26,6 +26,8 @@ +--- ccx_2.5/src/CalculiX.h.orig 2012-10-06 08:13:06.000000000 -0500 ++++ ccx_2.5/src/CalculiX.h 2013-03-04 15:33:04.000000000 -0500 +@@ -15,6 +15,8 @@ + /* along with this program; if not, write to the Free Software */ + /* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + ++#include <pthread.h> ++ + #define Linux 1 + #define IRIX 2 + #define IRIX64 3 +@@ -26,6 +28,8 @@ #define FORTRAN(A,B) A##_##B #elif ARCH == HP #define FORTRAN(A,B) A##B Modified: head/cad/calculix/files/patch-ccx_VER+src+Makefile ============================================================================== --- head/cad/calculix/files/patch-ccx_VER+src+Makefile Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/files/patch-ccx_VER+src+Makefile Tue Mar 5 02:20:24 2013 (r313428) @@ -1,10 +1,10 @@ ---- ccx_2.4/src/Makefile.orig 2011-03-27 02:19:21.000000000 +0900 -+++ ccx_2.4/src/Makefile 2011-05-11 11:54:16.000000000 +0900 +--- ccx_2.5/src/Makefile.orig 2012-10-06 08:13:07.000000000 -0500 ++++ ccx_2.5/src/Makefile 2013-03-02 22:17:29.000000000 -0500 @@ -1,9 +1,9 @@ --CFLAGS = -Wall -O -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE +-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 -DUSE_MT -DARPACK -DMATRIXSTORAGE - FFLAGS = -Wall -O -fopenmp + FFLAGS = -Wall -O3 -CC=cc -FC=gfortran @@ -22,12 +22,12 @@ -LIBS = \ - $(DIR)/spooles.a \ - ../../../ARPACK/libarpack_INTEL.a \ -- -lm -lc +- -lpthread -lm -lc +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm - ccx_2.4: $(OCCXMAIN) ccx_2.4.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O -o $@ $(OCCXMAIN) ccx_2.4.a -lpthread $(LIBS) -+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.4.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.4.a -lpthread $(LIBS) + ccx_2.5: $(OCCXMAIN) ccx_2.5.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.5.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.5.a $(LIBS) ++ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.5.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.5.a -lpthread $(LIBS) - ccx_2.4.a: $(OCCXF) $(OCCXC) + ccx_2.5.a: $(OCCXF) $(OCCXC) ar vr $@ $? Modified: head/cad/calculix/files/patch-cgx_VER+src+Makefile ============================================================================== --- head/cad/calculix/files/patch-cgx_VER+src+Makefile Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/files/patch-cgx_VER+src+Makefile Tue Mar 5 02:20:24 2013 (r313428) @@ -1,5 +1,5 @@ ---- cgx_2.4/src/Makefile.orig 2011-03-23 06:14:10.000000000 +0900 -+++ cgx_2.4/src/Makefile 2011-05-11 11:56:10.000000000 +0900 +--- cgx_2.5/src/Makefile.orig 2011-03-23 06:14:10.000000000 +0900 ++++ cgx_2.5/src/Makefile 2011-05-11 11:56:10.000000000 +0900 @@ -1,14 +1,14 @@ CFLAGS = -O3 -Wall \ -I./ \ Modified: head/cad/calculix/files/patch-cgx_VER+src+cgx.h ============================================================================== --- head/cad/calculix/files/patch-cgx_VER+src+cgx.h Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/files/patch-cgx_VER+src+cgx.h Tue Mar 5 02:20:24 2013 (r313428) @@ -1,11 +1,11 @@ ---- cgx_2.4/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900 -+++ cgx_2.4/src/cgx.h 2009-09-03 15:07:10.000000000 +0900 +--- cgx_2.5/src/cgx.h.orig 2009-08-13 15:58:59.000000000 +0900 ++++ cgx_2.5/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.4/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.4/doc/ccx/ccx.html"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.5/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.5/doc/ccx/ccx.html"} + #define HELPFILE {"%%DOCSDIR%%/cgx/cgx.html",\ + "%%DOCSDIR%%/ccx/ccx.html"} #endif Modified: head/cad/calculix/pkg-plist ============================================================================== --- head/cad/calculix/pkg-plist Mon Mar 4 23:48:44 2013 (r313427) +++ head/cad/calculix/pkg-plist Tue Mar 5 02:20:24 2013 (r313428) @@ -257,9 +257,35 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/ccx/img1226.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img1227.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img1228.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1229.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img123.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1230.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1231.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1232.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1233.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1234.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1235.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1236.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1237.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1238.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1239.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img124.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1240.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1241.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1242.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1243.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1244.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1245.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1246.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1247.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1248.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1249.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img125.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1250.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1251.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1252.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1253.png +%%PORTDOCS%%%%DOCSDIR%%/ccx/img1254.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img126.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img127.png %%PORTDOCS%%%%DOCSDIR%%/ccx/img128.png @@ -1777,10 +1803,46 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/ccx/node59.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node590.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node591.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node592.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node593.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node594.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node595.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node596.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node597.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node598.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node599.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node6.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node60.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node600.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node601.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node602.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node603.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node604.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node605.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node606.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node607.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node608.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node609.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node61.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node610.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node611.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node612.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node613.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node614.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node615.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node616.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node617.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node618.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node619.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node62.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node620.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node621.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node622.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node623.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node624.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node625.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node626.html +%%PORTDOCS%%%%DOCSDIR%%/ccx/node627.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node63.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node64.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node65.html @@ -1821,7 +1883,7 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html -%%PORTDOCS%%%%DOCSDIR%%/ccx_2.4.ps.gz +%%PORTDOCS%%%%DOCSDIR%%/ccx_2.5.ps.gz %%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html @@ -1856,6 +1918,9 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/cgx/img30.png %%PORTDOCS%%%%DOCSDIR%%/cgx/img31.png %%PORTDOCS%%%%DOCSDIR%%/cgx/img32.png +%%PORTDOCS%%%%DOCSDIR%%/cgx/img33.png +%%PORTDOCS%%%%DOCSDIR%%/cgx/img34.png +%%PORTDOCS%%%%DOCSDIR%%/cgx/img35.png %%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png %%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png %%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png @@ -1983,6 +2048,10 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/cgx/node202.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node203.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node204.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node205.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node206.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node207.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node208.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node21.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node22.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node23.html @@ -2069,7 +2138,7 @@ bin/cgx %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html -%%PORTDOCS%%%%DOCSDIR%%/cgx_2.4.pdf +%%PORTDOCS%%%%DOCSDIR%%/cgx_2.5.pdf %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/RAE2822.dat %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/README %%WITH_EXAMPLES%%%%EXAMPLESDIR%%/ISAAC/isaac.fbl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303050220.r252KPXl087343>