Update gnucash and gnucash-docs to 3.2

5 files changed, 41 insertions, 71 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index dc93493cd2f3..29a58b6dfdbd 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,9 +2,7 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	3.1
-DISTVERSIONSUFFIX=	-1
-PORTREVISION=	1
+PORTVERSION=	3.2
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -96,9 +94,9 @@ CONFIGURE_ENV+=	GMOCK_ROOT="${GMOCK_WRKSRC}"
 post-patch-TEST-off:
 	@(cd ${WRKSRC} ; \
 		${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' {} +)
+		-exec ${REINPLACE_CMD} -e '/add_subdirectory *(test.*)/d' \
+		-e '/enable_testing()/d' -e '/include (GncAddTest)/d' \
+		-e '/gnc_gtest_configure()/d' {} +)
 
 post-install:
 	@(cd ${STAGEDIR}${DATADIR}/icons/hicolor && \
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index cccb6562e256..802c677923e4 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525419034
-SHA256 (gnucash-3.1-1.tar.bz2) = a1ef66cec3b8b74b7b8bfe791ff12456796a69cc004427e8d9205b6872bdd261
-SIZE (gnucash-3.1-1.tar.bz2) = 13374530
+TIMESTAMP = 1529915625
+SHA256 (gnucash-3.2.tar.bz2) = 63e5b00c148ed0f7021ebc03e4e70c4a9c549feb3ea49d6c810f2abaaf592452
+SIZE (gnucash-3.2.tar.bz2) = 13384008
diff --git a/finance/gnucash/files/patch-CMakeLists.txt b/finance/gnucash/files/patch-CMakeLists.txt
index 57d89d5e1057..b79b636afb1b 100644
--- a/finance/gnucash/files/patch-CMakeLists.txt
+++ b/finance/gnucash/files/patch-CMakeLists.txt
@@ -1,21 +1,21 @@
---- CMakeLists.txt.orig	2018-04-30 18:58:18 UTC
+--- CMakeLists.txt.orig	2018-06-24 21:43:51 UTC
 +++ CMakeLists.txt
-@@ -43,6 +43,7 @@ INCLUDE (MacroAppendForeach)
- INCLUDE (MacroAddSourceFileCompileFlags)
- INCLUDE (GncAddSwigCommand)
- INCLUDE (CheckIncludeFiles)
-+INCLUDE (CheckSymbolExists)
- INCLUDE (GncAddSchemeTargets)
- INCLUDE (GncAddGSchemaTargets)
- INCLUDE (GncAddTest)
-@@ -550,8 +551,8 @@ SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+@@ -43,6 +43,7 @@ include (MacroAppendForeach)
+ include (MacroAddSourceFileCompileFlags)
+ include (GncAddSwigCommand)
+ include (CheckIncludeFiles)
++include (CheckSymbolExists)
+ include (GncAddSchemeTargets)
+ include (GncAddGSchemaTargets)
+ include (GncAddTest)
+@@ -560,8 +561,8 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
  
  
- IF (UNIX)
--  SET( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
--  SET( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused ${CMAKE_CXX_FLAGS}")
-+  SET( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
-+  SET( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused ${CMAKE_CXX_FLAGS}")
-   SET( CMAKE_C_FLAGS "-Wno-deprecated-declarations -std=gnu11 ${CMAKE_C_FLAGS}")
-   SET( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
- ENDIF (UNIX)
+ if (UNIX)
+-  set( CMAKE_C_FLAGS "-Werror -Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
+-  set( CMAKE_CXX_FLAGS "-Werror -Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
++  set( CMAKE_C_FLAGS "-Wdeclaration-after-statement -Wno-pointer-sign -Wall -Wmissing-prototypes -Wmissing-declarations -Wno-unused ${CMAKE_C_FLAGS}")
++  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
+   set( CMAKE_C_FLAGS "-Wno-deprecated-declarations -std=gnu11 -Wno-error=parentheses ${CMAKE_C_FLAGS}")
+   set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
+ endif (UNIX)
diff --git a/finance/gnucash/files/patch-gnucash_import-export_ofx_gnc-ofx-import.c b/finance/gnucash/files/patch-gnucash_import-export_ofx_gnc-ofx-import.c
deleted file mode 100644
index b99a480876b3..000000000000
--- a/finance/gnucash/files/patch-gnucash_import-export_ofx_gnc-ofx-import.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- gnucash/import-export/ofx/gnc-ofx-import.c.orig	2018-03-31 22:46:37 UTC
-+++ gnucash/import-export/ofx/gnc-ofx-import.c
-@@ -337,8 +337,26 @@ fix_ofx_bug_39 (time64 t)
- {
- #if HAVE_OFX_BUG_39
-     struct tm stm;
-+#ifdef __FreeBSD__
-+    time64 now;
-+    /*
-+     * FreeBSD has it's own libc implementation which differs from glibc. In particular:
-+     * There is no daylight global.
-+     * tzname members are set to the string "   " (three spaces) when not explicitly
-+     * populated
-+     *
-+     * To check that the current timezone does not observe DST I check if tzname[1]
-+     * starts with a space.
-+     */
-+    now = gnc_time (NULL);
-+    gnc_localtime_r(&now, &stm);
-+    tzset();
-+
-+    if (tzname[1][0] != ' ' && !stm.tm_isdst)
-+#else
-     gnc_localtime_r(&t, &stm);
-     if (daylight && !stm.tm_isdst)
-+#endif
-         t += 3600;
- #endif
-     return t;
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 7654906053fb..e338f191856f 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -244,7 +244,6 @@ lib/gnucash/libgncmod-locale-reports-us.so
 lib/gnucash/libgncmod-log-replay.so
 %%OFX%%lib/gnucash/libgncmod-ofx.so
 lib/gnucash/libgncmod-qif-import.so
-lib/gnucash/libgncmod-qif.so
 lib/gnucash/libgncmod-register-core.so
 lib/gnucash/libgncmod-register-gnome.so
 lib/gnucash/libgncmod-report-gnome.so
@@ -268,6 +267,7 @@ lib/gnucash/scm/ccache/2.0/gnucash/app-utils.go
 lib/gnucash/scm/ccache/2.0/gnucash/business-core.go
 lib/gnucash/scm/ccache/2.0/gnucash/core-utils.go
 lib/gnucash/scm/ccache/2.0/gnucash/engine.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/engine/test/srfi64-extras.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/engine/test/test-extras.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/foo.go
 lib/gnucash/scm/ccache/2.0/gnucash/gettext.go
@@ -304,13 +304,12 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/receivables.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-gnome.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-system.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/collectors.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/list-extras.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/report-collectors.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-collectors.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-extras.go
-%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-list-extras.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-load-report-system-module.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-report-utilities.go
+%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/report-system/test/test-test-extras.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-piecharts.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/account-summary.go
@@ -331,17 +330,13 @@ lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-journal.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/general-ledger.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-gst-statement.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/income-statement.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-barchart.go
-lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-linechart.go
+lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/net-charts.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/portfolio.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/price-scatter.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/register.go
 lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/sx-summary.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cash-flow.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-cashflow-barchart.go
-%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-category-report.go
-%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-net-barchart.go
-%%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-generic-net-linechart.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-category-report.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-barchart.go
 %%TEST%%lib/gnucash/scm/ccache/2.0/gnucash/report/standard-reports/test/test-standard-net-linechart.go
@@ -369,6 +364,7 @@ lib/gnucash/scm/ccache/2.0/gnucash/tax/us.go
 lib/gnucash/scm/ccache/2.0/gnucash/utilities.go
 lib/gnucash/scm/ccache/2.0/hooks.go
 lib/gnucash/scm/ccache/2.0/html-acct-table.go
+lib/gnucash/scm/ccache/2.0/html-anytag.go
 lib/gnucash/scm/ccache/2.0/html-barchart.go
 lib/gnucash/scm/ccache/2.0/html-document.go
 lib/gnucash/scm/ccache/2.0/html-fonts.go
@@ -380,6 +376,10 @@ lib/gnucash/scm/ccache/2.0/html-style-sheet.go
 lib/gnucash/scm/ccache/2.0/html-table.go
 lib/gnucash/scm/ccache/2.0/html-text.go
 lib/gnucash/scm/ccache/2.0/html-utilities.go
+lib/gnucash/scm/ccache/2.0/json.go
+lib/gnucash/scm/ccache/2.0/json/builder.go
+lib/gnucash/scm/ccache/2.0/json/parser.go
+lib/gnucash/scm/ccache/2.0/json/syntax.go
 lib/gnucash/scm/ccache/2.0/migrate-prefs.go
 lib/gnucash/scm/ccache/2.0/options-utilities.go
 lib/gnucash/scm/ccache/2.0/options.go
@@ -1039,6 +1039,7 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/core-utils.scm
 %%DATADIR%%/scm/gnucash/engine.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/engine/test/test-extras.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/engine/test/srfi64-extras.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/foo.scm
 %%DATADIR%%/scm/gnucash/gettext.scm
 %%DATADIR%%/scm/gnucash/gnc-module.scm
@@ -1078,13 +1079,12 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/report-gnome.scm
 %%DATADIR%%/scm/gnucash/report/report-system.scm
 %%DATADIR%%/scm/gnucash/report/report-system/collectors.scm
-%%DATADIR%%/scm/gnucash/report/report-system/list-extras.scm
 %%DATADIR%%/scm/gnucash/report/report-system/report-collectors.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-collectors.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-extras.scm
-%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-list-extras.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-load-report-system-module.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-report-utilities.scm
+%%TEST%%%%DATADIR%%/scm/gnucash/report/report-system/test/test-test-extras.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/account-piecharts.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/account-summary.scm
@@ -1105,17 +1105,13 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/report/standard-reports/general-ledger.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/income-gst-statement.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/income-statement.scm
-%%DATADIR%%/scm/gnucash/report/standard-reports/net-barchart.scm
-%%DATADIR%%/scm/gnucash/report/standard-reports/net-linechart.scm
+%%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/register.scm
 %%DATADIR%%/scm/gnucash/report/standard-reports/sx-summary.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cash-flow.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-cashflow-barchart.scm
-%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-category-report.scm
-%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-net-barchart.scm
-%%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-generic-net-linechart.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-category-report.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-barchart.scm
 %%TEST%%%%DATADIR%%/scm/gnucash/report/standard-reports/test/test-standard-net-linechart.scm
@@ -1145,6 +1141,7 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/gnucash/utilities.scm
 %%DATADIR%%/scm/hooks.scm
 %%DATADIR%%/scm/html-acct-table.scm
+%%DATADIR%%/scm/html-anytag.scm
 %%DATADIR%%/scm/html-barchart.scm
 %%DATADIR%%/scm/html-document.scm
 %%DATADIR%%/scm/html-fonts.scm
@@ -1156,6 +1153,10 @@ share/applications/gnucash.desktop
 %%DATADIR%%/scm/html-table.scm
 %%DATADIR%%/scm/html-text.scm
 %%DATADIR%%/scm/html-utilities.scm
+%%DATADIR%%/scm/json.scm
+%%DATADIR%%/scm/json/builder.scm
+%%DATADIR%%/scm/json/parser.scm
+%%DATADIR%%/scm/json/syntax.scm
 %%DATADIR%%/scm/migrate-prefs.scm
 %%DATADIR%%/scm/options-utilities.scm
 %%DATADIR%%/scm/options.scm