Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Oct 2017 17:19:08 +0000 (UTC)
From:      Thomas Zander <riggs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r453200 - in head/cad/calculix: . files
Message-ID:  <201710301719.v9UHJ8fC074135@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon Oct 30 17:19:08 2017
New Revision: 453200
URL: https://svnweb.freebsd.org/changeset/ports/453200

Log:
  Update to upstream version 2.13
  
  Detailed log:
  - New features, see
    http://www.dhondt.de/new_calc.htm
    https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222915
  - Mark BROKEN on FreeBSD 10 for now: Does not build when
    built with clang, and causes runtime segfaults when built
    with gcc
  
  PR:		222915
  Submitted by:	pfg (maintainer)

Deleted:
  head/cad/calculix/files/patch-cgx__VER_src_userFunction.c
Modified:
  head/cad/calculix/Makefile
  head/cad/calculix/distinfo
  head/cad/calculix/files/patch-cgx__VER_src_Makefile
  head/cad/calculix/files/patch-cgx__VER_src_cgx.h
  head/cad/calculix/files/patch-cgx__VER_src_extUtil.h
  head/cad/calculix/pkg-plist

Modified: head/cad/calculix/Makefile
==============================================================================
--- head/cad/calculix/Makefile	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/Makefile	Mon Oct 30 17:19:08 2017	(r453200)
@@ -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}
@@ -16,6 +14,8 @@ COMMENT=	Three-Dimensional Structural Finite Element P
 
 LICENSE=	GPLv2
 
+BROKEN_FreeBSD_10=	Does not build with clang on FreeBSD 10, causes segfaults when built with gcc
+
 RUN_DEPENDS=	ccx:cad/calculix-ccx
 
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
@@ -26,7 +26,7 @@ DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 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
 

Modified: head/cad/calculix/distinfo
==============================================================================
--- head/cad/calculix/distinfo	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/distinfo	Mon Oct 30 17:19:08 2017	(r453200)
@@ -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

Modified: head/cad/calculix/files/patch-cgx__VER_src_Makefile
==============================================================================
--- head/cad/calculix/files/patch-cgx__VER_src_Makefile	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/files/patch-cgx__VER_src_Makefile	Mon Oct 30 17:19:08 2017	(r453200)
@@ -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 \

Modified: head/cad/calculix/files/patch-cgx__VER_src_cgx.h
==============================================================================
--- head/cad/calculix/files/patch-cgx__VER_src_cgx.h	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/files/patch-cgx__VER_src_cgx.h	Mon Oct 30 17:19:08 2017	(r453200)
@@ -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

Modified: head/cad/calculix/files/patch-cgx__VER_src_extUtil.h
==============================================================================
--- head/cad/calculix/files/patch-cgx__VER_src_extUtil.h	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/files/patch-cgx__VER_src_extUtil.h	Mon Oct 30 17:19:08 2017	(r453200)
@@ -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"

Modified: head/cad/calculix/pkg-plist
==============================================================================
--- head/cad/calculix/pkg-plist	Mon Oct 30 17:15:56 2017	(r453199)
+++ head/cad/calculix/pkg-plist	Mon Oct 30 17:19:08 2017	(r453200)
@@ -205,7 +205,18 @@ bin/cgx
 %%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 @@ bin/cgx
 %%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 @@ bin/cgx
 %%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 @@ bin/cgx
 %%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 @@ bin/cgx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/send.fbl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710301719.v9UHJ8fC074135>