From nobody Fri Aug 18 04:56:30 2023 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 4RRqMz5CtYz4qfgG; Fri, 18 Aug 2023 04:56:31 +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 4RRqMz2tksz4Grd; Fri, 18 Aug 2023 04:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692334591; 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=HGRI8RVp4baWL/ZDRtRIMN0BXOpInDVpgDbHvulOCuQ=; b=eAa11kCgE/57CBbdI4nTV5WFX5WGKTFCeuZXg1wz2s/+NMmgpC9XzykaTynIe1N4DSOei5 EdeKC5qBa7NPbPbShVlvJlVRy+WyRp3dAdjEBCovUQrFcXfOiV9VPpGNHadFEjddoA1uMI z9FYUYS/DvTHg1z8lTjkzlqtQCyVRBQ+F2xrPE49RdJ1bZcnsyybxR4RCU+b80vjP+SpL6 LUt56XKxkgwGBlfsUo2lRjMu+Cnasoo87sUArJU+YmyIUw5FcajSC3pk6d4W6fvi+9D+nr 1WyBxsE27MKZas1sSHSgwx8QkDdyLcJAGN+H29/zOArCmIbk90V8wq4ePTC0DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692334591; 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=HGRI8RVp4baWL/ZDRtRIMN0BXOpInDVpgDbHvulOCuQ=; b=tI1gMH7R48lInIzub1GvMiO9dFvwu3fCLMHTPxMJhfBWM6G7duQh+sPlD8czPMtWbkDoyM LHdAXfh+j95A/rPykJQ/K8fNaa3Z584V0goTK++rv1NI0L5eSExocldtpNqzhbhpXuCvXo ORmje4blx1TOdFvrF9Slr2rs+XdvO35Eo9+guIFi/yazkqzzjmXnYnzHAcqs51rr9kstmm 96GJyln7S/KiwyLJXjhu0GehsEEPou65twHnha8tQ1gic78MFpTI7ecL0gEaD3kq/0U/6X qHJE9FamP1pGGOk7Yqjd+gyrwyoh1jvBbnF1qVntTU2UZ9475Ppm0GETFJ/5rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692334591; a=rsa-sha256; cv=none; b=amzcyhUqANycYrsAEJ5T69iwWGjHXT0dZj2jwX6/BwweTpwkgXa5CdffAZzliZ/MiRXsuM jT+Q5FW/rihQOYMpMJQIdBsBxum6m44Wq5g+rMpGEQ4tVKeFv0gV00BJIlMmiElhIXCr6s vCv675Ui2x127+Y/o7xVvpJDOTXM+v6xAYeqCG4ZL946DYqP67AHFPLwDXwxBFQWii7g9L c3d0Mv7XZHtdmygpgR2wuOZlvnKAUR75a0vRgVh7+Eow19fTdam0q5D2p/L5o9NBErtl/s VmTbwGCvxf1P/d/73UZEi49BQ4XHAeKJ7TkbNSpJvrbOzD5rIA9JL8chrNPs4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRqMz1lY9z13C1; Fri, 18 Aug 2023 04:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I4uUwG081528; Fri, 18 Aug 2023 04:56:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I4uUTg081525; Fri, 18 Aug 2023 04:56:30 GMT (envelope-from git) Date: Fri, 18 Aug 2023 04:56:30 GMT Message-Id: <202308180456.37I4uUTg081525@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: 51cc6ae471c7 - main - cad/brlcad: Fix build on 14 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51cc6ae471c71d17495c4be0d5bea385c99b3cb3 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=51cc6ae471c71d17495c4be0d5bea385c99b3cb3 commit 51cc6ae471c71d17495c4be0d5bea385c99b3cb3 Author: Muhammad Moinur Rahman AuthorDate: 2023-08-18 03:35:45 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-08-18 04:56:22 +0000 cad/brlcad: Fix build on 14 - Pet portclippy Approved by: portmgr (blanket) Sponsored by: The FreeBSD Foundation --- cad/brlcad/Makefile | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index 2f16022e847a..4794a6dc0aed 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -23,23 +23,32 @@ LIB_DEPENDS= liblz4.so:archivers/liblz4 \ USES= bison:alias cmake:insource cpe gl pathfix pkgconfig python:env \ tar:bzip2 tk xorg USE_GL= gl glu +USE_LDCONFIG= yes USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes xft xi \ xorgproto xrender xscrnsaver xt xxf86vm -USE_LDCONFIG= yes + +CMAKE_OFF= BRLCAD_ENABLE_STRICT +CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} + +TEST_TARGET= check CONFLICTS_INSTALL= py[23][0-9]-epsilon +MANPREFIX= ${PREFIX}/${PORTNAME}/share NO_MTREE= yes WRKSRC=${WRKDIR}/${PORTNAME}-${PORTVERSION} PLIST_SUB+= PORTVERSION=${PORTVERSION} -CMAKE_OFF= BRLCAD_ENABLE_STRICT -CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} -MANPREFIX= ${PREFIX}/${PORTNAME}/share +.include -TEST_TARGET= check +.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) +USES+= llvm:max=14 +CC= clang${LLVM_VERSION} +CPP= clang-cpp${LLVM_VERSION} +CXX= clang++${LLVM_VERSION} +.endif post-patch: @${REINPLACE_CMD} -e 's+-exact Tcl 8\.6\.10+Tcl 8.6+' \