pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update Ledger to 3.1.1



Module Name:	pkgsrc-wip
Committed By:	atomicules <base%atomicules.co.uk@localhost>
Pushed By:	atomicules
Date:		Sat Mar 12 12:27:07 2016 +0000
Changeset:	26b7e57b483574f67845f4a855c3574b566b90aa

Modified Files:
	ledger/Makefile
	ledger/PLIST
	ledger/TODO
	ledger/distinfo
Removed Files:
	ledger/patches/patch-src_account.h
	ledger/patches/patch-src_filters.cc
	ledger/patches/patch-src_item.h
	ledger/patches/patch-src_iterators.cc
	ledger/patches/patch-src_parser.h
	ledger/patches/patch-src_post.h
	ledger/patches/patch-src_times.h

Log Message:
Update Ledger to 3.1.1

- Patches are no longer required as they were just pulling in upstream
  changes which we now have in version 3.1.1
- The TODO list can be drastically cut down thanks to the changes in
  commit 9244cb1d6e98c59fe0c76bb42dbcff386a483152 from coypu; the
  Makefile is not hacky anymore
- Further clean up of the makefile. Don't need the post-extract of
  UTF-CPP now we have 3.1.1, as previously mentioned in the Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=26b7e57b483574f67845f4a855c3574b566b90aa

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

diffstat:
 ledger/Makefile                       |  9 ++------
 ledger/PLIST                          |  2 --
 ledger/TODO                           | 40 +----------------------------------
 ledger/distinfo                       | 15 ++++---------
 ledger/patches/patch-src_account.h    | 18 ----------------
 ledger/patches/patch-src_filters.cc   | 14 ------------
 ledger/patches/patch-src_item.h       | 18 ----------------
 ledger/patches/patch-src_iterators.cc | 14 ------------
 ledger/patches/patch-src_parser.h     | 14 ------------
 ledger/patches/patch-src_post.h       | 18 ----------------
 ledger/patches/patch-src_times.h      | 18 ----------------
 11 files changed, 7 insertions(+), 173 deletions(-)

diffs:
diff --git a/ledger/Makefile b/ledger/Makefile
index 55db10a..dfadf61 100644
--- a/ledger/Makefile
+++ b/ledger/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	ledger
-VERSION=	3.1
+VERSION=	3.1.1
 DISTNAME=	ledger-${VERSION}
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ledger/}
@@ -14,10 +14,8 @@ LICENSE=	modified-bsd
 
 # url2pkg-marker (please do not remove this line.)
 
-
 USE_CMAKE=	YES
 USE_LANGUAGES=	c++ c
-USE_TOOLS+=	curl unzip
 
 REPLACE_INTERPRETER+=	python
 REPLACE.python.old=	/usr/bin/env python
@@ -31,14 +29,11 @@ REPLACE_FILES.python+=	tools/genuuid
 # - python
 # - devel/editline?
 
-#Version 3.1 requires a separate download of UTFCPP, automate this
-#With version 3.1.1 this should get bundled with the Ledger release and this target can be removed.
-post-extract:
-	cd ${WRKSRC} && curl -L -O https://github.com/ledger/ledger/releases/download/v3.1/ledger-utfcpp.zip && unzip ledger-utfcpp.zip
 
 #These are the minimum libraries required for Ledger
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ledger/PLIST b/ledger/PLIST
index 2d944f2..335b150 100644
--- a/ledger/PLIST
+++ b/ledger/PLIST
@@ -1,10 +1,8 @@
 @comment $NetBSD$
-@comment Obtained from install_manifest.txt
 bin/ledger
 include/ledger/account.h
 include/ledger/amount.h
 include/ledger/annotate.h
-include/ledger/archive.h
 include/ledger/balance.h
 include/ledger/chain.h
 include/ledger/commodity.h
diff --git a/ledger/TODO b/ledger/TODO
index 0318954..dc5f611 100644
--- a/ledger/TODO
+++ b/ledger/TODO
@@ -1,43 +1,5 @@
 #Notes on the Makefile for pkgsrc/wip/ledger
 
