On Thu, Mar 15, 2018 at 12:15:30AM +0000, Stuart Henderson wrote:
> On 2018/03/14 20:08, Gregor Best wrote:
> > Hi Sergey,
> >
> > the patch below my signature adds python support to ledger.
> >
> > WANTLIB gets a bit larger:
> >
> > WANTLIB += boost_python-mt python2.7
>
> ^^ should be ${MODPY_WANTLIB}
> [...]
Whoops, thanks for the hint. A fixed patch is attached.
--
Gregor
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/productivity/ledger/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 16 Nov 2017 23:20:39 -0000 1.22
+++ Makefile 15 Mar 2018 11:54:53 -0000
@@ -5,7 +5,7 @@ COMMENT = command line double-entry acc
GH_TAGNAME = v3.1.1
GH_ACCOUNT = ledger
GH_PROJECT = ledger
-REVISION = 0
+REVISION = 1
SHARED_LIBS += ledger 0.0 # 3.0
@@ -19,8 +19,10 @@ MAINTAINER = Sergey Bronnikov <estetus@
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_iostreams-mt
-WANTLIB += boost_regex-mt boost_system-mt boost_unit_test_framework-mt
-WANTLIB += c gmp m mpfr pthread ${COMPILER_LIBCXX}
+WANTLIB += boost_regex-mt boost_python-mt boost_system-mt
+WANTLIB += boost_unit_test_framework-mt c gmp m mpfr pthread
+WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX}
+
MODULES = devel/cmake \
lang/python
@@ -35,7 +37,7 @@ LIBledger_MAJOR = ${LIBledger_VERSION:R}
LIBledger_MINOR = ${LIBledger_VERSION:E}
SUBST_VARS += LIBledger_MAJOR LIBledger_MINOR
-CONFIGURE_ARGS= -DUTFCPP_PATH=${LOCALBASE}/include/utfcpp
+CONFIGURE_ARGS= -DUTFCPP_PATH=${LOCALBASE}/include/utfcpp
-DUSE_PYTHON=Yes
# Use this to make sure version.info gets generated, the actual
# installation bits are removed as the remaining .info files are
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/productivity/ledger/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 13 Aug 2016 19:22:05 -0000 1.4
+++ pkg/PLIST 15 Mar 2018 12:14:37 -0000
@@ -64,6 +64,7 @@ include/ledger/xact.h
info/ledger-mode.info
info/ledger3.info
@lib lib/libledger.so.${LIBledger_VERSION}
+lib/python${MODPY_VERSION}/site-packages/ledger.so
@man man/man1/ledger.1
share/doc/ledger/
share/doc/ledger/GLOSSARY.md