Mon Mar 23 16:49:07 2020 UTC ()
Remove C.UTF-8 avoidance patch.

Works better if we just teach the OS about C.UTF-8.


(riastradh)
diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/Makefile
diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/distinfo
diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/patches/patch-tests_runtests
cvs diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/Makefile (expand / switch to unified diff)

--- pkgsrc/finance/ledger2beancount/Makefile 2020/03/23 02:29:49 1.1
+++ pkgsrc/finance/ledger2beancount/Makefile 2020/03/23 16:49:07 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2020/03/23 02:29:49 riastradh Exp $ 1# $NetBSD: Makefile,v 1.2 2020/03/23 16:49:07 riastradh Exp $
2 2
3DISTNAME= ledger2beancount-2.0 3DISTNAME= ledger2beancount-2.0
 4PKGREVISION= 1
4CATEGORIES= finance 5CATEGORIES= finance
5MASTER_SITES= ${MASTER_SITE_GITHUB:=zacchiro/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=zacchiro/}
6GITHUB_PROJECT= ledger2beancount 7GITHUB_PROJECT= ledger2beancount
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/zacchiro/ledger2beancount/ 10HOMEPAGE= https://github.com/zacchiro/ledger2beancount/
10COMMENT= Script to convert ledger to beancount 11COMMENT= Script to convert ledger to beancount
11LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14USE_TOOLS+= perl:run 15USE_TOOLS+= perl:run
15 16
16TOOL_DEPENDS+= scdoc>=0:../../textproc/scdoc 17TOOL_DEPENDS+= scdoc>=0:../../textproc/scdoc
cvs diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/distinfo (expand / switch to unified diff)

--- pkgsrc/finance/ledger2beancount/distinfo 2020/03/23 02:29:49 1.1
+++ pkgsrc/finance/ledger2beancount/distinfo 2020/03/23 16:49:07 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2020/03/23 02:29:49 riastradh Exp $ 1$NetBSD: distinfo,v 1.2 2020/03/23 16:49:07 riastradh Exp $
2 2
3SHA1 (ledger2beancount-2.0.tar.gz) = f323279e3e1e467b9f40ebc3d26b31d11799b4c0 3SHA1 (ledger2beancount-2.0.tar.gz) = f323279e3e1e467b9f40ebc3d26b31d11799b4c0
4RMD160 (ledger2beancount-2.0.tar.gz) = f81bba80803c3b7235aff03ae6c7c05b6397d96e 4RMD160 (ledger2beancount-2.0.tar.gz) = f81bba80803c3b7235aff03ae6c7c05b6397d96e
5SHA512 (ledger2beancount-2.0.tar.gz) = a5a741b8af1bb26d0c01673c70e0aee49926d3acfe36b5f160e01d0038f459902beaed89c69bd6179ade09798a0c6103c960796d8bf9a23897791bdefc51e360 5SHA512 (ledger2beancount-2.0.tar.gz) = a5a741b8af1bb26d0c01673c70e0aee49926d3acfe36b5f160e01d0038f459902beaed89c69bd6179ade09798a0c6103c960796d8bf9a23897791bdefc51e360
6Size (ledger2beancount-2.0.tar.gz) = 67729 bytes 6Size (ledger2beancount-2.0.tar.gz) = 67729 bytes
7SHA1 (patch-tests_runtests) = d856c35d7bef8193618c09c6fb8b6e91b52abb0b 7SHA1 (patch-tests_runtests) = e59cf7ccec99a48c26abf337c508a99747a737bd
cvs diff -r1.1 -r1.2 pkgsrc/finance/ledger2beancount/patches/Attic/patch-tests_runtests (expand / switch to unified diff)

--- pkgsrc/finance/ledger2beancount/patches/Attic/patch-tests_runtests 2020/03/23 02:29:49 1.1
+++ pkgsrc/finance/ledger2beancount/patches/Attic/patch-tests_runtests 2020/03/23 16:49:07 1.2
@@ -1,30 +1,20 @@ @@ -1,30 +1,20 @@
1$NetBSD: patch-tests_runtests,v 1.1 2020/03/23 02:29:49 riastradh Exp $ 1$NetBSD: patch-tests_runtests,v 1.2 2020/03/23 16:49:07 riastradh Exp $
2 2
3- Let the environment specify SORT so we can set it from the makefile. 3- Let the environment specify SORT so we can set it from the makefile.
4- Avoid C.UTF-8 locale. 
5 4
6--- tests/runtests.orig 2020-02-22 07:25:00.000000000 +0000 5--- tests/runtests.orig 2020-02-22 07:25:00.000000000 +0000
7+++ tests/runtests 6+++ tests/runtests
8@@ -3,11 +3,13 @@ 7@@ -3,11 +3,13 @@
9 status=0 8 status=0
10  9
11 # We need sort from coreutils for -V 10 # We need sort from coreutils for -V
12+if [ -z "${SORT-}" ]; then 11+if [ -z "${SORT-}" ]; then
13 case `uname -s` in 12 case `uname -s` in
14 Linux*) SORT=sort ;; 13 Linux*) SORT=sort ;;
15 Darwin*) SORT=gsort ;; 14 Darwin*) SORT=gsort ;;
16 *) SORT=sort ;; 15 *) SORT=sort ;;
17 esac 16 esac
18+fi 17+fi
19  18
20 test_conversion () { 19 test_conversion () {
21 test=$1 20 test=$1
22@@ -68,7 +70,7 @@ test_validity_beancount () { 
23 fi 
24 } 
25  
26-export LC_ALL=C.UTF-8 
27+export LC_ALL=en_US.UTF-8 
28  
29 ledger_version=$(ledger --version 2>/dev/null | grep "^Ledger [0-9]" | cut -d " " -f 2 | cut -d . -f 1) 
30 if [ -z $ledger_version ]; then