CVS commit: pkgsrc/finance/ledger

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jun 15 16:54:38 UTC 2020

Modified Files:
        pkgsrc/finance/ledger: Makefile distinfo options.mk
Added Files:
        pkgsrc/finance/ledger/patches: patch-src_CMakeLists.txt

Log Message:
ledger: updated to 3.2.1

changes in 3.2.1:

- Fix regression with expression evaluation by reverting commit
 `Correction to the way parens are parsed in query expressions`

- Fix --invert breakage by reverting commit `Change --invert to invert
 displayed amounts and totals, not amounts`

- Fix performance regression by reverting commit `Compare price
 annotations using their textual rendering`

- Fix library path issue

- Allow specifying the Python version

- Some documentation fixes


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/finance/ledger/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/finance/ledger/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/finance/ledger/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/finance/ledger/patches/patch-src_CMakeLists.txt

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

Modified files:

Index: pkgsrc/finance/ledger/Makefile
diff -u pkgsrc/finance/ledger/Makefile:1.19 pkgsrc/finance/ledger/Makefile:1.20
--- pkgsrc/finance/ledger/Makefile:1.19 Wed May  6 14:04:30 2020
+++ pkgsrc/finance/ledger/Makefile      Mon Jun 15 16:54:38 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2020/05/06 14:04:30 adam Exp $
+# $NetBSD: Makefile,v 1.20 2020/06/15 16:54:38 adam Exp $
 
-DISTNAME=      ledger-3.2.0
-PKGREVISION=   1
+DISTNAME=      ledger-3.2.1
 CATEGORIES=    finance
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ledger/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/finance/ledger/distinfo
diff -u pkgsrc/finance/ledger/distinfo:1.7 pkgsrc/finance/ledger/distinfo:1.8
--- pkgsrc/finance/ledger/distinfo:1.7  Fri May  1 11:48:26 2020
+++ pkgsrc/finance/ledger/distinfo      Mon Jun 15 16:54:38 2020
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2020/05/01 11:48:26 riastradh Exp $
+$NetBSD: distinfo,v 1.8 2020/06/15 16:54:38 adam Exp $
 
-SHA1 (ledger-3.2.0.tar.gz) = 38deb9f70cfd62c926299e5427e11a15d53113fe
-RMD160 (ledger-3.2.0.tar.gz) = 7e6f954dce9d190a022e148e038476755fb7e6ff
-SHA512 (ledger-3.2.0.tar.gz) = 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea
-Size (ledger-3.2.0.tar.gz) = 790404 bytes
+SHA1 (ledger-3.2.1.tar.gz) = 75dced00c8f24555e7c3f6314b001b169e54c152
+RMD160 (ledger-3.2.1.tar.gz) = 6286315fcad52f51c59f9b41261713aa141e9fae
+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/ledger/options.mk
diff -u pkgsrc/finance/ledger/options.mk:1.3 pkgsrc/finance/ledger/options.mk:1.4
--- pkgsrc/finance/ledger/options.mk:1.3        Fri May  1 11:48:26 2020
+++ pkgsrc/finance/ledger/options.mk    Mon Jun 15 16:54:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2020/05/01 11:48:26 riastradh Exp $
+# $NetBSD: options.mk,v 1.4 2020/06/15 16:54:38 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ledger
 PKG_SUPPORTED_OPTIONS+=        python
@@ -13,4 +13,18 @@ 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

Added files:

Index: pkgsrc/finance/ledger/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/finance/ledger/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Mon Jun 15 16:54:38 2020
+++ pkgsrc/finance/ledger/patches/patch-src_CMakeLists.txt      Mon Jun 15 16:54:38 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2020/06/15 16:54:38 adam 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})
+