- Update gnucash to 3.6

- Update gnucash-docs to 3.6

6 files changed, 23 insertions, 12 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 4cf641f569e2..63be701d1e53 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $
 
 PORTNAME=	gnucash-docs
-DISTVERSION=	3.5
+DISTVERSION=	3.6
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/gnucash/gnucash%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo
index 176db0e39967..c5f8197f2b8b 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554058697
-SHA256 (gnucash-docs-3.5.tar.gz) = b320815c90397ab6574dfe50b462d72199a0b34b03625b1c8d7b04a2ab6f563e
-SIZE (gnucash-docs-3.5.tar.gz) = 97117948
+TIMESTAMP = 1561973142
+SHA256 (gnucash-docs-3.6.tar.gz) = 32d373a4faa96cde2bba564bc8d7143d6317f121c488492f2dc5ebe99b4b6163
+SIZE (gnucash-docs-3.6.tar.gz) = 96921528
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index d9933252740f..c1d46468d2de 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -1238,6 +1238,10 @@ share/gnome/help/gnucash-help/C/Help_tips-appendix.xml
 share/gnome/help/gnucash-help/C/Help_txf-categories.xml
 share/gnome/help/gnucash-help/C/figures/Help_AccountReg_Screen.png
 share/gnome/help/gnucash-help/C/figures/Help_AccountTree_Screen.png
+share/gnome/help/gnucash-help/C/figures/Help_Book_Options_Accounts.png
+share/gnome/help/gnucash-help/C/figures/Help_Book_Options_Budgeting.png
+share/gnome/help/gnucash-help/C/figures/Help_Book_Options_Business.png
+share/gnome/help/gnucash-help/C/figures/Help_Book_Options_Counters.png
 share/gnome/help/gnucash-help/C/figures/Help_Pref_AccntPeriod.png
 share/gnome/help/gnucash-help/C/figures/Help_Pref_Accnts.png
 share/gnome/help/gnucash-help/C/figures/Help_Pref_Business.png
@@ -1258,7 +1262,6 @@ share/gnome/help/gnucash-help/C/figures/Help_Tool_Lots_h_double_arrow.png
 share/gnome/help/gnucash-help/C/figures/Help_Tool_Lots_v_double_arrow.png
 share/gnome/help/gnucash-help/C/figures/Help_TxRptOpt_Screen.png
 share/gnome/help/gnucash-help/C/figures/Main-window-callouts.png
-share/gnome/help/gnucash-help/C/figures/Report_Screen.png
 share/gnome/help/gnucash-help/C/figures/home.png
 share/gnome/help/gnucash-help/C/figures/left.png
 share/gnome/help/gnucash-help/C/figures/right.png
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 5d8a1d37a0ab..f8242e580cc5 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,8 +2,7 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	3.5
-PORTREVISION=	2
+PORTVERSION=	3.6
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -36,7 +35,8 @@ USE_LDCONFIG=	yes
 
 INSTALLS_ICONS=	yes
 CMAKE_ARGS=	-DCOMPILE_GSCHEMAS=OFF \
-		-DENABLE_BINRELOC=OFF
+		-DENABLE_BINRELOC=OFF \
+		-DGNC_SHELL=/bin/sh
 SHEBANG_FILES=	common/gnc-test-env.pl libgnucash/quotes/gnc-fq-dump
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
@@ -98,7 +98,7 @@ post-patch-TEST-off:
 		${FIND} . -type f -name CMakeLists.txt \
 		-exec ${REINPLACE_CMD} -e '/add_subdirectory *(test.*)/d' \
 		-e '/enable_testing()/d' -e '/include (GncAddTest)/d' \
-		-e '/gnc_gtest_configure()/d' {} +)
+		-e '/gnc_gtest_configure()/d' -e '/scm-test-core/d' {} +)
 
 post-install:
 	@(cd ${STAGEDIR}${DATADIR}/icons/hicolor && \
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 87a764c93d8d..82f6391b56c3 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554058302
-SHA256 (gnucash-3.5.tar.bz2) = 776d0b51b6029e25b5c7e9eb86021d5ecf1b09d8f3241b279f76dba9cc3b7745
-SIZE (gnucash-3.5.tar.bz2) = 13766397
+TIMESTAMP = 1561973076
+SHA256 (gnucash-3.6.tar.bz2) = f1cb86de60bb0eb2cf5c2c3868e7dab7d889017e233230f944f158f84eb85f25
+SIZE (gnucash-3.6.tar.bz2) = 13811045
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 094461951652..9a24647a90e6 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -313,6 +313,7 @@ lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/advanced-portfolio.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/average-balance.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balance-forecast.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balance-sheet.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/balsheet-pnl.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-balance-sheet.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-barchart.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/budget-flow.go
@@ -330,6 +331,7 @@ lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/income-statement.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/net-charts.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/portfolio.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/price-scatter.go
+lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/reconcile-report.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/register.go
 lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/sx-summary.go
 %%TEST%%lib/gnucash/scm/ccache/2.2/gnucash/report/standard-reports/test/test-cash-flow.go
@@ -389,9 +391,11 @@ lib/gnucash/scm/ccache/2.2/qif-import/qif-utils.go
 lib/gnucash/scm/ccache/2.2/report-utilities.go
 lib/gnucash/scm/ccache/2.2/report.go
 lib/gnucash/scm/ccache/2.2/simple-obj.go
+lib/gnucash/scm/ccache/2.2/trep-engine.go
 %%TEST%%lib/gnucash/scm/ccache/2.2/test-account.go
 %%TEST%%lib/gnucash/scm/ccache/2.2/test-c-interface.go
 %%TEST%%lib/gnucash/scm/ccache/2.2/test-create-account.go
+%%TEST%%lib/gnucash/scm/ccache/2.2/test-libgnucash-scm-utilities.go
 %%TEST%%lib/gnucash/scm/ccache/2.2/test-split.go
 lib/gnucash/scm/ccache/2.2/txf-de_DE.go
 lib/gnucash/scm/ccache/2.2/txf-help-de_DE.go
@@ -1106,6 +1110,7 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/scm/gnucash/report/standard-reports/average-balance.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/balance-forecast.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/balance-sheet.scm
+%%DATADIR%%/scm/gnucash/report/standard-reports/balsheet-pnl.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/budget-balance-sheet.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/budget-barchart.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/budget-flow.scm
@@ -1123,6 +1128,7 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/scm/gnucash/report/standard-reports/net-charts.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/portfolio.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/price-scatter.scm
+%%DATADIR%%/scm/gnucash/report/standard-reports/reconcile-report.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/register.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/sx-summary.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cash-flow.scm
@@ -1184,9 +1190,11 @@ share/metainfo/gnucash.appdata.xml
 %%DATADIR%%/scm/report-utilities.scm
 %%DATADIR%%/scm/report.scm
 %%DATADIR%%/scm/simple-obj.scm
+%%DATADIR%%/scm/trep-engine.scm
 %%TEST%%%%DATADIR%%/scm/test-account.scm
 %%TEST%%%%DATADIR%%/scm/test-c-interface.scm
 %%TEST%%%%DATADIR%%/scm/test-create-account.scm
+%%TEST%%%%DATADIR%%/scm/test-libgnucash-scm-utilities.scm
 %%TEST%%%%DATADIR%%/scm/test-split.scm
 %%DATADIR%%/scm/txf-de_DE.scm
 %%DATADIR%%/scm/txf-help-de_DE.scm