CVS commit: pkgsrc/finance/ledger32

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Apr 21 16:59:09 UTC 2024

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

Log Message:
ledger32: fix build with newer boost; cleanup


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/finance/ledger32/Makefile \
    pkgsrc/finance/ledger32/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/finance/ledger32/patches/patch-src_system.hh.in \
    pkgsrc/finance/ledger32/patches/patch-src_utils.cc

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

Modified files:

Index: pkgsrc/finance/ledger32/Makefile
diff -u pkgsrc/finance/ledger32/Makefile:1.1 pkgsrc/finance/ledger32/Makefile:1.2
--- pkgsrc/finance/ledger32/Makefile:1.1        Sun Mar  3 16:12:50 2024
+++ pkgsrc/finance/ledger32/Makefile    Sun Apr 21 16:59:09 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/21 16:59:09 adam Exp $
 
 DISTNAME=      ledger-3.2.1
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:C/^ledger-/ledger32-/}
 CATEGORIES=    finance
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ledger/}
@@ -14,28 +15,28 @@ LICENSE=    modified-bsd
 
 CONFLICTS+=    ledger>=0
 
-USE_CMAKE=     yes
-USE_LANGUAGES= c++ c
+USE_CXX_FEATURES=      c++11
 
-USE_CXX_FEATURES+=     c++11
+USE_LANGUAGES= c c++
+TEST_TARGET=   check
 
 .include "options.mk"
 
-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
-
-TEST_TARGET=   check
-TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}
+REPLACE_PYTHON+=       acprep
+REPLACE_PYTHON+=       contrib/getquote-uk.py
+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/ledger32/distinfo
diff -u pkgsrc/finance/ledger32/distinfo:1.1 pkgsrc/finance/ledger32/distinfo:1.2
--- pkgsrc/finance/ledger32/distinfo:1.1        Sun Mar  3 16:12:50 2024
+++ pkgsrc/finance/ledger32/distinfo    Sun Apr 21 16:59:09 2024
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2024/04/21 16:59:09 adam Exp $
 
 BLAKE2s (ledger-3.2.1.tar.gz) = c07ef3f13ef6fa24c3a0d4e1ef91e02c39673f143aa910810d64f00751ab76ff
 SHA512 (ledger-3.2.1.tar.gz) = 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
 Size (ledger-3.2.1.tar.gz) = 790959 bytes
 SHA1 (patch-src_CMakeLists.txt) = 8d6a16523554c98c8559702db681af6fb4f413aa
 SHA1 (patch-src_main.cc) = d887e39e2a68fe594c93819e95eed9a4f469844d
+SHA1 (patch-src_system.hh.in) = d96c4bf691868e790110c73473e4a9f81e48d617
+SHA1 (patch-src_utils.cc) = fa3fac1f240f3bf4c7141f5db88350252bbdc000

Added files:

Index: pkgsrc/finance/ledger32/patches/patch-src_system.hh.in
diff -u /dev/null pkgsrc/finance/ledger32/patches/patch-src_system.hh.in:1.1
--- /dev/null   Sun Apr 21 16:59:09 2024
+++ pkgsrc/finance/ledger32/patches/patch-src_system.hh.in      Sun Apr 21 16:59:09 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_system.hh.in,v 1.1 2024/04/21 16:59:09 adam Exp $
+
+Fix build with newer boost.
+
+--- src/system.hh.in.orig      2020-05-18 05:30:10.000000000 +0000
++++ src/system.hh.in
+@@ -142,7 +142,7 @@
+ #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/directory.hpp>
+ #include <boost/filesystem/exception.hpp>
+ #include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
Index: pkgsrc/finance/ledger32/patches/patch-src_utils.cc
diff -u /dev/null pkgsrc/finance/ledger32/patches/patch-src_utils.cc:1.1
--- /dev/null   Sun Apr 21 16:59:09 2024
+++ pkgsrc/finance/ledger32/patches/patch-src_utils.cc  Sun Apr 21 16:59:09 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_utils.cc,v 1.1 2024/04/21 16:59:09 adam Exp $
+
+Fix build with newer boost.
+
+--- src/utils.cc.orig  2024-04-21 16:37:21.648652970 +0000
++++ src/utils.cc
+@@ -849,7 +849,7 @@ path resolve_path(const path& pathname)
+   path temp = pathname;
+   if (temp.string()[0] == '~')
+     temp = expand_path(temp);
+-  temp.normalize();
++  temp.lexically_normal();
+   return temp;
+ }
+