kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to upstream version 2.13

Browse source 
Detailed log:
- Introduction of new features, see
  http://www.dhondt.de/new_calc.htm
  https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222914

PR:		222914
Submitted by:	pfg (maintainer)
This commit is contained in:
Thomas Zander 2017-10-30 17:15:56 +00:00
parent 1a52dcf4c4
commit 995bec14f3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=453199
5 changed files with 83 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cad/calculix-ccx/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ccx
PORTVERSION= 2.12
PORTREVISION= 1
PORTVERSION= 2.13
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
PKGNAMEPREFIX= CalculiX-

18
cad/calculix-ccx/distinfo
View file

@ -1,9 +1,9 @@
TIMESTAMP = 1502672327
SHA256 (calculix/ccx_2.12.src.tar.bz2) = d75427dfb6db70fdfbb5939df22da8addf0ea4522cff32c9cdc4029e39b6b914
SIZE (calculix/ccx_2.12.src.tar.bz2) = 1061630
SHA256 (calculix/ccx_2.12.htm.tar.bz2) = 79f16a016d37ae8b1599946dbbeb56fc256ba848413fa8ccfbab5b565b41a9e9
SIZE (calculix/ccx_2.12.htm.tar.bz2) = 2130840
SHA256 (calculix/ccx_2.12.ps.tar.bz2) = c93b191cf0b89bbb8c24bcc0f8a6a5425a690f6b3a6d58e27274dbf668312df4
SIZE (calculix/ccx_2.12.ps.tar.bz2) = 2630996
SHA256 (calculix/ccx_2.12.test.tar.bz2) = 1a3758a09a444472bccf0998ae66d3f78671c9fd8a3c8a8fe59372e9b5787bd8
SIZE (calculix/ccx_2.12.test.tar.bz2) = 9380946
TIMESTAMP = 1509304679
SHA256 (calculix/ccx_2.13.src.tar.bz2) = 7685f4ddd0dc698fa1ad0f82594a6fe52ffa8f604c1e74befa048d3d46f49ce2
SIZE (calculix/ccx_2.13.src.tar.bz2) = 1166432
SHA256 (calculix/ccx_2.13.htm.tar.bz2) = 34061658590d9c584c52037cfe3cb6d4305287092cce693a3776423459851b8b
SIZE (calculix/ccx_2.13.htm.tar.bz2) = 2143576
SHA256 (calculix/ccx_2.13.ps.tar.bz2) = 9c7f2c4fb4f8669b6c9ecb13fc4f54f9d96d23739138cf807cc8b454f0e6ea3c
SIZE (calculix/ccx_2.13.ps.tar.bz2) = 2643528
SHA256 (calculix/ccx_2.13.test.tar.bz2) = b6eedf6797b5ac6550b21c48f9a13cbd6094eb335c72f587992a2f770af27ad0
SIZE (calculix/ccx_2.13.test.tar.bz2) = 9429551

2
cad/calculix-ccx/files/patch-CalculiX.h
View file

@ -1,4 +1,4 @@
--- CalculiX.h.orig 2017-04-02 12:59:25 UTC
--- CalculiX.h.orig 2017-10-08 20:06:28 UTC
+++ CalculiX.h
@@ -15,12 +15,14 @@
/* along with this program; if not, write to the Free Software */

22
cad/calculix-ccx/files/patch-Makefile
View file

@ -1,4 +1,4 @@
--- Makefile.orig 2017-04-02 12:59:26 UTC
--- Makefile.orig 2017-10-08 20:06:29 UTC
+++ Makefile
@@ -1,9 +1,9 @@
@ -14,21 +14,19 @@
.c.o :
$(CC) $(CFLAGS) -c $<
@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o)
@@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
DIR=../../../SPOOLES.2.2
-DIR=../../../SPOOLES.2.2
-
-LIBS = \
LIBS = \
- $(DIR)/spooles.a \
- ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc
+LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
+ -lm
ccx_2.12: $(OCCXMAIN) ccx_2.12.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.12.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.12.a $(LIBS)
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.12.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.12.a -lpthread $(LIBS)
ccx_2.13: $(OCCXMAIN) ccx_2.13.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.13.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.13.a $(LIBS)
+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.13.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.13.a $(LIBS) $(LDFLAGS)
ccx_2.12.a: $(OCCXF) $(OCCXC)
ccx_2.13.a: $(OCCXF) $(OCCXC)
ar vr $@ $?

67
cad/calculix-ccx/pkg-plist
View file

@ -1020,7 +1020,17 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1913.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1914.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1915.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1916.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1917.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1918.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1919.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img192.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1920.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1921.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1922.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1923.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1924.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img1925.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img193.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img194.png
%%PORTDOCS%%%%DOCSDIR%%/ccx/img195.png
@ -2245,8 +2255,19 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node392.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node393.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node394.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node395.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node396.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node397.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node398.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node399.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node4.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node40.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node400.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node401.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node402.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node403.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node404.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node405.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node41.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node42.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node43.html
@ -2311,7 +2332,7 @@ bin/ccx
%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
%%PORTDOCS%%%%DOCSDIR%%/ccx_2.12.ps.gz
%%PORTDOCS%%%%DOCSDIR%%/ccx_2.13.ps.gz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref
@ -2451,6 +2472,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy6.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy7.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy7.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy7bm.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy7bm.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy8.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy8.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamdy9.dat.ref
@ -2590,6 +2613,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beampt.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied1noadjust.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied1noadjust.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/beamptied3.dat.ref
@ -2741,8 +2766,6 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d_h.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cou2d_h.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couette1per.dat.ref
@ -2825,6 +2848,9 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/equrem4.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/frdcheck.pl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fricloop.frd.ref
@ -2833,6 +2859,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/friction1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/friction2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/friction2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/friction3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/friction3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fullseg.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fullseg.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/furnace.dat.ref
@ -2862,8 +2890,6 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe13.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe14.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe14.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe15.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe15.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe3.dat.ref
@ -2878,6 +2904,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe7.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-massflow.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-massflow.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-pressure-split.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-pressure-split.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-pressure.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-cfd-pressure.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gaspipe8-oil.dat.ref
@ -2894,6 +2922,14 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green2.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green3.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green4.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/green4.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinge.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hinge.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hueeber2.dat.ref
@ -2910,6 +2946,7 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/induction2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inistrain.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/input.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinth1fin.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinth1fin.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/labyrinthstepped.dat.ref
@ -2927,6 +2964,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mass3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/massflow_percent_ccx.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/metalforming.dat.ref
@ -2942,6 +2981,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mpcforce.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multistage.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multistage.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/networkmpc.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oneel.inp
@ -2999,6 +3040,9 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pret4.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/primaryair.inp
@ -3020,6 +3064,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring2.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring3.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ring3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ringfcontact2.dat.ref
@ -3136,6 +3182,8 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe3.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplebeampipe4.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/small_pressure_gradient.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solidshell1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solidshell1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solidshell2.dat.ref
@ -3178,13 +3226,22 @@ bin/ccx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermomech2.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thread.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thread.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transition.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transition.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transition.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/truss.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/twobeam.frd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unet1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unet1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unetp1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unetp1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uprofile.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uprofile.frd.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uprofile.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userbeam.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userbeam.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vortex1.dat.ref
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vortex1.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vortex2.dat.ref