- Update finance/gnucash to 2.6.15

- Update finance/gnucash-docs to 2.6.15
- Regenerated gnucash paatches

10 files changed, 52 insertions, 17 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 02d503d712cd..c2849ffba43b 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
-PORTVERSION=	2.6.14
+PORTVERSION=	2.6.15
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/gnucash/${PORTNAME}/${PORTVERSION} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/ \
diff --git a/finance/gnucash-docs/distinfo b/finance/gnucash-docs/distinfo
index 4a2b5087941d..9cf4a024abc3 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474208457
-SHA256 (gnucash-docs-2.6.14.tar.gz) = 8fdbf438a11546de7ee4392c59db2ac8bb8330aab01274a34327d76847f25d8d
-SIZE (gnucash-docs-2.6.14.tar.gz) = 80104270
+TIMESTAMP = 1482156131
+SHA256 (gnucash-docs-2.6.15.tar.gz) = bd1b903217ca2997fbc0386676305e262e13f26ad504cd71ccf7ef977781526c
+SIZE (gnucash-docs-2.6.15.tar.gz) = 81292273
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index 07c5ca99b15d..1efffa61b1c5 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -22,6 +22,7 @@ share/gnome/help/gnucash-guide/C/ch_loans.xml
 share/gnome/help/gnucash-guide/C/ch_oth_assets.xml
 share/gnome/help/gnucash-guide/C/ch_oview.xml
 share/gnome/help/gnucash-guide/C/ch_python_bindings.xml
+share/gnome/help/gnucash-guide/C/ch_reports.xml
 share/gnome/help/gnucash-guide/C/ch_txns.xml
 share/gnome/help/gnucash-guide/C/fdl-appendix.xml
 share/gnome/help/gnucash-guide/C/figures/accts_CreateAssetsAccount.png
@@ -125,6 +126,17 @@ share/gnome/help/gnucash-guide/C/figures/currency_purchase_ToAmount.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
+share/gnome/help/gnucash-guide/C/figures/invest2Lots0RegB4Scrub.png
+share/gnome/help/gnucash-guide/C/figures/invest2Lots1B4Scrub.png
+share/gnome/help/gnucash-guide/C/figures/invest2Lots2LotsAftScrubAcct.png
+share/gnome/help/gnucash-guide/C/figures/invest2Lots3RegAftScrubAcct.png
+share/gnome/help/gnucash-guide/C/figures/investLots0_RegB4Scrub.png
+share/gnome/help/gnucash-guide/C/figures/investLots1_BeforeCreateLot.png
+share/gnome/help/gnucash-guide/C/figures/investLots2_BeforeScrub1Lot.png
+share/gnome/help/gnucash-guide/C/figures/investLots4_AfterScrub1LotReg.png
+share/gnome/help/gnucash-guide/C/figures/investLotsSplitLot0.png
+share/gnome/help/gnucash-guide/C/figures/investLotsSplitLot1.png
+share/gnome/help/gnucash-guide/C/figures/investLotsSplitReg.png
 share/gnome/help/gnucash-guide/C/figures/invest_AccountsPredef.png
 share/gnome/help/gnucash-guide/C/figures/invest_SetupPortfolio2.png
 share/gnome/help/gnucash-guide/C/figures/invest_dividendcash.png
@@ -194,6 +206,7 @@ share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger1.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger2.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger3.png
 share/gnome/help/gnucash-guide/C/figures/txns_sxn_ledger4.png
+share/gnome/help/gnucash-guide/C/gnc-glossary.xml
 share/gnome/help/gnucash-guide/C/gnucash-guide.xml
 share/gnome/help/gnucash-guide/C/legal.xml
 share/gnome/help/gnucash-guide/de/appendixa.xml
@@ -214,6 +227,7 @@ share/gnome/help/gnucash-guide/de/ch_cbook.xml
 share/gnome/help/gnucash-guide/de/ch_cc.xml
 share/gnome/help/gnucash-guide/de/ch_currency.xml
 share/gnome/help/gnucash-guide/de/ch_dep.xml
+share/gnome/help/gnucash-guide/de/ch_expenses.xml
 share/gnome/help/gnucash-guide/de/ch_import_business_data.xml
 share/gnome/help/gnucash-guide/de/ch_invest.xml
 share/gnome/help/gnucash-guide/de/ch_loans.xml
@@ -349,6 +363,7 @@ share/gnome/help/gnucash-guide/de/figures/dep_assetmain.png
 share/gnome/help/gnucash-guide/de/figures/dep_assetreg.png
 share/gnome/help/gnucash-guide/de/figures/dep_example.png
 share/gnome/help/gnucash-guide/de/figures/gnc_welcome.png
+share/gnome/help/gnucash-guide/de/figures/investLots2_BeforeScrub1Lot.png
 share/gnome/help/gnucash-guide/de/figures/invest_AccountsPredef.png
 share/gnome/help/gnucash-guide/de/figures/invest_SetupPortfolio2.png
 share/gnome/help/gnucash-guide/de/figures/invest_dividendcash.png
@@ -363,6 +378,7 @@ share/gnome/help/gnucash-guide/de/figures/invest_newaccount.png
 share/gnome/help/gnucash-guide/de/figures/invest_newsecurity.png
 share/gnome/help/gnucash-guide/de/figures/invest_peditor.png
 share/gnome/help/gnucash-guide/de/figures/invest_peditor2.png
