Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 3 Nov 2024 19:24:14 GMT
From:      Zsolt Udvari <uzsolt@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 4b9c10b813c1 - 2024Q4 - finance/ledger: Fix build with boost 1.85.0
Message-ID:  <202411031924.4A3JOEXX089262@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q4 has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b9c10b813c16813a005e462791b6cf5fb6b2935

commit 4b9c10b813c16813a005e462791b6cf5fb6b2935
Author:     Chad Jacob Milios <milios@ccsys.com>
AuthorDate: 2024-11-03 19:13:12 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
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 <boost/date_time/posix_time/posix_time_io.hpp>
+ #include <boost/date_time/gregorian/gregorian_io.hpp>
+ 
+-#include <boost/filesystem/convenience.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
+@@ -156,6 +155,7 @@
  #include <boost/function.hpp>
  
  #include <boost/intrusive_ptr.hpp>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411031924.4A3JOEXX089262>