From nobody Tue Nov 01 01:24:26 2022 X-Original-To: dev-commits-ports-main@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 4N1XP7074Pz4h36X; Tue, 1 Nov 2022 01:24:27 +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 4N1XP66Q2Tz3XVD; Tue, 1 Nov 2022 01:24:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667265866; 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=M/+Y9cLgufx2qiJtnSs9lsxOAIOnek0mFttvl1dBDYo=; b=OqDHKOw/0zVLs+vQFP9baCHhXne0YuFAWSCo2wryeyiKBBnPiCYj/eVzjZf9GesOz4pYl3 iswuark7W9F8R24aMObbRFV3FW7WBP68Z1t37jQb5emaCcEgO2fSKxSc79hnWOt1sYfNxm xL+d9RYG4cEkmJt1gTvQ+8OwhKojq68f2GGNu7ASeYp2NKfA2uwf4jj7mjvoF/y0em79yS w47gzDKkJteniv/QHiXym3ZXsZDjU8PHY5pnHGYl0EoOiGctP0oNzP0eViQglGfYvBXATi wj3w23LGi+T2pLMsLnDzM+/gPdJSUfVVZnaWWtQxDOjXxogzUXPWyEmx0/ZfGA== 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 4N1XP65Sp7zxrD; Tue, 1 Nov 2022 01:24:26 +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 2A11OQo4098385; Tue, 1 Nov 2022 01:24:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A11OQm4098384; Tue, 1 Nov 2022 01:24:26 GMT (envelope-from git) Date: Tue, 1 Nov 2022 01:24:26 GMT Message-Id: <202211010124.2A11OQm4098384@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stephen Montgomery-Smith Subject: git: 7c661db3cfcf - main - math/octave-forge-csg-toolkit: Use smarter method to set CXXFLAGS. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stephen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c661db3cfcf8989a1b409e0955cd807dff1517e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667265866; 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=M/+Y9cLgufx2qiJtnSs9lsxOAIOnek0mFttvl1dBDYo=; b=SdZkNN3WbnB2ZzEloguGCPenfHM9zJBiMoLzc5Hv3OVfd1529NWqZAh+HjwSdplYln8U6J yFPWvGlDzzeb14SPRM9uRP1Y1ee97X9DqYNW3GjiOY9Ln1CX3du2kxsuBGiIrbMEOPeLFX DbCSxU762D3zeRA2BAshBufAqqHClgLgyYxGqcywMA5edgqwhhcSS8TSIGOUQvVlZr+7wJ Uwb9QcoM4sLMBZfMJMUZeyLDtXFkicFiuVI3iUhMEF+jRE44/3OtFYQTgHRHWbka+f+YDj BQV0I3J/aivzLH1BeuoYSI4Ss2nC3NBx6hCp83XLIqvhAKWZc9OKIgdm03CQVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667265866; a=rsa-sha256; cv=none; b=xWd6PgnRMEpwu1ZF2nLo6b3hoSVdmDmQEbrW83CVLWNrftMPBuD5YpRLmXBU4Zb12mHvRI Skta2Y1KA1w2EJQa9732XA0I0szRQDgLrjpLGaOl03V+OknBWU1GEqssB7J4PUckk2ki5w XJ5rHNg4yTTCLckb4ac+EvtxLuNoxTyJjJSpY1hjkJcR7i0/W37d14pbI2CxscDtYwpqAS PEwfoZM7ybIZpZCh7rsIeLtjBdBsopVTyJup6yFDGINpThmaJncnVWWwPH3l9ll3p7dNo5 Q/OFRYmGUBMdbPWULkd02wD421UAJWjgH1EUyl/3RHn1zSp5WXtfUI/7w9HxPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c661db3cfcf8989a1b409e0955cd807dff1517e commit 7c661db3cfcf8989a1b409e0955cd807dff1517e Author: Stephen Montgomery-Smith AuthorDate: 2022-11-01 01:23:52 +0000 Commit: Stephen Montgomery-Smith CommitDate: 2022-11-01 01:23:52 +0000 math/octave-forge-csg-toolkit: Use smarter method to set CXXFLAGS. --- math/octave-forge-csg-toolkit/Makefile | 7 ++++++- math/octave-forge-csg-toolkit/files/patch-Makefile | 11 ----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/math/octave-forge-csg-toolkit/Makefile b/math/octave-forge-csg-toolkit/Makefile index ea9bc73a08a9..ce09c981d69c 100644 --- a/math/octave-forge-csg-toolkit/Makefile +++ b/math/octave-forge-csg-toolkit/Makefile @@ -1,4 +1,5 @@ PORTNAME= octave-forge-csg-toolkit +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 1.2.3 CATEGORIES= math @@ -30,4 +31,8 @@ post-build: ${RM} ${WRKSRC}/Makefile ${WRKSRC}/configure cd ${WRKDIR} && ${TAR} cfz ${OCTAVE_DISTNAME}.tar.gz ${OCTSRC} -.include +.include + +CXXFLAGS+= -stdlib=libstdc++ + +.include diff --git a/math/octave-forge-csg-toolkit/files/patch-Makefile b/math/octave-forge-csg-toolkit/files/patch-Makefile deleted file mode 100644 index 11e05c1852e5..000000000000 --- a/math/octave-forge-csg-toolkit/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2022-10-31 00:26:54 UTC -+++ Makefile -@@ -4,7 +4,7 @@ all: - $(MKOCTFILE) readObj.cc - $(MKOCTFILE) writeObj.cc - $(MKOCTFILE) longbone_maxDistance.cc -- $(MKOCTFILE) longbone_Registration.cc -+ $(MKOCTFILE) -stdlib=libstdc++ longbone_Registration.cc - $(MKOCTFILE) meshArea.cc - $(MKOCTFILE) meshBarycenter.cc - $(MKOCTFILE) meshSection.cc