+share/gnome/help/gnucash-guide/de/figures/invest_ret_of_cap.png
 share/gnome/help/gnucash-guide/de/figures/invest_selectsecurity.png
 share/gnome/help/gnucash-guide/de/figures/invest_sellstock.png
 share/gnome/help/gnucash-guide/de/figures/invest_sellstock2.png
@@ -1023,6 +1039,10 @@ share/gnome/help/gnucash-help/C/figures/Help_Pref_Reports.png
 share/gnome/help/gnucash-help/C/figures/Help_Pref_Sched.png
 share/gnome/help/gnucash-help/C/figures/Help_Pref_Windows.png
 share/gnome/help/gnucash-help/C/figures/Help_Report_Screen.png
+share/gnome/help/gnucash-help/C/figures/Help_Tool_LotsBus.png
+share/gnome/help/gnucash-help/C/figures/Help_Tool_LotsStk.png
+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
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 3bf22bc1242c..d4ab89a8f95d 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=	2.6.14
-PORTREVISION=	2
+PORTVERSION=	2.6.15
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 3ba8aabd9cdd..1579eacfc9d6 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474207977
-SHA256 (gnucash-2.6.14.tar.bz2) = 3b144f2ca5025df5eb1977b11e6f93208f3e90d840285ae952fa9b3da8158e75
-SIZE (gnucash-2.6.14.tar.bz2) = 13368599
+TIMESTAMP = 1482155951
+SHA256 (gnucash-2.6.15.tar.bz2) = 1619eb8263439f547dd12afdc0b05b9a50593d5cd3d3e9ee5b05edaec3b6dbae
+SIZE (gnucash-2.6.15.tar.bz2) = 13406483
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index 2d0b08e6f5b0..7093e70aae0e 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2014-09-28 02:56:29.000000000 +0200
-+++ configure	2014-10-05 01:43:56.028480737 +0200
-@@ -20513,6 +20513,7 @@
+--- configure.orig	2016-12-17 19:13:08 UTC
++++ configure
+@@ -20532,6 +20532,7 @@ $as_echo_n "checking for guile-2.0 >= 2.
              { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
              succeeded=yes
diff --git a/finance/gnucash/files/patch-src_app-utils_guile-util.c b/finance/gnucash/files/patch-src_app-utils_guile-util.c
index 5c305b52e32a..c8d0c17562d8 100644
--- a/finance/gnucash/files/patch-src_app-utils_guile-util.c
+++ b/finance/gnucash/files/patch-src_app-utils_guile-util.c
@@ -1,6 +1,6 @@
---- src/app-utils/guile-util.c.orig	2014-01-19 00:44:17.000000000 +0100
-+++ src/app-utils/guile-util.c	2014-01-27 22:15:08.578610605 +0100
-@@ -1083,6 +1083,8 @@
+--- src/app-utils/guile-util.c.orig	2016-12-17 17:28:09 UTC
++++ src/app-utils/guile-util.c
+@@ -1083,6 +1083,8 @@ gnc_parse_time_to_time64 (const gchar *s
  
      g_return_val_if_fail(s && format, -1);
  
diff --git a/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c b/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c
new file mode 100644
index 000000000000..f8655357ed99
--- /dev/null
+++ b/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c
@@ -0,0 +1,14 @@
+--- src/import-export/ofx/gnc-ofx-import.c.orig	2016-12-15 21:46:51 UTC
++++ src/import-export/ofx/gnc-ofx-import.c
+@@ -337,7 +337,11 @@ fix_ofx_bug_39 (time64 t)
+ #if HAVE_OFX_BUG_39
+     struct tm stm;
+     gnc_localtime_r(&t, &stm);
++#ifdef __FreeBSD__
++    if (!stm.tm_isdst)
++#else
+     if (daylight && !stm.tm_isdst)
++#endif
+       t += 3600;
+ #endif
+     return t;
diff --git a/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in b/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
index 0454975e1b8b..f287b7ff2b80 100644
--- a/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
+++ b/finance/gnucash/files/patch-src_report_report-gnome_Makefile.in
@@ -1,6 +1,6 @@
---- src/report/report-gnome/Makefile.in.orig	2015-03-30 20:14:44 UTC
+--- src/report/report-gnome/Makefile.in.orig	2016-12-17 19:13:07 UTC
 +++ src/report/report-gnome/Makefile.in
-@@ -514,6 +514,7 @@ EXTRA_DIST = \
+@@ -586,6 +586,7 @@ EXTRA_DIST = \
  @GNC_HAVE_GUILE_2_TRUE@GUILE_COMPILE_ENV = \
  @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/app-utils \
  @GNC_HAVE_GUILE_2_TRUE@  --gnc-module-dir ${top_builddir}/src/engine \
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 441700f9c52d..0474c35a30c5 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -959,6 +959,8 @@ share/applications/gnucash.desktop
 %%DATADIR%%/pixmaps/gnc-account-new.png
 %%DATADIR%%/pixmaps/gnc-account-open-16.png
 %%DATADIR%%/pixmaps/gnc-account-open.png
+%%DATADIR%%/pixmaps/gnc-account-report-16.png
+%%DATADIR%%/pixmaps/gnc-account-report.png
 %%DATADIR%%/pixmaps/gnc-account.png
 %%DATADIR%%/pixmaps/gnc-gnome-pdf-16.png
 %%DATADIR%%/pixmaps/gnc-gnome-pdf-24.png