Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171346213779200"
MIME-Version: 1.0
Date: Thu, 18 Apr 2024 17:42:17 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/finance/ledger
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20240418174217.89612FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171346213779200
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Thu Apr 18 17:42:17 UTC 2024

Modified Files:
	pkgsrc/finance/ledger: Makefile distinfo
Added Files:
	pkgsrc/finance/ledger/patches: patch-src_system.hh.in

Log Message:
ledger: fix build with newer boost; cleanup; bump revision


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/finance/ledger/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/finance/ledger/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/finance/ledger/patches/patch-src_system.hh.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171346213779200
Content-Disposition: inline
Content-Length: 3575
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/finance/ledger/Makefile
diff -u pkgsrc/finance/ledger/Makefile:1.31 pkgsrc/finance/ledger/Makefile:1.32
--- pkgsrc/finance/ledger/Makefile:1.31	Sun Mar  3 16:12:50 2024
+++ pkgsrc/finance/ledger/Makefile	Thu Apr 18 17:42:17 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2024/03/03 16:12:50 riastradh Exp $
+# $NetBSD: Makefile,v 1.32 2024/04/18 17:42:17 adam Exp $
 
 DISTNAME=	ledger-3.3.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ledger/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -13,28 +13,28 @@ LICENSE=	modified-bsd
 
 CONFLICTS+=	ledger32>=0
 
-USE_CMAKE=	yes
-USE_LANGUAGES=	c++ c
-
 USE_CXX_FEATURES+=	c++11
 
-.include "options.mk"
+USE_LANGUAGES=	c c++
+TEST_TARGET=	check
 
-REPLACE_INTERPRETER+=	python
-REPLACE.python.old=	/usr/bin/env python
-REPLACE.python.new=	${PYTHONBIN}
-REPLACE_FILES.python+=	contrib/getquote-uk.py acprep python/demo.py
-REPLACE_FILES.python+=	test/DocTests.py test/LedgerHarness.py
-REPLACE_FILES.python+=	test/convert.py test/RegressTests.py test/convert.py
-REPLACE_FILES.python+=	tools/genuuid
+.include "options.mk"
 
-TEST_TARGET=	check
-TEST_ENV+=	LD_LIBRARY_PATH=${WRKSRC}
+REPLACE_PYTHON+=	contrib/getquote-uk.py
+REPLACE_PYTHON+=	acprep
+REPLACE_PYTHON+=	python/demo.py
+REPLACE_PYTHON+=	test/DocTests.py
+REPLACE_PYTHON+=	test/LedgerHarness.py
+REPLACE_PYTHON+=	test/RegressTests.py
+REPLACE_PYTHON+=	test/convert.py
+REPLACE_PYTHON+=	tools/genuuid
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../textproc/utf8-cpp/buildlink3.mk"

Index: pkgsrc/finance/ledger/distinfo
diff -u pkgsrc/finance/ledger/distinfo:1.11 pkgsrc/finance/ledger/distinfo:1.12
--- pkgsrc/finance/ledger/distinfo:1.11	Thu Apr 27 13:16:35 2023
+++ pkgsrc/finance/ledger/distinfo	Thu Apr 18 17:42:17 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2023/04/27 13:16:35 yhardy Exp $
+$NetBSD: distinfo,v 1.12 2024/04/18 17:42:17 adam Exp $
 
 BLAKE2s (ledger-3.3.2.tar.gz) = 9204b163d03fe6d2d286614a47d65317d33c8d1bca885d7f3c9447f334b57d7c
 SHA512 (ledger-3.3.2.tar.gz) = d5d7058f0e9a02ad1d46e6780675d446070824b321f0f4c1ea6ac0c3dd4f11f259113bc36cbc796e4bb6d0a7898d6a68a25cce639e27a2b2434eec11a612ecb0
 Size (ledger-3.3.2.tar.gz) = 825274 bytes
 SHA1 (patch-src_CMakeLists.txt) = 8d6a16523554c98c8559702db681af6fb4f413aa
 SHA1 (patch-src_main.cc) = 7e21f5d903e3148c184f7473d003eb2dc27581c5
+SHA1 (patch-src_system.hh.in) = 2993ef00740cbaa0ba60792e421a33642b8bba6e

Added files:

Index: pkgsrc/finance/ledger/patches/patch-src_system.hh.in
diff -u /dev/null pkgsrc/finance/ledger/patches/patch-src_system.hh.in:1.3
--- /dev/null	Thu Apr 18 17:42:17 2024
+++ pkgsrc/finance/ledger/patches/patch-src_system.hh.in	Thu Apr 18 17:42:17 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_system.hh.in,v 1.3 2024/04/18 17:42:17 adam Exp $
+
+Fix build with newer boost.
+
+--- src/system.hh.in.orig	2024-04-18 17:33:59.959388333 +0000
++++ src/system.hh.in
+@@ -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>


--_----------=_171346213779200--