From nobody Sun Nov 3 19:24:14 2024 X-Original-To: dev-commits-ports-branches@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 4XhPfl0cfGz5cfZH; Sun, 03 Nov 2024 19:24:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XhPfl02TWz4wl1; Sun, 3 Nov 2024 19:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730661855; 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=G1qNsP2ZOBqrmqVZx2pyKpC53DW3wnFx7v28yN7V8po=; b=ZyrFk1MroykKgoFUFkK1Q0tZwlRc6F79YvpRC8HjW+NckLkK8MHTsg9lFGOGIGEcRsKpmw HMJKeXbLX0zrmcgYBuW1gBx716UkUFAeogJPQs+A2/na/Jhlv+badT3UiE5KDb6qapFVss drBBujbNtLkNZy/aETFB4d9aQ1VI2peA++pnhYrsM0qqaviQ+NhbMGA0afvXmtdCM9YpsS xidZgNHXe7235lkD195hpyyY4YDCEjF0lcFBllVlHmNqmj1NeYxI2KPfpE5mfN4/pxcBRn dVVa4udb3ieaeNPgLUe9zQvE77qvQplHc69c5PX0HnIsXrmZfSdwpsyKO/xuhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730661855; 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=G1qNsP2ZOBqrmqVZx2pyKpC53DW3wnFx7v28yN7V8po=; b=H/xkoQBD4bevGoAxs0+SeHzO6oR64FZZNAU+zT3U/aN7In+h1El4iE/PVXTHQK7giCYD3o YAU+zCg3zRMr1/hqqDXYqClNi+Iq7bZVypMFCJgw/4vX1hu9jsFPEvr6ubhA/GpXBIQPec DEpxJPtM94MU5kby+T3RUXsKuBp9zNnLB7sq24mFWTKQ3fTIbwFSFPj1KsvetDkrw77xaz njIJbXRGe9i5asGH5yPCgtznJUMsNmCNpUKM6IVPRJaFoALKH54lr+KrXhmKdcL4yLK911 4QHtTmeob3lvZTgBy8LSqiyVGhOCwp7cAEFj19L7xXFoj9Fzr8MvxW/3jdbaHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730661855; a=rsa-sha256; cv=none; b=w8sXtc9naQxzChaYCY2uaeradVG8UVWeb8WjN7CV3H1HeyrN1s4DUNK9hlgX+hVdtbMu2e btlOxlh+DU9ArAFFWPza1V2FO8rNEVSG8mddrBGOcvE9hBYLFplk0jFW5q1A8QuJpK4uXh KJEazGiCJV36fSd1UnJrBFINh9fAXkUV5PwvnU7tY/3nn0czjJfdrplaDA8GNVAxwkyjkq i+nHSOHOYRHaZOWF6ySn0aUSU8ujAbT5vWsESw+KNDuV9IiGpk7vEemsfidWw5QV7Qf3iV uOMDnffj3o4wAvqUJccyjBXWEqTv8iX4xkUlwaBNbmhOqmTQ5TzzJILQf+P26w== 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 4XhPfk6lQCz11yN; Sun, 3 Nov 2024 19:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A3JOEgo089265; Sun, 3 Nov 2024 19:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A3JOEXX089262; Sun, 3 Nov 2024 19:24:14 GMT (envelope-from git) Date: Sun, 3 Nov 2024 19:24:14 GMT Message-Id: <202411031924.4A3JOEXX089262@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Zsolt Udvari Subject: git: 4b9c10b813c1 - 2024Q4 - finance/ledger: Fix build with boost 1.85.0 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 4b9c10b813c16813a005e462791b6cf5fb6b2935 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b9c10b813c16813a005e462791b6cf5fb6b2935 commit 4b9c10b813c16813a005e462791b6cf5fb6b2935 Author: Chad Jacob Milios AuthorDate: 2024-11-03 19:13:12 +0000 Commit: Zsolt Udvari CommitDate: 2024-11-03 19:23:22 +0000 finance/ledger: Fix build with boost 1.85.0 While I'm here pet portfmt. PR: 281912 Approved by: portmgr (blanket) MFH: 2024Q4 (cherry picked from commit bf25239a296dbd6077b90211d7605b45a3b534b8) --- finance/ledger/Makefile | 15 ++++++++------- finance/ledger/files/patch-system.hh.in | 12 ++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile index 847102f92dfe..999091db2bb7 100644 --- a/finance/ledger/Makefile +++ b/finance/ledger/Makefile @@ -1,6 +1,7 @@ PORTNAME= ledger -PORTVERSION= 3.3.2 DISTVERSIONPREFIX= v +DISTVERSION= 3.3.2 +PORTREVISION= 1 CATEGORIES= finance MAINTAINER= woodycarey@hotmail.com @@ -11,9 +12,9 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= utf8cpp>=0:devel/utf8cpp -LIB_DEPENDS= libgmp.so:math/gmp \ - libmpfr.so:math/mpfr \ - libboost_system.so:devel/boost-libs +LIB_DEPENDS= libboost_system.so:devel/boost-libs \ + libgmp.so:math/gmp \ + libmpfr.so:math/mpfr USES= cmake compiler:c++11-lib cpe libedit CPE_VENDOR= ${PORTNAME}-cli @@ -23,14 +24,14 @@ USE_LDCONFIG= yes OPTIONS_DEFINE= GNUPG PYTHON OPTIONS_SUB= yes -GNUPG_LIB_DEPENDS= libgpgmepp.so:security/gpgme-cpp \ - libgpgme.so:security/gpgme +GNUPG_LIB_DEPENDS= libgpgme.so:security/gpgme \ + libgpgmepp.so:security/gpgme-cpp GNUPG_CMAKE_BOOL= USE_GPGME PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boost-libs>0:devel/boost-python-libs@${PY_FLAVOR} PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boost-libs>0:devel/boost-python-libs@${PY_FLAVOR} -PYTHON_CMAKE_BOOL= USE_PYTHON PYTHON_USES= python +PYTHON_CMAKE_BOOL= USE_PYTHON do-test: @cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS} diff --git a/finance/ledger/files/patch-system.hh.in b/finance/ledger/files/patch-system.hh.in index 00d27252f9e6..99680c9f96dc 100644 --- a/finance/ledger/files/patch-system.hh.in +++ b/finance/ledger/files/patch-system.hh.in @@ -1,7 +1,15 @@ diff -ruN ledger-3.2.1/src/system.hh.in ledger-3.2.1-patched/src/system.hh.in --- src/system.hh.in.orig 2020-05-18 00:30:10.000000000 -0500 -+++ src/system.hh.in 2022-05-29 08:49:10.857528000 -0500 -@@ -153,6 +153,7 @@ ++++ src/system.hh.in 2024-10-07 01:57:27.327578000 -0400 +@@ -144,7 +144,6 @@ + #include + #include + +-#include + #include + #include + #include +@@ -156,6 +155,7 @@ #include #include