-##Making the Makefile less hacky
-
-Currently the makefile uses quite a hacky approach to get something that works. Ledger comes with its own python based acprep tool for configuration and building which is mostly a wrapper around cmake, but it is actually really good and works, where as using plain cmake and make should work, but doesn't (for me). So in order to use acprep I had to disable the build and configure stages in the Pkgsrc Makefile and instead do them in a post-patch target.
-
-I did try some less hacky approaches, but I couldn't get them to work.
-
-###1 Using CONFIGURE_SCRIPT
-
-This seems like it should be the none-hacky way of doing what I want to do (run the acprep script). This is what I tried:
-
-	HAS_CONFIGURE= yes
-	CONFIGURE_ENV= python 
-	CONFIGURE_SCRIPT= ./acprep configure
-	CONFIGURE_ARGS=  --prefix ${PREFIX} -- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON"
-	MAKE_PROGRAM= ./acprep
-	BUILD_MAKE_FLAGS= make
-	BUILD_MAKE_FILE=
-
-along with various permutations of splitting the overall commands between [CONFIGURE_ENV, CONFIGURE_SCRIPT, etc][1].
-
-###2 Using CMAKE
-
-In theory Ledger supports direct configuration and building with CMake, but something Pkgsrc does with CMake makes it not work. It will appear to configure fine and will build, but won't link. I have tried so many different variations of CMake settings, but for whatever reason I cannot get it to link unless I use acprep. None of this works:
-	
-	USE_CMAKE= yes
-	CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON -DCMAKE_SHARED_LINKER_FLAGS="-R${PREFIX}/lib -L${PREFIX}/lib" -DCMAKE_MODULE_LINKER_FLAGS="-R${PREFIX}/lib -L${PREFIX}/lib" -DCMAKE_EXE_LINKER_FLAGS="-R${PREFIX}/lib -L${PREFIX}/lib" -DCMAKE_CXX_COMPILER=g++ 
-
-or
-
-	USE_CMAKE= yes
-	CMAKE_ARGS+= -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} -DCMAKE_PREFIX_PATH:PATH=${PREFIX} -DCMAKE_LIBRARY_PATH:PATH=${PREFIX}/lib -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON
-	LDFLAGS+= -L${PREFIX}/lib
-
-...etc
-
-##Other things that need doing
+##Things that still need doing
 
 - Adding options (as in show-options) for all the optional dependencies
-- Figuring out how to specify all the dependencies for building (such as python and cmake), but that aren't linked in
-
-[1]: https://www.netbsd.org/docs/pkgsrc/build.html#build.configure
diff --git a/ledger/distinfo b/ledger/distinfo
index 6a49a2b..6ef3b8e 100644
--- a/ledger/distinfo
+++ b/ledger/distinfo
@@ -1,13 +1,6 @@
 $NetBSD: distinfo,v 1.2 2013/10/05 14:32:12 slitvinov Exp $
 
