Attachment #200245 for bug #234131




# $FreeBSD$

PORTNAME=	calculix
PORTVERSION=	2.14
PORTREVISION=	2
CATEGORIES=	cad
MASTER_SITES=	http://www.dhondt.de/
DISTFILES=	${DIST_SOURCES}

	  ${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})

Lines 1-9 Link Here

(-)cad/calculix/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1507666721	1	TIMESTAMP = 1526334631
2	SHA256 (calculix/cgx_2.13.all.tar.bz2) = dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7	2	SHA256 (calculix/cgx_2.14.all.tar.bz2) = 7ed16261749a2a62c77ad0631e5a1f001566aad62cd3e71fcbe2c9ce507f3712
3	SIZE (calculix/cgx_2.13.all.tar.bz2) = 4546379	3	SIZE (calculix/cgx_2.14.all.tar.bz2) = 4546855
4	SHA256 (calculix/cgx_2.13.exa.tar.bz2) = f77fbbe41e5feecd9671c4d72b2a53d19f7641dce59a5e7dc219d32b46cf451a	4	SHA256 (calculix/cgx_2.14.exa.tar.bz2) = b922ba2bbd5662d05e1e9d6da1189a80fc341dfb1c46bcc19d89de56e6e67fc3
5	SIZE (calculix/cgx_2.13.exa.tar.bz2) = 3051732	5	SIZE (calculix/cgx_2.14.exa.tar.bz2) = 3030018
6	SHA256 (calculix/cgx_2.13.htm.tar.bz2) = 39911f2b75730a844050faab48b729d8ebba5bbd6a467e561df76da091e31c69	6	SHA256 (calculix/cgx_2.14.htm.tar.bz2) = 20952ebb3d733a135c089a42473e15c119bd14b04e4fe73d858505d453267c0b
7	SIZE (calculix/cgx_2.13.htm.tar.bz2) = 334332	7	SIZE (calculix/cgx_2.14.htm.tar.bz2) = 336313
8	SHA256 (calculix/cgx_2.13.pdf) = a94e787c191dfc956c6e7754b65eab86b9608b0f8567d342b51550551484d412	8	SHA256 (calculix/cgx_2.14.pdf) = dc9c30470e678953d1c4efcdff10a55122bd29f88fe520a43c548f178d9082f1
9	SIZE (calculix/cgx_2.13.pdf) = 1277403	9	SIZE (calculix/cgx_2.14.pdf) = 1304642

Lines 1-5 Link Here

(-)cad/calculix/files/patch-cgx__VER_src_Makefile (-2 / +2 lines)
1	--- cgx_2.13/src/Makefile.orig 2017-03-11 16:25:39 UTC	1	--- cgx_2.14/src/Makefile.orig 2017-03-11 16:25:39 UTC
2	+++ cgx_2.13/src/Makefile	2	+++ cgx_2.14/src/Makefile
3	@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \	3	@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
4	-I/usr/include/GL \	4	-I/usr/include/GL \
5	-I../../libSNL/src \	5	-I../../libSNL/src \

Lines 1-11 Link Here

(-)cad/calculix/files/patch-cgx__VER_src_cgx.h (-6 / +6 lines)
1	--- cgx_2.13/src/cgx.h.orig 2017-04-28 10:12:50 UTC	1	--- cgx_2.14/src/cgx.h.orig 2017-04-28 10:12:50 UTC
2	+++ cgx_2.13/src/cgx.h	2	+++ cgx_2.14/src/cgx.h
3	@@ -89,8 +89,8 @@ rendering is done in the index-mode.	3	@@ -89,8 +89,8 @@ rendering is done in the index-mode.
4	"/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\	4	"/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html",\
5	"/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"}	5	"/usr/local/CalculiX/cgx_2.14/doc/aflib/aflib.pdf"}
6	#else	6	#else
7	- #define HELPFILE {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\	7	- #define HELPFILE {"/usr/local/CalculiX/cgx_2.14/doc/cgx/cgx.html",\
8	- "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html"}	8	- "/usr/local/CalculiX/ccx_2.14/doc/ccx/ccx.html"}
9	+ #define HELPFILE {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\	9	+ #define HELPFILE {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
10	+ "/usr/local/share/doc/CalculiX/ccx/ccx.html"}	10	+ "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
11	#endif	11	#endif

Lines 1-5 Link Here

(-)cad/calculix/files/patch-cgx__VER_src_extUtil.h (-2 / +2 lines)
1	--- cgx_2.13/src/extUtil.h.orig 2017-04-28 10:12:50 UTC	1	--- cgx_2.14/src/extUtil.h.orig 2017-04-28 10:12:50 UTC
2	+++ cgx_2.13/src/extUtil.h	2	+++ cgx_2.14/src/extUtil.h
3	@@ -9,6 +9,7 @@	3	@@ -9,6 +9,7 @@
4	#else	4	#else
5	#define DEV_NULL " >/dev/null"	5	#define DEV_NULL " >/dev/null"

Lines 1-5 Link Here

(-)cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp (-2 / +2 lines)
1	--- cgx_2.13/src/uselibSNL.cpp.orig 2017-10-07 09:58:00 UTC	1	--- cgx_2.14/src/uselibSNL.cpp.orig 2017-10-07 09:58:00 UTC
2	+++ cgx_2.13/src/uselibSNL.cpp	2	+++ cgx_2.14/src/uselibSNL.cpp
3	@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **	3	@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
4	// (5) create the cgx nurbs	4	// (5) create the cgx nurbs
5	// printf(" create blended nurbs\n");	5	// printf(" create blended nurbs\n");

Return to bug 234131

Lines 2-9 Link Here

(-)cad/calculix/Makefile (-2 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= calculix	4	PORTNAME= calculix
5	PORTVERSION= 2.13	5	PORTVERSION= 2.14
6	PORTREVISION= 2
7	CATEGORIES= cad	6	CATEGORIES= cad
8	MASTER_SITES= http://www.dhondt.de/	7	MASTER_SITES= http://www.dhondt.de/
9	DISTFILES= ${DIST_SOURCES}	8	DISTFILES= ${DIST_SOURCES}
Lines 82-87 Link Here
82	${STAGEDIR}${DOCSDIR}	81	${STAGEDIR}${DOCSDIR}
83	.endif	82	.endif
84	.if ${PORT_OPTIONS:MEXAMPLES}	83	.if ${PORT_OPTIONS:MEXAMPLES}
		84	# Some garbage crept in
		85	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/polyMesh/*~
		86	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/*~
		87	@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/system/*~
		88	@${RM} ${WRKSRC}/${CGX_VER}/examples/ifwhiledemo/.~
85	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	89	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
86	@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \	90	@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \
87	${STAGEDIR}${EXAMPLESDIR})	91	${STAGEDIR}${EXAMPLESDIR})

Lines 217-222 Link Here

(-)cad/calculix/pkg-plist (-21 / +7 lines)
217	%%PORTDOCS%%%%DOCSDIR%%/cgx/node249.html	217	%%PORTDOCS%%%%DOCSDIR%%/cgx/node249.html
218	%%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html	218	%%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html
219	%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html	219	%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
		220	%%PORTDOCS%%%%DOCSDIR%%/cgx/node251.html
		221	%%PORTDOCS%%%%DOCSDIR%%/cgx/node252.html
220	%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html	222	%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
221	%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html	223	%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
222	%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html	224	%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
Lines 298-304 Link Here
298	%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html	300	%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
299	%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html	301	%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
300	%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html	302	%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
301	%%PORTDOCS%%%%DOCSDIR%%/cgx_2.13.pdf	303	%%PORTDOCS%%%%DOCSDIR%%/cgx_2.14.pdf
302	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README	304	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
303	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T	305	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
304	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U	306	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
Lines 325-331 Link Here
325	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0/p	327	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0/p
326	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun	328	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun
327	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties	329	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties
328	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/RASProperties~
329	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/boundary	330	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/boundary
330	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbb	331	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbb
331	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbd	332	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/couette.fbd
Lines 334-348 Link Here
334	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/owner	335	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/owner
335	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/points	336	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/points
336	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/send.fbl	337	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/send.fbl
337	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/send.fbl~
338	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/thermophysicalProperties	338	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/thermophysicalProperties
339	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/thermophysicalProperties~
340	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/turbulenceProperties	339	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/turbulenceProperties
341	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/controlDict	340	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/controlDict
342	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/controlDict~
343	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSchemes	341	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSchemes
344	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution	342	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution
345	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution~
346	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README	343	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
347	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr	344	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr
348	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README	345	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README
Lines 349-373 Link Here
349	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl	346	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
350	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README	347	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/README
351	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean	348	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean
352	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/clean~
353	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp	349	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822.inp
354	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe.fbd
355	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe.inp
356	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_pehe_rest.inp
357	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd	350	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
358	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.inp
359	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_rest.inp
360	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_rest_dflux.inp
361	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_tetra.inp
362	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl	351	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
363	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_pehe.fbl
364	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl	352	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
365	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tetra.fbl	353	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_tr3u.fbl
366	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_penta.fbd
367	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetra.cvg
368	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetra.inp
369	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/rae2822_tetraf.cvg
370	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccxtet/send_tetra.fbl
371	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd	354	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
372	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd	355	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
373	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd	356	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
Lines 399-404 Link Here
399	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl	382	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
400	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd	383	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
401	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl	384	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
		385	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo2.fbl
402	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt	386	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
403	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README	387	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
404	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl	388	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
Lines 424-426 Link Here
424	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp	408	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
425	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl	409	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
426	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl	410	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl
		411	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/README
		412	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/userDataset/generate.fbl