From nobody Sat Apr 29 17:33:02 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 4Q7xQ70SKtz482yL; Sat, 29 Apr 2023 17:33:03 +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 4Q7xQ702Khz4lMY; Sat, 29 Apr 2023 17:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682789583; 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=b9voFB3GissmiSd2GymlKqR5j48Dv8n9tiqWgaxYu/0=; b=kM6eVipOPXB8y/bJKOMS8UkEiC+F4Pd1BoVsMWNhSx6gNmSJasT1ZbZgqZXECilY/JEYRR RLdw/cwwO4j80Q8Lo54WPwHGrwboZNEnBGbfOG1tK7fTyOQE0QQQPU88z/IaqXRePLb5SF CagE2Rg8tX731OJeVU6BLLt8BB/l5YNDAYV3zBf9mD8RC6UDY0GbXJWOOIesUkbjwx1/Dd BR6hI+BAjIUfdf8boXpVDT1Oq5o97cGmpw+sLjHeBpDfq/cAC0c0k3lYMsj8gVlJuj0tlo 9HNn1hqZdWbOFpSZtRkpu6+IDXL0enASc18yiTn7O9Yy8ZoM5TFDEXEY4dC/VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682789583; 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=b9voFB3GissmiSd2GymlKqR5j48Dv8n9tiqWgaxYu/0=; b=NQ5PAIRuCJtMjkhB/zmSCAAOt5evaemcpZmouMzV8bGhkQMi7kyGAtWCMlM2P8XmiLUAGi xuwybb0Mngl6gkA1aqABRBKqC/Ggn20vD7f9nOp3/5EwXtCRrHuQpTElq7CTj8bnzplobf my+Fe5cXg0mZq8MVwWqIQ/j5ollcf1TEpGdXb2yy5AQuAB34uUSSymooghitpPxRwwAUFA QRAVHBWj9EK5cFaQhLLKJrBiwMz3Ym4BKecg47+iRa0DrNA0PgeNCOGXz73nbbaCILMK6t EPyIQBfYjG33bpvXx3CChjuyPbw4ycQeh3fkk3EMPkFtje3MUUwL2oKC8x3N/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682789583; a=rsa-sha256; cv=none; b=I5/c//C1fITBv8CnxUxR5iXRNk8Zf9bh0zCy8bm0sA8yNeap27+pHl222DExmDPZZQbKuq 7OFrPYHjs+H9Kqk/HFlaoTj9X+dD+7cVmXNxTrogoijn1CsaYUK06N6pfWA9MSnZebeTmT 39TzgfHEx2wIQ4PhinI1RPNAU0AAblsfJHqUFOBRRJL1xXcFbN98kjHPv237FwsUq55G38 qyoHYFCwf/w398WSN11V4VeyLg0cK2F5iaWtdhc2oNOleRPbU48aXA4KVSc+HtO//NWlZs qyj/KAcIXfvDqF5yioGfxKL1R8TZ1xI1pL8IPcnrLClFJrgI2o/zxxHfm5VEow== 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 4Q7xQ66GKGzqZS; Sat, 29 Apr 2023 17:33:02 +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 33THX2F1052157; Sat, 29 Apr 2023 17:33:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33THX2ib052156; Sat, 29 Apr 2023 17:33:02 GMT (envelope-from git) Date: Sat, 29 Apr 2023 17:33:02 GMT Message-Id: <202304291733.33THX2ib052156@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: 0a28a51398d1 - main - devel/leatherman: Unbreak on HEAD 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: 0a28a51398d1be4dd07249535c030cc0a60ab719 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a28a51398d1be4dd07249535c030cc0a60ab719 commit 0a28a51398d1be4dd07249535c030cc0a60ab719 Author: Muhammad Moinur Rahman AuthorDate: 2023-04-29 16:54:10 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-04-29 17:32:35 +0000 devel/leatherman: Unbreak on HEAD - Pet portclippy while I am here Approved by: portmgr (blanket) --- devel/leatherman/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/devel/leatherman/Makefile b/devel/leatherman/Makefile index 9a7b70559f38..ff5b8d2222e4 100644 --- a/devel/leatherman/Makefile +++ b/devel/leatherman/Makefile @@ -15,16 +15,22 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ USES= compiler:c++11-lang cmake gettext ruby USE_GITHUB= yes GH_ACCOUNT= puppetlabs +USE_LDCONFIG= yes CMAKE_ON= LEATHERMAN_SHARED CMAKE_OFF= ENABLE_CXX_WERROR -USE_LDCONFIG= yes + TEST_TARGET= test +PLIST_SUB= PORTVERSION=${PORTVERSION} + +.include + post-configure: # This file is vendored in vendor/Catch-1.10.0.zip and extracted at configure step ${SED} -i '' -e '1s|\(.*\)|#include \n\1|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079 + ${REINPLACE_CMD} -e 's|ptrdiff_t|size_t|' ${CONFIGURE_WRKSRC}/src/Catch-1.10.0/single_include/catch.hpp +.endif -PLIST_SUB= PORTVERSION=${PORTVERSION} - -.include +.include