-SHA1 (ledger-3.1.tar.gz) = 549aa375d4802e9dd4fd153c45ab64d8ede94afc
-RMD160 (ledger-3.1.tar.gz) = 6e9b1afaeb29e75ad8fe251ac19ad4618c4ec5c1
-SHA512 (ledger-3.1.tar.gz) = caa84330eee05d3e88820e8afd4a906d22f6aaa9de4abc2f6813636754e052e6ec4d1b3d2fce68215aededc72651405c62aaf16a2c1b69d34e1b10ffece48519
-Size (ledger-3.1.tar.gz) = 817624 bytes
-SHA1 (patch-src_account.h) = eb560d3c3390eab0c4bb2a312d5ed4b9436de453
-SHA1 (patch-src_filters.cc) = e5f8a20519f689eb9a98ed8bfa89f74a3beb8237
-SHA1 (patch-src_item.h) = 738538ac35603879d40d5094ebcc21efca865172
-SHA1 (patch-src_iterators.cc) = 23617982df804a5817d9a66bff8f46d08aa777d4
-SHA1 (patch-src_parser.h) = 00df805cdffb313fe25d65bc55cfb4e4c271c471
-SHA1 (patch-src_post.h) = 1f625c90e8673c87081cf23aaa0260ec1a1dc166
-SHA1 (patch-src_times.h) = 9f9aeaaf6e45ee83420f7efac9763886eee960de
+SHA1 (ledger-3.1.1.tar.gz) = 77ad24ce4947e2f130e58d8e8bc4c5b6920a0222
+RMD160 (ledger-3.1.1.tar.gz) = 07645c8d798e386eb4ed0a5a9e3dcf6fe0a184f8
+SHA512 (ledger-3.1.1.tar.gz) = 3f81b98a414cdfc0e272de4e958770149fb1acc8bda880d270e1459ce35294a220c52820bb9af49a751ac3a80b878f81fc7799ba41e0a1be43eba72081351bf5
+Size (ledger-3.1.1.tar.gz) = 842364 bytes
diff --git a/ledger/patches/patch-src_account.h b/ledger/patches/patch-src_account.h
deleted file mode 100644
index 03e23e0..0000000
--- a/ledger/patches/patch-src_account.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: bcaca24de4264f89a94069701361988007e22e58) to allow compilation with recent Boost versions
---- src/account.h.orig	2014-10-05 23:02:43.000000000 +0000
-+++ src/account.h
-@@ -261,11 +261,7 @@ public:
-   mutable optional<xdata_t> xdata_;
- 
-   bool has_xdata() const {
--#if BOOST_VERSION >= 105600
--    return xdata_ != NULL;
--#else
--    return xdata_;
--#endif
-+    return static_cast<bool>(xdata_);
-   }
-   void clear_xdata();
-   xdata_t& xdata() {
diff --git a/ledger/patches/patch-src_filters.cc b/ledger/patches/patch-src_filters.cc
deleted file mode 100644
index e70af7a..0000000
--- a/ledger/patches/patch-src_filters.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: a1cb25ad2d9a98ea9ec0bb3ee27fe3cde6046434) to allow compilation with recent Boost versions
---- src/filters.cc.orig	2015-10-26 20:11:54.000000000 +0000
-+++ src/filters.cc
-@@ -707,7 +707,7 @@ namespace {
-     insert_prices_in_map(price_map_t& _all_prices)
-       : all_prices(_all_prices) {}
- 
--    void operator()(datetime_t& date, const amount_t& price) {
-+    void operator()(const datetime_t& date, const amount_t& price) {
-       all_prices.insert(price_map_t::value_type(date, price));
-     }
-   };
diff --git a/ledger/patches/patch-src_item.h b/ledger/patches/patch-src_item.h
deleted file mode 100644
index 1a8b2d7..0000000
--- a/ledger/patches/patch-src_item.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: bcaca24de4264f89a94069701361988007e22e58) to allow compilation with recent Boost versions
---- src/item.h.orig	2014-10-05 23:02:43.000000000 +0000
-+++ src/item.h
-@@ -191,11 +191,7 @@ public:
-   static bool use_aux_date;
- 
-   virtual bool has_date() const {
--#if BOOST_VERSION >= 105600
--    return _date != NULL;
--#else
--    return _date;
--#endif
-+    return static_cast<bool>(_date);
-   }
- 
-   virtual date_t date() const {
diff --git a/ledger/patches/patch-src_iterators.cc b/ledger/patches/patch-src_iterators.cc
deleted file mode 100644
index 67388db..0000000
--- a/ledger/patches/patch-src_iterators.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: a1cb25ad2d9a98ea9ec0bb3ee27fe3cde6046434) to allow compilation with recent Boost versions
---- src/iterators.cc.orig	2015-10-26 20:11:32.000000000 +0000
-+++ src/iterators.cc
-@@ -96,7 +96,7 @@ namespace {
-       TRACE_DTOR(create_price_xact);
-     }
- 
--    void operator()(datetime_t& date, const amount_t& price) {
-+    void operator()(const datetime_t& date, const amount_t& price) {
-       xact_t * xact;
-       string   symbol = price.commodity().symbol();
- 
diff --git a/ledger/patches/patch-src_parser.h b/ledger/patches/patch-src_parser.h
deleted file mode 100644
index 61e7b8e..0000000
--- a/ledger/patches/patch-src_parser.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: bcaca24de4264f89a94069701361988007e22e58) to allow compilation with recent Boost versions
---- src/parser.h.orig	2014-10-05 23:02:43.000000000 +0000
-+++ src/parser.h
-@@ -118,7 +118,7 @@ public:
- 
-   ptr_op_t parse(std::istream&           in,
-                  const parse_flags_t&    flags           = PARSE_DEFAULT,
--                 const optional<string>& original_string = NULL);
-+                 const optional<string>& original_string = boost::none);
- };
- 
- } // namespace ledger
diff --git a/ledger/patches/patch-src_post.h b/ledger/patches/patch-src_post.h
deleted file mode 100644
index 80152e2..0000000
--- a/ledger/patches/patch-src_post.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: bcaca24de4264f89a94069701361988007e22e58) to allow compilation with recent Boost versions
---- src/post.h.orig	2014-10-05 23:02:43.000000000 +0000
-+++ src/post.h
-@@ -205,11 +205,7 @@ public:
-   mutable optional<xdata_t> xdata_;
- 
-   bool has_xdata() const {
--#if BOOST_VERSION >= 105600
--    return xdata_ != NULL;
--#else
--    return xdata_;
--#endif
-+    return static_cast<bool>(xdata_);
-   }
-   void clear_xdata() {
-     xdata_ = none;
diff --git a/ledger/patches/patch-src_times.h b/ledger/patches/patch-src_times.h
deleted file mode 100644
index 9518eec..0000000
--- a/ledger/patches/patch-src_times.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Patch pulled from upstream (Commit: bcaca24de4264f89a94069701361988007e22e58) to allow compilation with recent Boost versions
---- src/times.h.orig	2014-10-05 23:02:43.000000000 +0000
-+++ src/times.h
-@@ -568,11 +568,7 @@ public:
-   void   stabilize(const optional<date_t>& date = none);
- 
-   bool   is_valid() const {
--#if BOOST_VERSION >= 105600
--    return start != NULL;
--#else
--    return start;
--#endif
-+    return static_cast<bool>(start);
-   }
- 
-   /** Find the current or next period containing date.  Returns false if


Home | Main Index | Thread Index | Old Index