Index: cad/calculix/Makefile =================================================================== --- cad/calculix/Makefile (revision 451718) +++ cad/calculix/Makefile (working copy) @@ -1,12 +1,10 @@ # Created by: Pedro Giffuni # $FreeBSD$ -PORTNAME= CalculiX -PORTVERSION= 2.12 -PORTREVISION= 2 +PORTNAME= calculix +PORTVERSION= 2.13 CATEGORIES= cad MASTER_SITES= http://www.dhondt.de/ -PKGNAMEPREFIX= CalculiX- DISTFILES= ${DIST_SOURCES} DIST_SUBDIR= calculix EXTRACT_ONLY= ${DIST_SOURCES} @@ -26,7 +24,7 @@ WRKSRC= ${WRKDIR}/CalculiX CGX_VER= cgx_${PORTVERSION} -USES= gmake tar:bzip2 +USES= gmake tar:bzip2 compiler:c++11-lib USE_XORG= ice sm x11 xext xi xmu xt USE_GL= gl glu # uses its own glut Index: cad/calculix/distinfo =================================================================== --- cad/calculix/distinfo (revision 451718) +++ cad/calculix/distinfo (working copy) @@ -1,9 +1,9 @@ -TIMESTAMP = 1498928723 -SHA256 (calculix/cgx_2.12.all.tar.bz2) = 504e5230902fb3c18001807c1394375b1cf81a10a0e99bd03f121c9b38717a83 -SIZE (calculix/cgx_2.12.all.tar.bz2) = 4625123 -SHA256 (calculix/cgx_2.12.exa.tar.bz2) = 610afec56cd964f7a12179d59c4402f4ded6cb6c27b9e0f296ca0e446af4ee20 -SIZE (calculix/cgx_2.12.exa.tar.bz2) = 3035788 -SHA256 (calculix/cgx_2.12.htm.tar.bz2) = c648c1e53d5622716f35b15b8a35b09de82f23c1507c101e24d75dbc2ff6daa4 -SIZE (calculix/cgx_2.12.htm.tar.bz2) = 328548 -SHA256 (calculix/cgx_2.12.pdf) = 7fda713652322d829178e7f2301a2a7c08125fffdf28c05b226ad0a45365793f -SIZE (calculix/cgx_2.12.pdf) = 1254014 +TIMESTAMP = 1507666721 +SHA256 (calculix/cgx_2.13.all.tar.bz2) = dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7 +SIZE (calculix/cgx_2.13.all.tar.bz2) = 4546379 +SHA256 (calculix/cgx_2.13.exa.tar.bz2) = f77fbbe41e5feecd9671c4d72b2a53d19f7641dce59a5e7dc219d32b46cf451a +SIZE (calculix/cgx_2.13.exa.tar.bz2) = 3051732 +SHA256 (calculix/cgx_2.13.htm.tar.bz2) = 39911f2b75730a844050faab48b729d8ebba5bbd6a467e561df76da091e31c69 +SIZE (calculix/cgx_2.13.htm.tar.bz2) = 334332 +SHA256 (calculix/cgx_2.13.pdf) = a94e787c191dfc956c6e7754b65eab86b9608b0f8567d342b51550551484d412 +SIZE (calculix/cgx_2.13.pdf) = 1277403 Index: cad/calculix/files/patch-cgx__VER_src_Makefile =================================================================== --- cad/calculix/files/patch-cgx__VER_src_Makefile (revision 451718) +++ cad/calculix/files/patch-cgx__VER_src_Makefile (working copy) @@ -1,5 +1,5 @@ ---- cgx_2.12/src/Makefile.orig 2017-03-11 16:25:39 UTC -+++ cgx_2.12/src/Makefile +--- cgx_2.13/src/Makefile.orig 2017-03-11 16:25:39 UTC ++++ cgx_2.13/src/Makefile @@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \ -I/usr/include/GL \ -I../../libSNL/src \ Index: cad/calculix/files/patch-cgx__VER_src_cgx.h =================================================================== --- cad/calculix/files/patch-cgx__VER_src_cgx.h (revision 451718) +++ cad/calculix/files/patch-cgx__VER_src_cgx.h (working copy) @@ -1,11 +1,11 @@ ---- cgx_2.12/src/cgx.h.orig 2017-04-28 10:12:50 UTC -+++ cgx_2.12/src/cgx.h +--- cgx_2.13/src/cgx.h.orig 2017-04-28 10:12:50 UTC ++++ cgx_2.13/src/cgx.h @@ -89,8 +89,8 @@ rendering is done in the index-mode. - "/usr/local/CalculiX/ccx_2.12/doc/ccx/ccx.html",\ - "/usr/local/CalculiX/cgx_2.12/doc/aflib/aflib.pdf"} + "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\ + "/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"} #else -- #define HELPFILE {"/usr/local/CalculiX/cgx_2.12/doc/cgx/cgx.html",\ -- "/usr/local/CalculiX/ccx_2.12/doc/ccx/ccx.html"} +- #define HELPFILE {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\ +- "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html"} + #define HELPFILE {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\ + "/usr/local/share/doc/CalculiX/ccx/ccx.html"} #endif Index: cad/calculix/files/patch-cgx__VER_src_extUtil.h =================================================================== --- cad/calculix/files/patch-cgx__VER_src_extUtil.h (revision 451718) +++ cad/calculix/files/patch-cgx__VER_src_extUtil.h (working copy) @@ -1,5 +1,5 @@ ---- cgx_2.12/src/extUtil.h.orig 2017-04-28 10:12:50 UTC -+++ cgx_2.12/src/extUtil.h +--- cgx_2.13/src/extUtil.h.orig 2017-04-28 10:12:50 UTC ++++ cgx_2.13/src/extUtil.h @@ -9,6 +9,7 @@ #else #define DEV_NULL " >/dev/null" Index: cad/calculix/files/patch-cgx__VER_src_userFunction.c =================================================================== --- cad/calculix/files/patch-cgx__VER_src_userFunction.c (revision 451718) +++ cad/calculix/files/patch-cgx__VER_src_userFunction.c (nonexistent) @@ -1,28 +0,0 @@ ---- cgx_2.12/src/userFunction.c.orig 2017-04-30 15:13:54 UTC -+++ cgx_2.12/src/userFunction.c -@@ -57,7 +57,12 @@ void sendFacesNodes( char *setname ); - /* */ - /* */ - /* -------------------------------------------------------------------- */ -- -+ -+ int assembleFEM(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } -+ int assembleFEMVane(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } -+ int createAF(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } -+ int createAF_nlb(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } -+ int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); } - void userFunction(char *string, Summen *sum, SumGeo *sumGeo ) - { - int i,j,k,l,n; -@@ -89,11 +94,6 @@ void userFunction(char *string, Summen - // aflib addons - char buf[12][MAX_LINE_LENGTH]; - -- int assembleFEM(char *parameters, Summen *sum, SumGeo *sumGeo ) { return(0); } -- int assembleFEMVane(char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } -- int createAF(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } -- int createAF_nlb(char *sections, char *parameters, Summen *sum, SumGeo *sumGeo ){ return(0); } -- int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); } - // end - - /* list the implemented user-functions if no parameter was provided for the "call" command */ Property changes on: cad/calculix/files/patch-cgx__VER_src_userFunction.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: cad/calculix/pkg-plist =================================================================== --- cad/calculix/pkg-plist (revision 451718) +++ cad/calculix/pkg-plist (working copy) @@ -205,7 +205,18 @@ %%PORTDOCS%%%%DOCSDIR%%/cgx/node238.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node239.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node24.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node240.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node241.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node242.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node243.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node244.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node245.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node246.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node247.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node248.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node249.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html +%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html @@ -287,9 +298,8 @@ %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html -%%PORTDOCS%%%%DOCSDIR%%/cgx_2.12.pdf +%%PORTDOCS%%%%DOCSDIR%%/cgx_2.13.pdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README~ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/p @@ -334,7 +344,6 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution~ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.dat %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl @@ -395,28 +404,11 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/BOUD.bou -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/BOUD.equ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC1.nam -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC2.nam -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC3.nam -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC4.nam -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/PRESD.bou -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/PRESD.equ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/SPCB2_10.1.bou -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/SPC_123.bou -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/WarnNodeMissCyclicSymmetry.nam -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/all.msh -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.cvg -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.dat %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.frd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.sta %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/send.fbl -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/spooles.out %%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README @@ -430,4 +422,5 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl