View | Details | Raw Unified | Return to bug 222915 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +3 lines)
Lines 1-12 Link Here
1
# Created by: Pedro Giffuni
1
# Created by: Pedro Giffuni
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	CalculiX
4
PORTNAME=	calculix
5
PORTVERSION=	2.12
5
PORTVERSION=	2.13
6
PORTREVISION=	2
7
CATEGORIES=	cad
6
CATEGORIES=	cad
8
MASTER_SITES=	http://www.dhondt.de/
7
MASTER_SITES=	http://www.dhondt.de/
9
PKGNAMEPREFIX=	CalculiX-
10
DISTFILES=	${DIST_SOURCES}
8
DISTFILES=	${DIST_SOURCES}
11
DIST_SUBDIR=	calculix
9
DIST_SUBDIR=	calculix
12
EXTRACT_ONLY=	${DIST_SOURCES}
10
EXTRACT_ONLY=	${DIST_SOURCES}
Lines 26-32 Link Here
26
WRKSRC=		${WRKDIR}/CalculiX
24
WRKSRC=		${WRKDIR}/CalculiX
27
CGX_VER=	cgx_${PORTVERSION}
25
CGX_VER=	cgx_${PORTVERSION}
28
26
29
USES=		gmake tar:bzip2
27
USES=		gmake tar:bzip2 compiler:openmp
30
USE_XORG=	ice sm x11 xext xi xmu xt
28
USE_XORG=	ice sm x11 xext xi xmu xt
31
USE_GL= 	gl glu # uses its own glut
29
USE_GL= 	gl glu # uses its own glut
32
30
(-)distinfo (-9 / +9 lines)
Lines 1-9 Link Here
1
TIMESTAMP = 1498928723
1
TIMESTAMP = 1507666721
2
SHA256 (calculix/cgx_2.12.all.tar.bz2) = 504e5230902fb3c18001807c1394375b1cf81a10a0e99bd03f121c9b38717a83
2
SHA256 (calculix/cgx_2.13.all.tar.bz2) = dfbe696315347981bc740e55638e3ef0161afde2597b1f63c732021f852289b7
3
SIZE (calculix/cgx_2.12.all.tar.bz2) = 4625123
3
SIZE (calculix/cgx_2.13.all.tar.bz2) = 4546379
4
SHA256 (calculix/cgx_2.12.exa.tar.bz2) = 610afec56cd964f7a12179d59c4402f4ded6cb6c27b9e0f296ca0e446af4ee20
4
SHA256 (calculix/cgx_2.13.exa.tar.bz2) = f77fbbe41e5feecd9671c4d72b2a53d19f7641dce59a5e7dc219d32b46cf451a
5
SIZE (calculix/cgx_2.12.exa.tar.bz2) = 3035788
5
SIZE (calculix/cgx_2.13.exa.tar.bz2) = 3051732
6
SHA256 (calculix/cgx_2.12.htm.tar.bz2) = c648c1e53d5622716f35b15b8a35b09de82f23c1507c101e24d75dbc2ff6daa4
6
SHA256 (calculix/cgx_2.13.htm.tar.bz2) = 39911f2b75730a844050faab48b729d8ebba5bbd6a467e561df76da091e31c69
7
SIZE (calculix/cgx_2.12.htm.tar.bz2) = 328548
7
SIZE (calculix/cgx_2.13.htm.tar.bz2) = 334332
8
SHA256 (calculix/cgx_2.12.pdf) = 7fda713652322d829178e7f2301a2a7c08125fffdf28c05b226ad0a45365793f
8
SHA256 (calculix/cgx_2.13.pdf) = a94e787c191dfc956c6e7754b65eab86b9608b0f8567d342b51550551484d412
9
SIZE (calculix/cgx_2.12.pdf) = 1254014
9
SIZE (calculix/cgx_2.13.pdf) = 1277403
(-)files/patch-cgx__VER_src_Makefile (-2 / +2 lines)
Lines 1-5 Link Here
1
--- cgx_2.12/src/Makefile.orig	2017-03-11 16:25:39 UTC
1
--- cgx_2.13/src/Makefile.orig	2017-03-11 16:25:39 UTC
2
+++ cgx_2.12/src/Makefile
2
+++ cgx_2.13/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 \
(-)files/patch-cgx__VER_src_cgx.h (-6 / +6 lines)
Lines 1-11 Link Here
1
--- cgx_2.12/src/cgx.h.orig	2017-04-28 10:12:50 UTC
1
--- cgx_2.13/src/cgx.h.orig	2017-04-28 10:12:50 UTC
2
+++ cgx_2.12/src/cgx.h
2
+++ cgx_2.13/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.12/doc/ccx/ccx.html",\
4
     "/usr/local/CalculiX/ccx_2.13/doc/ccx/ccx.html",\
5
     "/usr/local/CalculiX/cgx_2.12/doc/aflib/aflib.pdf"}
5
     "/usr/local/CalculiX/cgx_2.13/doc/aflib/aflib.pdf"}
6
 #else
6
 #else
7
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.12/doc/cgx/cgx.html",\
7
-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.13/doc/cgx/cgx.html",\
8
-    "/usr/local/CalculiX/ccx_2.12/doc/ccx/ccx.html"}
8
-    "/usr/local/CalculiX/ccx_2.13/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
(-)files/patch-cgx__VER_src_extUtil.h (-2 / +2 lines)
Lines 1-5 Link Here
1
--- cgx_2.12/src/extUtil.h.orig	2017-04-28 10:12:50 UTC
1
--- cgx_2.13/src/extUtil.h.orig	2017-04-28 10:12:50 UTC
2
+++ cgx_2.12/src/extUtil.h
2
+++ cgx_2.13/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"
(-)files/patch-cgx__VER_src_userFunction.c (-28 lines)
Lines 1-28 Link Here
1
--- cgx_2.12/src/userFunction.c.orig	2017-04-30 15:13:54 UTC
2
+++ cgx_2.12/src/userFunction.c
3
@@ -57,7 +57,12 @@ void sendFacesNodes( char *setname );
4
 /*                                                                       */
5
 /*                                                                       */
6
 /* --------------------------------------------------------------------  */
7
-                                                                
8
+
9
+  int assembleFEM(char *parameters, Summen   *sum, SumGeo   *sumGeo ) { return(0); }
10
+  int assembleFEMVane(char *parameters, Summen   *sum, SumGeo   *sumGeo ) { return(0); }
11
+  int createAF(char *sections, char *parameters, Summen   *sum, SumGeo   *sumGeo ){ return(0); }
12
+  int createAF_nlb(char *sections, char *parameters, Summen   *sum, SumGeo   *sumGeo ){ return(0); }
13
+  int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); }                                                                  
14
 void userFunction(char *string, Summen   *sum, SumGeo   *sumGeo )
15
 {                                                               
16
   int i,j,k,l,n;
17
@@ -89,11 +94,6 @@ void userFunction(char *string, Summen  
18
   // aflib addons
19
   char buf[12][MAX_LINE_LENGTH];                                            
20
 
21
-  int assembleFEM(char *parameters, Summen   *sum, SumGeo   *sumGeo ) { return(0); }
22
-  int assembleFEMVane(char *parameters, Summen   *sum, SumGeo   *sumGeo ){ return(0); }
23
-  int createAF(char *sections, char *parameters, Summen   *sum, SumGeo   *sumGeo ){ return(0); }
24
-  int createAF_nlb(char *sections, char *parameters, Summen   *sum, SumGeo   *sumGeo ){ return(0); }
25
-  int sendFlutter(Summen *sum, char string[2][MAX_LINE_LENGTH] ) { return(0); }                  
26
   // end
27
 
28
   /* list the implemented user-functions if no parameter was provided for the "call" command */
(-)pkg-plist (-20 / +13 lines)
Lines 205-211 Link Here
205
%%PORTDOCS%%%%DOCSDIR%%/cgx/node238.html
205
%%PORTDOCS%%%%DOCSDIR%%/cgx/node238.html
206
%%PORTDOCS%%%%DOCSDIR%%/cgx/node239.html
206
%%PORTDOCS%%%%DOCSDIR%%/cgx/node239.html
207
%%PORTDOCS%%%%DOCSDIR%%/cgx/node24.html
207
%%PORTDOCS%%%%DOCSDIR%%/cgx/node24.html
208
%%PORTDOCS%%%%DOCSDIR%%/cgx/node240.html
209
%%PORTDOCS%%%%DOCSDIR%%/cgx/node241.html
210
%%PORTDOCS%%%%DOCSDIR%%/cgx/node242.html
211
%%PORTDOCS%%%%DOCSDIR%%/cgx/node243.html
212
%%PORTDOCS%%%%DOCSDIR%%/cgx/node244.html
213
%%PORTDOCS%%%%DOCSDIR%%/cgx/node245.html
214
%%PORTDOCS%%%%DOCSDIR%%/cgx/node246.html
215
%%PORTDOCS%%%%DOCSDIR%%/cgx/node247.html
216
%%PORTDOCS%%%%DOCSDIR%%/cgx/node248.html
217
%%PORTDOCS%%%%DOCSDIR%%/cgx/node249.html
208
%%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html
218
%%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html
219
%%PORTDOCS%%%%DOCSDIR%%/cgx/node250.html
209
%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
220
%%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
210
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
221
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
211
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
222
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
Lines 287-295 Link Here
287
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
298
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
288
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
299
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
289
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
300
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
290
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.12.pdf
301
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.13.pdf
291
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
302
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
292
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README~
293
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
303
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
294
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
304
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
295
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/p
305
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/p
Lines 334-340 Link Here
334
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution
344
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution
335
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution~
345
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/system/fvSolution~
336
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
346
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
337
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.dat
338
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr
347
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr
339
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README
348
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README
340
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
349
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/isaac.fbl
Lines 395-422 Link Here
395
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
404
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
396
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl
405
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl
397
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak
406
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak
398
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/BOUD.bou
399
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/BOUD.equ
400
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC1.nam
401
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC2.nam
402
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC3.nam
403
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/CYC4.nam
404
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/PRESD.bou
405
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/PRESD.equ
406
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README
407
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README
407
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/SPCB2_10.1.bou
408
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/SPC_123.bou
409
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/WarnNodeMissCyclicSymmetry.nam
410
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/all.msh
411
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.cvg
412
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.dat
413
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd
408
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd
414
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.frd
415
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp
409
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp
416
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.sta
417
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png
410
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png
418
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/send.fbl
411
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/send.fbl
419
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/spooles.out
420
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
412
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
421
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp
413
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/solverfile.inp
422
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
414
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
Lines 430-433 Link Here
430
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
422
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
431
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
423
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
432
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
424
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
425
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
433
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl
426
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl

Return to bug 222915