pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/finance
Module Name: pkgsrc
Committed By: riastradh
Date: Sun Mar 3 16:12:51 UTC 2024
Modified Files:
pkgsrc/finance: Makefile
pkgsrc/finance/ledger: Makefile
Added Files:
pkgsrc/finance/ledger32: DESCR Makefile PLIST distinfo options.mk
pkgsrc/finance/ledger32/patches: patch-src_CMakeLists.txt
patch-src_main.cc
Log Message:
finance/ledger32: restore ledger-3.2.1
This avoids the following regression:
https://github.com/ledger/ledger/issues/2318
Eventually I would like to see this either fixed upstream or worked
around, but keeping an older version is easier for now.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/finance/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/finance/ledger/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/finance/ledger32/DESCR \
pkgsrc/finance/ledger32/Makefile pkgsrc/finance/ledger32/PLIST \
pkgsrc/finance/ledger32/distinfo pkgsrc/finance/ledger32/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/finance/ledger32/patches/patch-src_CMakeLists.txt \
pkgsrc/finance/ledger32/patches/patch-src_main.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/Makefile
diff -u pkgsrc/finance/Makefile:1.90 pkgsrc/finance/Makefile:1.91
--- pkgsrc/finance/Makefile:1.90 Mon Feb 26 19:19:38 2024
+++ pkgsrc/finance/Makefile Sun Mar 3 16:12:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2024/02/26 19:19:38 pin Exp $
+# $NetBSD: Makefile,v 1.91 2024/03/03 16:12:50 riastradh Exp $
#
COMMENT= Monetary, financial and related applications
@@ -24,6 +24,7 @@ SUBDIR+= homebank
SUBDIR+= hs-Decimal
SUBDIR+= ledger
SUBDIR+= ledger2beancount
+SUBDIR+= ledger32
SUBDIR+= libofx
SUBDIR+= magento
SUBDIR+= p5-Algorithm-LUHN
Index: pkgsrc/finance/ledger/Makefile
diff -u pkgsrc/finance/ledger/Makefile:1.30 pkgsrc/finance/ledger/Makefile:1.31
--- pkgsrc/finance/ledger/Makefile:1.30 Fri Dec 29 18:24:44 2023
+++ pkgsrc/finance/ledger/Makefile Sun Mar 3 16:12:50 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2023/12/29 18:24:44 adam Exp $
+# $NetBSD: Makefile,v 1.31 2024/03/03 16:12:50 riastradh Exp $
DISTNAME= ledger-3.3.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= finance
MASTER_SITES= ${MASTER_SITE_GITHUB:=ledger/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -11,6 +11,8 @@ HOMEPAGE= https://ledger-cli.org/
COMMENT= Double-entry accounting system for command-line
LICENSE= modified-bsd
+CONFLICTS+= ledger32>=0
+
USE_CMAKE= yes
USE_LANGUAGES= c++ c
Added files:
Index: pkgsrc/finance/ledger32/DESCR
diff -u /dev/null pkgsrc/finance/ledger32/DESCR:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/DESCR Sun Mar 3 16:12:50 2024
@@ -0,0 +1,15 @@
+Ledger is a powerful, double-entry accounting system that is accessed
+from the UNIX command-line. This may put off some users, since there is
+no flashy UI, but for those who want unparalleled reporting access to
+their data there are few alternatives.
+
+Ledger uses text files for input. It reads the files and generates
+reports; there is no other database or stored state. To use Ledger, you
+create a file of your account names and transactions, run from the
+command line with some options to specify input and requested reports,
+and get output. The output is generally plain text, though you could
+generate a graph or html instead. Ledger is simple in concept,
+surprisingly rich in ability, and easy to use.
+
+This package provides the 3.2 branch of ledger. For the most recent
+version, see finance/ledger instead.
Index: pkgsrc/finance/ledger32/Makefile
diff -u /dev/null pkgsrc/finance/ledger32/Makefile:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/Makefile Sun Mar 3 16:12:50 2024
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+
+DISTNAME= ledger-3.2.1
+PKGNAME= ${DISTNAME:C/^ledger-/ledger32-/}
+CATEGORIES= finance
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ledger/}
+GITHUB_PROJECT= ledger
+GITHUB_TAG= v${PKGVERSION_NOREV}
+
+MAINTAINER= base%atomicules.co.uk@localhost
+HOMEPAGE= https://ledger-cli.org/
+COMMENT= Double-entry accounting system for command-line
+LICENSE= modified-bsd
+
+CONFLICTS+= ledger>=0
+
+USE_CMAKE= yes
+USE_LANGUAGES= c++ c
+
+USE_CXX_FEATURES+= c++11
+
+.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}
+
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/editline/buildlink3.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../lang/python/tool.mk"
+.include "../../math/mpfr/buildlink3.mk"
+.include "../../textproc/utf8-cpp/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/finance/ledger32/PLIST
diff -u /dev/null pkgsrc/finance/ledger32/PLIST:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/PLIST Sun Mar 3 16:12:50 2024
@@ -0,0 +1,64 @@
+@comment $NetBSD: PLIST,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+bin/ledger
+include/ledger/account.h
+include/ledger/amount.h
+include/ledger/annotate.h
+include/ledger/balance.h
+include/ledger/chain.h
+include/ledger/commodity.h
+include/ledger/compare.h
+include/ledger/context.h
+include/ledger/convert.h
+include/ledger/csv.h
+include/ledger/draft.h
+include/ledger/emacs.h
+include/ledger/error.h
+include/ledger/expr.h
+include/ledger/exprbase.h
+include/ledger/filters.h
+include/ledger/flags.h
+include/ledger/format.h
+include/ledger/generate.h
+include/ledger/global.h
+include/ledger/history.h
+include/ledger/item.h
+include/ledger/iterators.h
+include/ledger/journal.h
+include/ledger/lookup.h
+include/ledger/mask.h
+include/ledger/op.h
+include/ledger/option.h
+include/ledger/output.h
+include/ledger/parser.h
+include/ledger/pool.h
+include/ledger/post.h
+include/ledger/precmd.h
+include/ledger/predicate.h
+include/ledger/print.h
+include/ledger/pstream.h
+include/ledger/ptree.h
+include/ledger/pyfstream.h
+include/ledger/pyinterp.h
+include/ledger/pyutils.h
+include/ledger/query.h
+include/ledger/quotes.h
+include/ledger/report.h
+include/ledger/scope.h
+include/ledger/select.h
+include/ledger/session.h
+include/ledger/stats.h
+include/ledger/stream.h
+include/ledger/system.hh
+include/ledger/temps.h
+include/ledger/timelog.h
+include/ledger/times.h
+include/ledger/token.h
+include/ledger/unistring.h
+include/ledger/utils.h
+include/ledger/value.h
+include/ledger/views.h
+include/ledger/xact.h
+lib/libledger.so
+lib/libledger.so.3
+${PLIST.python}${PYSITELIB}/ledger.so
+man/man1/ledger.1
Index: pkgsrc/finance/ledger32/distinfo
diff -u /dev/null pkgsrc/finance/ledger32/distinfo:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/distinfo Sun Mar 3 16:12:50 2024
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2024/03/03 16:12:50 riastradh 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
Index: pkgsrc/finance/ledger32/options.mk
diff -u /dev/null pkgsrc/finance/ledger32/options.mk:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/options.mk Sun Mar 3 16:12:50 2024
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2024/03/03 16:12:50 riastradh Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.ledger
+PKG_SUPPORTED_OPTIONS+= python
+PKG_SUGGESTED_OPTIONS+= python
+
+PLIST_VARS+= python
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpython)
+CMAKE_ARGS+= -DUSE_PYTHON:BOOL=TRUE
+PLIST.python= yes
+PLIST_SUBST+= PYSITELIB=${PYSITELIB:Q}
+.include "../../devel/py-boost/buildlink3.mk"
+
+. include "../../mk/bsd.prefs.mk"
+. if ${OPSYS} == "Darwin"
+SOEXT=dylib
+. else
+SOEXT=so
+. endif
+
+# Remove when src/CMakeLists.txt (see FIXME there) stops copying
+# uninstalled library as Python module. Make symlink here to
+# avoid problem with install_name on Darwin and save disk-space.
+post-install:
+ cd ${DESTDIR}${PREFIX}/${PYSITELIB} && \
+ ${LN} -s -f ${DESTDIR}${PREFIX}/lib/libledger.${SOEXT} ledger.so
+.endif
Index: pkgsrc/finance/ledger32/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/finance/ledger32/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/patches/patch-src_CMakeLists.txt Sun Mar 3 16:12:51 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2024/03/03 16:12:51 riastradh Exp $
+
+Fix problem with install_name.
+
+--- src/CMakeLists.txt.orig 2020-05-18 05:30:10.000000000 +0000
++++ src/CMakeLists.txt
+@@ -277,8 +277,7 @@ if (BUILD_LIBRARY)
+ add_library(libledger SHARED ${LEDGER_SOURCES})
+ add_ledger_library_dependencies(libledger)
+ set_target_properties(libledger PROPERTIES
+- PREFIX ""
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
++ OUTPUT_NAME "ledger"
+ VERSION ${Ledger_VERSION_MAJOR}
+ SOVERSION ${Ledger_VERSION_MAJOR})
+
Index: pkgsrc/finance/ledger32/patches/patch-src_main.cc
diff -u /dev/null pkgsrc/finance/ledger32/patches/patch-src_main.cc:1.1
--- /dev/null Sun Mar 3 16:12:51 2024
+++ pkgsrc/finance/ledger32/patches/patch-src_main.cc Sun Mar 3 16:12:51 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_main.cc,v 1.1 2024/03/03 16:12:51 riastradh Exp $
+
+Canonicalize pkgsrc readline.h filename. This is seen both by
+consumers of devel/readline and by consumers of devel/editline, via
+buildlink3 magic. The only reason editline/readline.h may exist is to
+allow both devel/readline and devel/editline to coexist.
+
+--- src/main.cc.orig 2019-02-05 13:30:45.000000000 +0000
++++ src/main.cc
+@@ -36,7 +36,7 @@
+ #include "session.h"
+
+ #ifdef HAVE_EDIT
+-#include <editline/readline.h>
++#include <readline/readline.h>
+ #endif
+
+ using namespace ledger;
Home |
Main Index |
Thread Index |
Old Index