aboutsummaryrefslogtreecommitdiff
path: root/cad/calculix
diff options
context:
space:
mode:
Diffstat (limited to 'cad/calculix')
-rw-r--r--cad/calculix/Makefile62
-rw-r--r--cad/calculix/distinfo18
-rw-r--r--cad/calculix/files/patch-cgx__2.20_src_Makefile (renamed from cad/calculix/files/patch-cgx__VER_src_Makefile)8
-rw-r--r--cad/calculix/pkg-descr2
-rw-r--r--cad/calculix/pkg-plist30
5 files changed, 64 insertions, 56 deletions
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 853d8342e6fd..5b7c849793d6 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -1,59 +1,57 @@
-# Created by: Pedro Giffuni
-
PORTNAME= calculix
-PORTVERSION= 2.17.1
-PORTREVISION= 1
+PORTVERSION= 2.21
CATEGORIES= cad
MASTER_SITES= http://www.dhondt.de/
DISTFILES= ${DIST_SOURCES}
DIST_SUBDIR= calculix
EXTRACT_ONLY= ${DIST_SOURCES}
-MAINTAINER= pfg@FreeBSD.org
+MAINTAINER= rsmith@xs4all.nl
COMMENT= Three-Dimensional Structural Finite Element Program
+WWW= http://www.calculix.de/
LICENSE= GPLv2
RUN_DEPENDS= ccx:cad/calculix-ccx
USES= gl gmake tar:bzip2 compiler:c++11-lib xorg
-USE_XORG= ice sm x11 xext xi xmu xt
USE_GL= gl glu # uses its own glut
+USE_XORG= ice sm x11 xext xi xmu xt
-DIST_SOURCES= cgx_${PORTVERSION}.all${EXTRACT_SUFX}
-DIST_HTM= cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
-DIST_PDF= cgx_${PORTVERSION}.pdf
-DIST_EXAMPLES= cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
+CXXFLAGS+= -std=c++98
+
+DOCSDIR= ${PREFIX}/share/doc/CalculiX
WRKSRC= ${WRKDIR}/CalculiX
-CGX_VER= cgx_${PORTVERSION}
-CXXFLAGS+= -std=c++98
+OPTIONS_DEFINE= DOCS EXAMPLES
+
+DOCS_DISTFILES= ${DIST_HTM} ${DIST_PDF}
+DOCS_EXTRACT_ONLY= ${DIST_HTM}
+EXAMPLES_DISTFILES= ${DIST_EXAMPLES}
+EXAMPLES_EXTRACT_ONLY= ${DIST_EXAMPLES}
BROWSER?= firefox
+CGX_VER= cgx_${PORTVERSION}
+DIST_EXAMPLES= cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
+DIST_HTM= cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
+DIST_PDF= cgx_${PORTVERSION}.pdf
+DIST_SOURCES= cgx_${PORTVERSION}.all${EXTRACT_SUFX}
PSVIEWER?= gv
-OPTIONS_DEFINE= DOCS EXAMPLES
-
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MEXAMPLES}
-DISTFILES+= ${DIST_EXAMPLES}
-EXTRACT_ONLY+= ${DIST_EXAMPLES}
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+USES+= llvm:max=15
.endif
-.if ${PORT_OPTIONS:MDOCS}
-DISTFILES+= ${DIST_HTM} ${DIST_PDF}
-EXTRACT_ONLY+= ${DIST_HTM}
-DOCSDIR= ${PREFIX}/share/doc/CalculiX
-.endif
-
-.if ${ARCH} == "sparc64"
-CFLAGS+= -fPIC
-FFLAGS+= -fPIC
-.else
CFLAGS+= -fpic
FFLAGS+= -fpic
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CPPFLAGS+= -Wno-error=int-conversion
.endif
pre-build:
@@ -73,14 +71,15 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${CGX_VER}/src/cgx \
${STAGEDIR}${PREFIX}/bin/cgx
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx
@(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \
${STAGEDIR}${DOCSDIR}/cgx)
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
# Some garbage crept in
@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/polyMesh/*~
@${RM} ${WRKSRC}/${CGX_VER}/examples/OpenFOAM/couette/constant/*~
@@ -89,6 +88,5 @@ do-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@(cd ${WRKSRC}/${CGX_VER}/examples && ${COPYTREE_SHARE} . \
${STAGEDIR}${EXAMPLESDIR})
-.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 380263f3785d..fc9a30014fe3 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1600795203
-SHA256 (calculix/cgx_2.17.1.all.tar.bz2) = 3fcd2ec59fd65e3b51cacf4c6ace21bf36570ea4527ba9840e52c96736c4dc0f
-SIZE (calculix/cgx_2.17.1.all.tar.bz2) = 5785730
-SHA256 (calculix/cgx_2.17.1.exa.tar.bz2) = 6aab76b368155933fa6894aacc27499f64e15534f4d34ea6810b1697a14bc825
-SIZE (calculix/cgx_2.17.1.exa.tar.bz2) = 3919545
-SHA256 (calculix/cgx_2.17.1.htm.tar.bz2) = 907a508856e3e5593f451facfdfa1cdfdc303b632165b7a20e8f7a566b57e36d
-SIZE (calculix/cgx_2.17.1.htm.tar.bz2) = 370298
-SHA256 (calculix/cgx_2.17.1.pdf) = f47918ccf3c041acb933ee45e112e58250547a6dde7ac649e9fa6d9ea7613527
-SIZE (calculix/cgx_2.17.1.pdf) = 1197112
+TIMESTAMP = 1690913771
+SHA256 (calculix/cgx_2.21.all.tar.bz2) = 55ae561903df011e944d7f82f9e00039dbc4c68ac9195a5a862d446eb56bcfc1
+SIZE (calculix/cgx_2.21.all.tar.bz2) = 5758392
+SHA256 (calculix/cgx_2.21.htm.tar.bz2) = f2c8aa71f4c81a537e7f3fffa62862b1f617d95ac31ac41a994799df7d28824f
+SIZE (calculix/cgx_2.21.htm.tar.bz2) = 384268
+SHA256 (calculix/cgx_2.21.pdf) = 0b392abde2041f7d646c668d42bf317487884fae2153145fdd7cb9ccd2496a5e
+SIZE (calculix/cgx_2.21.pdf) = 1240552
+SHA256 (calculix/cgx_2.21.exa.tar.bz2) = 0569cdeca93eab827277904519e7b5f7b04a1326e7a3a11cc148f3dde585c054
+SIZE (calculix/cgx_2.21.exa.tar.bz2) = 3917880
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__2.20_src_Makefile
index ab664be54b69..a27e25b9828b 100644
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__2.20_src_Makefile
@@ -1,6 +1,6 @@
---- cgx_2.17.1/src/Makefile.orig 2020-02-18 18:22:00 UTC
-+++ cgx_2.17.1/src/Makefile
-@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
+--- cgx_2.21/src/Makefile.orig 2022-07-29 09:41:00 UTC
++++ cgx_2.21/src/Makefile
+@@ -5,11 +5,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
-I/usr/include/GL \
-I../../libSNL/src \
-I../../glut-3.5/src \
@@ -15,7 +15,7 @@
-lm -lpthread -lrt
-@@ -66,7 +66,7 @@ OULIB = $(ULIB:.c=.o)
+@@ -67,7 +67,7 @@ OULIB = $(ULIB:.c=.o)
OUTIL = $(SUTIL:.c=.o)
cgx: $(OLIB) $(OUTIL) $(OULIB)
diff --git a/cad/calculix/pkg-descr b/cad/calculix/pkg-descr
index 4f8b8ba1fe1d..b11eb63e481e 100644
--- a/cad/calculix/pkg-descr
+++ b/cad/calculix/pkg-descr
@@ -12,5 +12,3 @@ Supported solvers
* DUNS-CFD (pre, post)
* ISAAC-CFD (pre, post)
* OpenFOAM (pre, post)
-
-WWW: http://www.calculix.de/
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 95eab5f30480..b5a6fa164a37 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,8 +1,10 @@
bin/cgx
+%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
%%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.log
+%%PORTDOCS%%%%DOCSDIR%%/cgx/images.out
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.pl
%%PORTDOCS%%%%DOCSDIR%%/cgx/images.tex
%%PORTDOCS%%%%DOCSDIR%%/cgx/img1.png
@@ -41,6 +43,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/img4.png
%%PORTDOCS%%%%DOCSDIR%%/cgx/img40.png
%%PORTDOCS%%%%DOCSDIR%%/cgx/img41.png
+%%PORTDOCS%%%%DOCSDIR%%/cgx/img42.png
%%PORTDOCS%%%%DOCSDIR%%/cgx/img5.png
%%PORTDOCS%%%%DOCSDIR%%/cgx/img6.png
%%PORTDOCS%%%%DOCSDIR%%/cgx/img7.png
@@ -236,7 +239,16 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node265.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node266.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node267.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node268.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node269.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node270.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node271.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node272.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node273.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node274.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node275.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node276.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node3.html
@@ -316,7 +328,7 @@ bin/cgx
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.17.1.pdf
+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.21.pdf
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
@@ -344,7 +356,6 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/Allrun
%%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
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/faces
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/constant/polyMesh/neighbour
@@ -366,6 +377,10 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/rae2822_penta.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ccx/send_penta.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.hdr
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/duns/duns.trl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/rae2822.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/cylinder.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basic/disc.fbd
@@ -414,14 +429,11 @@ bin/cgx
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/latimtrans.inp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/post.fbl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/thermal/send.fbl
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.12d
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbb
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.fbd
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/latim.inp
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/turbine/mesh.fbl
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 05:48:04 +0000