From nobody Sat Nov 22 19:50:44 2025 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 4dDN444mygz6HT23 for ; Sat, 22 Nov 2025 19:50:44 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDN442009z3ymg for ; Sat, 22 Nov 2025 19:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763841044; 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=HZXyOYOTNzoTdTUX46meiPju5Tyrjp/KpUxTeLlFfHM=; b=AQUiJHVW9dV8Cge81g04gL/95ALc1GIGYw30JbNnWvc2CYOYsf3hz6kS5b0Q+XecWoFQhZ mk7qKUDwKQzpNG5Lx1A9JG9TSTxhq4ipTq6QhYF4JR6d2BEQNgy2oqpjhja62rCjpzgpOz GyZUnmlrTT9iC2AbDgr6xmN7QfMV6QIulXoKsxL7UZsx7t3uhzmPCUSk0KxEeQ8gMigru4 0YkLxsJMC9Vo6G3BoOnpEfUjciRgad/bN7CLmRcX2O8l42ASlR/+Vssp5TkvmFXfkXH32S BIhmedgdUbwXIECBa//UTLFoL3dMZDOnEg3zh+kf9lDwtmhrQOPeE8UqAzUGMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763841044; 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=HZXyOYOTNzoTdTUX46meiPju5Tyrjp/KpUxTeLlFfHM=; b=nJYbMUUoEPaFtNqiIey/dt9lJix6SPJOJo2Hgco5gZ1rhthmnFjcORb3GAx8prVh26vZ7U /okv5e1lQCPB87NZgiNPoRTOWptTGzrtt1TpvlfQsCMeeBv/GrWHi1mT16o1YzzEONbQH5 vMzIlzm1dV1KzxEn4RYuuxwFoSHVIf4J78E/4G+tjEUHpj1bAB53JK8nva5h1iHXA7zc3u Pla320BHMvab9nyyhzjTbNUSvAe0Kh1R9j2pKmiUTXU4hPg3e6icuR9yw94mHnwGxDDuCd 88m9rJig3ItJpIWaKEVKWK7sdBsiVDoSmcZTzRztOLotTrzGe7cNu+Eyf01zqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763841044; a=rsa-sha256; cv=none; b=JXJlyw+v4s5A3cZmZBcSJtTJjY08v3Aym5Vxr1rP+qIEo9evw3eDs6qMTrn1o1CRQs0hcz 32EDWAZ31tRVokZYxVrFhuNewHgZzRJbBFTXGNJIAFDuZ9AuiTBmIOdoQGVNHz74V/fOjt zAeTctLEfr0VxI550LoesjJe5/FGK0k0DtE3w3ys+Uyoy7GGA5BGJwlckvDc0tT3oTeDCI Zq4LP1wtq8jzCdWDjbly1X39+17TRPDJsAry13nIOclmRHpAfKsj+1si3BRIjLEemTZI14 P+2Pd5t5AIwZtF2bl92FmB9yR9r+DGLOda1uf8PtaJiFRuHCIFzzL46T4zcD8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDN441ZqRz1BSZ for ; Sat, 22 Nov 2025 19:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 29011 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 19:50:44 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Reifenberger Subject: git: e9f9b8e2e694 - main - cad/lib3mf: Patch for lib3mf 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9f9b8e2e694bb2deaa0f5ceac346d1ca394fce8 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 19:50:44 +0000 Message-Id: <69221414.29011.159eac58@gitrepo.freebsd.org> The branch main has been updated by mr: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9f9b8e2e694bb2deaa0f5ceac346d1ca394fce8 commit e9f9b8e2e694bb2deaa0f5ceac346d1ca394fce8 Author: Michael Reifenberger AuthorDate: 2025-11-22 19:48:53 +0000 Commit: Michael Reifenberger CommitDate: 2025-11-22 19:50:25 +0000 cad/lib3mf: Patch for lib3mf * Use upstream release archive [1] * Remove commented lines (leftovers) * Unbundle fast_float as a build dependency [2] * Remove incorrect library depenency of googletest * Define compiler:c++17-lang instead of compiler:c++20-lang * Define localbase:ldflags [3] * Don't extract (un)bundled libraries (requires bsdtar) * Use CMake helpers [4] * Enable "make test" PR: 291154 Reported by: Daniel Engberg --- cad/lib3mf/Makefile | 48 +++++++++++++++++++++++++++++++----------------- cad/lib3mf/distinfo | 6 +++--- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/cad/lib3mf/Makefile b/cad/lib3mf/Makefile index d0db4bc83819..566bd94f4c6c 100644 --- a/cad/lib3mf/Makefile +++ b/cad/lib3mf/Makefile @@ -1,9 +1,9 @@ PORTNAME= lib3mf -DISTVERSIONPREFIX=v DISTVERSION= 2.4.1 -#PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= cad -#PKGNAMESUFFIX= -devel +MASTER_SITES= https://github.com/3MFConsortium/${PORTNAME}/releases/download/v${DISTVERSION}/ +DISTNAME= ${PORTNAME}-${DISTVERSION}-source-with-submodules MAINTAINER= mr@FreeBSD.org COMMENT= Implementation of the 3D Manufacturing Format file standard @@ -12,24 +12,38 @@ WWW= http://3mf.io/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -#CONFLICTS_INSTALL= lib3mf-devel # +BUILD_DEPENDS= fast_float>0:math/fast_float +LIB_DEPENDS= libzip.so:archivers/libzip +TEST_DEPENDS= googletest>0:devel/googletest -LIB_DEPENDS= libgtest.so:devel/googletest \ - libzip.so:archivers/libzip +USES= compiler:c++17-lang cmake:testing localbase:ldflags pathfix \ + pkgconfig python +USE_LDCONFIG= yes -USES= compiler:c++20-lang cmake pkgconfig python -USE_GITHUB= yes -GH_ACCOUNT= 3MFConsortium -GH_PROJECT= lib3mf +EXTRACT_SUFX= .zip +EXTRACT_AFTER_ARGS= --exclude Libraries/fast_float \ + --exclude Libraries/googletest \ + --exclude Libraries/libressl \ + --exclude Libraries/libzip \ + --exclude Libraries/zlib \ + --exclude submodules/fast_float \ + --exclude submodules/googletest \ + --exclude submodules/libzip \ + --exclude submodules/zlib -CMAKE_ARGS+= -DUSE_INCLUDED_ZLIB=OFF \ - -DUSE_INCLUDED_LIBZIP=OFF \ - -DUSE_INCLUDED_SSL=OFF \ - -DLIB3MF_TESTS=OFF +NO_WRKSUBDIR= yes -CXXFLAGS+= -I${WRKSRC}/Include -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +CXXFLAGS+= -I${LOCALBASE}/include/fast_float -.include +.if make(test) +LDFLAGS+= -lgmock -lgtest +.endif + +CMAKE_TESTING_ON= LIB3MF_TESTS + +CMAKE_OFF= USE_INCLUDED_LIBZIP \ + USE_INCLUDED_ZLIB \ + USE_INCLUDED_SSL \ + LIB3MF_TESTS .include diff --git a/cad/lib3mf/distinfo b/cad/lib3mf/distinfo index 0b202ffceb29..6b2f9038b95c 100644 --- a/cad/lib3mf/distinfo +++ b/cad/lib3mf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1763826836 -SHA256 (3MFConsortium-lib3mf-v2.4.1_GH0.tar.gz) = 081dea66ddd1b958644bfac0fe9a580e63726061459efce5190a10161082f8f7 -SIZE (3MFConsortium-lib3mf-v2.4.1_GH0.tar.gz) = 36313494 +TIMESTAMP = 1763840749 +SHA256 (lib3mf-2.4.1-source-with-submodules.zip) = 4e9e1776f4dd1b3dfce684ce9bb4ad1157dadf29908a1f3aabb6cd4358bf3248 +SIZE (lib3mf-2.4.1-source-with-submodules.zip) = 55681831