Date: Sat, 13 May 2023 14:24:56 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 295664f4ab50 - main - cad/calculix: Unbreak on HEAD Message-ID: <202305131424.34DEOuRj001046@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=295664f4ab50990c635cc0328fe81c7502e145c6 commit 295664f4ab50990c635cc0328fe81c7502e145c6 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2023-05-13 14:08:27 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2023-05-13 14:24:16 +0000 cad/calculix: Unbreak on HEAD - Pet portclippy - Utilize OPTIONSNG where applicable Approved by: portmgr (blanket) --- cad/calculix/Makefile | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index ec4bab9992ab..82d43c702ba0 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -16,35 +16,34 @@ 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> +.include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MEXAMPLES} -DISTFILES+= ${DIST_EXAMPLES} -EXTRACT_ONLY+= ${DIST_EXAMPLES} -.endif - -.if ${PORT_OPTIONS:MDOCS} -DISTFILES+= ${DIST_HTM} ${DIST_PDF} -EXTRACT_ONLY+= ${DIST_HTM} -DOCSDIR= ${PREFIX}/share/doc/CalculiX +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 +CPPFLAGS+= -Wno-error=int-conversion .endif .if ${ARCH} == "sparc64" @@ -72,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/*~ @@ -88,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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305131424.34DEOuRj001046>