Attachment 200245 Details for Bug 234131 – Update Calculix to 2.5

[patch] Update Calculix to 2.5

cad-calculix.diff (text/plain), 9.86 KB, created by Pedro F. Giffuni on 2018-12-19 00:06:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2018-12-19 00:06:14 UTC

Size: 9.86 KB

patch

obsolete

>Index: cad/calculix/Makefile
>===================================================================
>--- cad/calculix/Makefile	(revision 470705)
>+++ cad/calculix/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	calculix
>-PORTVERSION=	2.13
>-PORTREVISION=	2
>+PORTVERSION=	2.14
> CATEGORIES=	cad
> MASTER_SITES=	http://www.dhondt.de/
> DISTFILES=	${DIST_SOURCES}
>@@ -82,6 +81,11 @@
> 	  ${STAGEDIR}${DOCSDIR}
> .endif
> .if ${PORT_OPTIONS:MEXAMPLES}
>+	# Some garbage crept in
>+	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/polyMesh/*~
>+	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/*~
>+	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/system/*~
>+	@${RM} ${WRKSRC}/${CGX_VER}/examples/ifwhiledemo/*.*~
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \
> 	  ${STAGEDIR}${EXAMPLESDIR})
>Index: cad/calculix/distinfo
>===================================================================
>--- cad/calculix/distinfo	(revision 470705)
>+++ cad/calculix/distinfo	(working copy)
>@@ -1,9 +1,9 @@
>-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
>+TIMESTAMP = 1526334631
>+SHA256 (calculix/cgx_2.14.all.tar.bz2) = 7ed16261749a2a62c77ad0631e5a1f001566aad62cd3e71fcbe2c9ce507f3712
>+SIZE (calculix/cgx_2.14.all.tar.bz2) = 4546855
>+SHA256 (calculix/cgx_2.14.exa.tar.bz2) = b922ba2bbd5662d05e1e9d6da1189a80fc341dfb1c46bcc19d89de56e6e67fc3
>+SIZE (calculix/cgx_2.14.exa.tar.bz2) = 3030018
>+SHA256 (calculix/cgx_2.14.htm.tar.bz2) = 20952ebb3d733a135c089a42473e15c119bd14b04e4fe73d858505d453267c0b
>+SIZE (calculix/cgx_2.14.htm.tar.bz2) = 336313
>+SHA256 (calculix/cgx_2.14.pdf) = dc9c30470e678953d1c4efcdff10a55122bd29f88fe520a43c548f178d9082f1
>+SIZE (calculix/cgx_2.14.pdf) = 1304642
>Index: cad/calculix/files/patch-cgx__VER_src_Makefile
>===================================================================
>--- cad/calculix/files/patch-cgx__VER_src_Makefile	(revision 470705)
>+++ cad/calculix/files/patch-cgx__VER_src_Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- cgx_2.13/src/Makefile.orig	2017-03-11 16:25:39 UTC
>-+++ cgx_2.13/src/Makefile
>+--- cgx_2.14/src/Makefile.orig	2017-03-11 16:25:39 UTC
>++++ cgx_2.14/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 470705)
>+++ cad/calculix/files/patch-cgx__VER_src_cgx.h	(working copy)
>@@ -1,11 +1,11 @@
>---- cgx_2.13/src/cgx.h.orig	2017-04-28 10:12:50 UTC
>-+++ cgx_2.13/src/cgx.h
>+--- cgx_2.14/src/cgx.h.orig	2017-04-28 10:12:50 UTC
>++++ cgx_2.14/src/cgx.h
> @@ -89,8 +89,8 @@ rendering is done in the index-mode.
>-     "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\
>-     "/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"}
>+     "/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html",\
>+     "/usr/local/CalculiX/cgx_2.14/doc/aflib/aflib.pdf"}
>  #else
>--  #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/CalculiX/cgx_2.14/doc/cgx/cgx.html",\
>+-    "/usr/local/CalculiX/ccx_2.14/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 470705)
>+++ cad/calculix/files/patch-cgx__VER_src_extUtil.h	(working copy)
>@@ -1,5 +1,5 @@
>---- cgx_2.13/src/extUtil.h.orig	2017-04-28 10:12:50 UTC
>-+++ cgx_2.13/src/extUtil.h
>+--- cgx_2.14/src/extUtil.h.orig	2017-04-28 10:12:50 UTC
>++++ cgx_2.14/src/extUtil.h
> @@ -9,6 +9,7 @@
>  #else
>    #define DEV_NULL   " >/dev/null"
>Index: cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
>===================================================================
>--- cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp	(revision 470705)
>+++ cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp	(working copy)
>@@ -1,5 +1,5 @@
>---- cgx_2.13/src/uselibSNL.cpp.orig	2017-10-07 09:58:00 UTC
>-+++ cgx_2.13/src/uselibSNL.cpp
>+--- cgx_2.14/src/uselibSNL.cpp.orig	2017-10-07 09:58:00 UTC
>++++ cgx_2.14/src/uselibSNL.cpp
> @@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
>    // (5)   create the cgx nurbs
>    // printf(" create blended nurbs\n"); 
>
>Property changes on: cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
>___________________________________________________________________
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Index: cad/calculix/pkg-plist
>===================================================================
>--- cad/calculix/pkg-plist	(revision 470705)
>+++ cad/calculix/pkg-plist	(working copy)
>@@ -217,6 +217,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node249.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
>+%%PORTDOCS%%%%DOCSDIR%%/cgx/node251.html
>+%%PORTDOCS%%%%DOCSDIR%%/cgx/node252.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
>@@ -298,7 +300,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
>-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.13.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.14.pdf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
>@@ -325,7 +327,6 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0/p
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/boundary
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbb
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbd
>@@ -334,15 +335,11 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/owner
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/points
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/send.fbl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/send.fbl~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/thermophysicalProperties
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/thermophysicalProperties~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/turbulenceProperties
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/controlDict
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/controlDict~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSchemes
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README
>@@ -349,25 +346,11 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean~
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe.fbd
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe_rest.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_rest.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_rest_dflux.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_tetra.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_pehe.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tetra.fbl
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_penta.fbd
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetra.cvg
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetra.inp
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetraf.cvg
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/send_tetra.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
>@@ -399,6 +382,7 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo2.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
>@@ -424,3 +408,5 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/generate.fbl

Flags:

pfg: maintainer-approval+

Actions: View | Diff

Attachments on bug 234131: 200245 | 200246 | 203804