From nobody Sat May 13 14:24:56 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJSZc2TrTz4BRDb; Sat, 13 May 2023 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJSZc1cFXz4HBh; Sat, 13 May 2023 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683987896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dGn9KQApFgDs/n9ae4Ya/E99tLI8GgLIPYthdTsyl04=; b=JvFT2LgrZzacY55ebdAHXYPqm/5ypKGB2MF6j3066mWpeFzDSZChXB/AZKikdfD5v0vLnM Zk130WKTHaN7f8X4yl9XiUQM4UhhRJ8heVEf3WcOeEe768UJaN3cYm57WTls65Z25bu2lw IPF6ImB3kSpsGxdIQM0KauJFXPREux6o6Y0kCsrPAk+NZon+fi4g0eyhbydJj29P5PNAv1 +OpsqjwyCeydnIP6g8KBbtV22dBqUsj+IJOhG/2XA5VDMB2cFYLBwqRIteGYmAS+PpU9tW S9VdBogKMTjZxrf+f2SxnRKGcPH4yti2oAZXOlP4kcKXUlMKBS2R0c2P+H9QMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683987896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dGn9KQApFgDs/n9ae4Ya/E99tLI8GgLIPYthdTsyl04=; b=CSFSyHq8LWQRkQ3I0/24EwWvPy3LT24Q2yEwXbgW3WOnPGySqnJ0jpXqtC+1P2/8+RoC35 8PTq3S9OwB5/kGMv3H1kGVv6hF5y4fmQmVerqfA6YJDgGn2SDKZOiUmmxPvBCeOxe6HxXJ OGJUO86mInmXFSxcuykpCHjWD+6sDko02FjUbSY+QQByl2rjOA+swF33kJyb44RzL9mSi8 4Ya2mevF0uUWzN7UKztSoiBhQcJlIhwTtukCLaPMG6YTu8B4jJw9TDYz03gd7qICbYfXlk E1CR4mMMcyjsqG05Y31cvoRrHGMBAAMdrOlSxs528ttVbenPMRSQSQmzULfq/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683987896; a=rsa-sha256; cv=none; b=IHxkVa0AQODO7zMn4JTNz7pyNuNpPlPfYxa7ZO+C5XeqZGC/hLHoAESS1n4+QUts0LCSDj iHtIDOoKB5NcCfuS3ph4KMuqqCgu7bTSP4EexoUZ2ZEc9Y9OJ+KReuRTDWov9ayL0dERx5 Y6ahILuP0FyhmJ50k2Hgb994zMasd5++Yig/c1k4rmb/VDIYs169ZYoVv1/OsGJyyZD683 EJYkNCn4gAsurUsRWhqb7QXYyOJXQ2SS59xTkdkAM7boHrUAGIR93OR9SyHuW07SJN0XvN tr+XSYoSH0ltxYR6oMIS6ndUtXTZk+sdkIbkUGkLatPjY5rHubUwcprMbqMd/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJSZc0jnMzL76; Sat, 13 May 2023 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34DEOuLN001047; Sat, 13 May 2023 14:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DEOuRj001046; Sat, 13 May 2023 14:24:56 GMT (envelope-from git) Date: Sat, 13 May 2023 14:24:56 GMT Message-Id: <202305131424.34DEOuRj001046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 295664f4ab50 - main - cad/calculix: Unbreak on HEAD List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 295664f4ab50990c635cc0328fe81c7502e145c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=295664f4ab50990c635cc0328fe81c7502e145c6 commit 295664f4ab50990c635cc0328fe81c7502e145c6 Author: Muhammad Moinur Rahman AuthorDate: 2023-05-13 14:08:27 +0000 Commit: Muhammad Moinur Rahman 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 +.include -.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 +.include