- Update gnucash to 3.11

- Update gnucash-docs to 3.11

8 files changed, 23 insertions, 38 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index ac8868646dea..43f9fc5d1fed 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.10
+DISTVERSION=	3.11
 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 b27a3415d574..1895cbe23f08 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586681646
-SHA256 (gnucash-docs-3.10.tar.gz) = 25c74fd5a1a1ba58c7e6d732a3e4ad607f0b94283266f0195c7986b8352a790d
-SIZE (gnucash-docs-3.10.tar.gz) = 70795421
+TIMESTAMP = 1593367425
+SHA256 (gnucash-docs-3.11.tar.gz) = 8682dd969e5bec5745e4d8ebf7695973cc445d8975a369887d9aad07771a1d27
+SIZE (gnucash-docs-3.11.tar.gz) = 71468032
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index f4dd4c70b152..9f23867eff8e 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -122,6 +122,17 @@ share/gnome/help/gnucash-guide/C/figures/currency_purchase_Commodities.png
 share/gnome/help/gnucash-guide/C/figures/currency_purchase_MoveMoney.png
 share/gnome/help/gnucash-guide/C/figures/currency_purchase_SetExchangeRate.png
 share/gnome/help/gnucash-guide/C/figures/currency_purchase_ToAmount.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_Price_Database_initial.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_acct_setup.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_acct_setup_2.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_accts_after_tfr.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_accts_after_trf_back.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_balance_sheet.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_prices_after_trf_back.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_transfer_funds.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_transfer_trans1.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_transfer_trans2.png
+share/gnome/help/gnucash-guide/C/figures/currency_trading_trf_back.png
 share/gnome/help/gnucash-guide/C/figures/dep_assetmain.png
 share/gnome/help/gnucash-guide/C/figures/dep_assetreg.png
 share/gnome/help/gnucash-guide/C/figures/dep_example.png
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 5108b25a8165..cf19c61456b2 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.10
-PORTREVISION=	2
+PORTVERSION=	3.11
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 3788fa750caf..ce96b183740d 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586681445
-SHA256 (gnucash-3.10.tar.bz2) = b60772c276a63639964d1e24c795fbb9a7c0c6c45959168fe5cdfe08eb796f16
-SIZE (gnucash-3.10.tar.bz2) = 14166587
+TIMESTAMP = 1593366883
+SHA256 (gnucash-3.11.tar.bz2) = 3e0df1781864350c051006fd49bbb3e8d6237d74fd55c9649a9e7c0f5cbd159b
+SIZE (gnucash-3.11.tar.bz2) = 14155968
diff --git a/finance/gnucash/files/patch-CMakeLists.txt b/finance/gnucash/files/patch-CMakeLists.txt
index 2386fb524768..979b1748ccae 100644
--- a/finance/gnucash/files/patch-CMakeLists.txt
+++ b/finance/gnucash/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2018-12-30 15:38:18 UTC
+--- CMakeLists.txt.orig	2020-06-27 00:10:17 UTC
 +++ CMakeLists.txt
-@@ -43,6 +43,7 @@ include (MacroAppendForeach)
+@@ -33,6 +33,7 @@ include (MacroAppendForeach)
  include (MacroAddSourceFileCompileFlags)
  include (GncAddSwigCommand)
  include (CheckIncludeFiles)
@@ -8,7 +8,7 @@
  include (GncAddSchemeTargets)
  include (GncAddGSchemaTargets)
  include (GncAddTest)
-@@ -567,9 +568,9 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
+@@ -591,9 +592,9 @@ set(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
  
  
  if (UNIX)
@@ -19,4 +19,4 @@
 +  set( CMAKE_CXX_FLAGS "-Wall -Wmissing-declarations -Wno-unused -Wno-error=parentheses ${CMAKE_CXX_FLAGS}")
    set( CMAKE_CXX_FLAGS "-Wno-error=deprecated-declarations ${REGISTER_CXXFLAG} ${CMAKE_CXX_FLAGS}")
    set( CMAKE_C_FLAGS_RELEASE "-O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${CMAKE_C_FLAGS}")
- endif (UNIX)
+ endif()
diff --git a/finance/gnucash/files/patch-bindings_python_tests_CMakeLists.txt b/finance/gnucash/files/patch-bindings_python_tests_CMakeLists.txt
deleted file mode 100644
index 717d832b5c21..000000000000
--- a/finance/gnucash/files/patch-bindings_python_tests_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/python/tests/CMakeLists.txt.orig	2020-04-11 16:28:50 UTC
-+++ bindings/python/tests/CMakeLists.txt
-@@ -5,7 +5,7 @@ if (WITH_PYTHON)
-     # Because it hasn't been built yet
-     set(test_core_dir ${CMAKE_BINARY_DIR}/common/test-core)
-   endif()
--  add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py swig-app-utils-python)
-+  add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
-   add_dependencies(check test-python-bindings)
-   add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
-   set_property(TEST python-bindings PROPERTY ENVIRONMENT
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 1f1300d141ec..e473d39577a4 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -464,19 +464,7 @@ share/metainfo/gnucash.appdata.xml
 %%PORTDOCS%%%%DOCSDIR%%/Money95stocks_fr.qif
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README-ca.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-de.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-fr.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-hr.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-it.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-lv.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-nl.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-zh_CN.win32-bin.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-zh_TW.win32-bin.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.dependencies
-%%PORTDOCS%%%%DOCSDIR%%/README.francais
-%%PORTDOCS%%%%DOCSDIR%%/README.german
-%%PORTDOCS%%%%DOCSDIR%%/README.win32-bin.txt
 %%PORTDOCS%%%%DOCSDIR%%/README_invoice
 %%PORTDOCS%%%%DOCSDIR%%/abc-all.qif
 %%PORTDOCS%%%%DOCSDIR%%/abc.qif
@@ -485,10 +473,8 @@ share/metainfo/gnucash.appdata.xml
 %%PORTDOCS%%%%DOCSDIR%%/currency_tree_xml.gnucash
 %%PORTDOCS%%%%DOCSDIR%%/every.qif
 %%PORTDOCS%%%%DOCSDIR%%/gtk-3.0.css
-%%PORTDOCS%%%%DOCSDIR%%/guile-hackers.txt
 %%PORTDOCS%%%%DOCSDIR%%/invoice.csv
 %%PORTDOCS%%%%DOCSDIR%%/ms-money.qif
-%%PORTDOCS%%%%DOCSDIR%%/projects.html
 %%PORTDOCS%%%%DOCSDIR%%/quicktest.qif
 %%PORTDOCS%%%%DOCSDIR%%/swipe.qif
 %%PORTDOCS%%%%DOCSDIR%%/taxreport.gnucash