- Update finance/gnucash to 2.6.18

- Update finance/gnucash-docs to 2.6.18
- Silence portlint warning about variable ordering
- Regenerate some patches

The gnucash distfile was regenerated after initial release due to
missing files, and has a non conforming filename, so the port adds
variables to correctly handle this.

9 files changed, 34 insertions, 18 deletions

diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index 750b384ee2ee..04357ea719e1 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.17
+PORTVERSION=	2.6.18
 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 d260be018a2c..3d0da00fa44f 100644
--- a/finance/gnucash-docs/distinfo
+++ b/finance/gnucash-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499107148
-SHA256 (gnucash-docs-2.6.17.tar.gz) = 79646c60b1cbc3dd6da817e2546af7baa72497ab846939d3565711044825cb35
-SIZE (gnucash-docs-2.6.17.tar.gz) = 92073384
+TIMESTAMP = 1506292615
+SHA256 (gnucash-docs-2.6.18.tar.gz) = abeef203cd6d938236ec6e376216001a472aae0baafb602a625aa8d5763dec2f
+SIZE (gnucash-docs-2.6.18.tar.gz) = 92213102
diff --git a/finance/gnucash-docs/pkg-plist b/finance/gnucash-docs/pkg-plist
index da6c09108018..b7261a72380f 100644
--- a/finance/gnucash-docs/pkg-plist
+++ b/finance/gnucash-docs/pkg-plist
@@ -1047,10 +1047,10 @@ share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_salary.png
 share/gnome/help/gnucash-guide/ru/figures/basics_EmptyAccounts.png
 share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup.png
 share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Accounts.png
+share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Currency.png
 share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Finish.png
+share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_NewBookOpts.png
 share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Setup.png
-share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_currency.png
-share/gnome/help/gnucash-guide/ru/figures/basics_NewBookOpts.png
 share/gnome/help/gnucash-guide/ru/figures/basics_QIF_Import_welcome.png
 share/gnome/help/gnucash-guide/ru/figures/basics_SaveSQL.png
 share/gnome/help/gnucash-guide/ru/figures/basics_SaveXML.png
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 197c0e621ea9..faa4369a2a5b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -2,8 +2,8 @@
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
 
 PORTNAME=	gnucash
-PORTVERSION=	2.6.17
-PORTREVISION=	2
+PORTVERSION=	2.6.18
+DISTVERSIONSUFFIX=-1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -64,9 +64,9 @@ GUILE2_LIB_DEPENDS=     libguile-2.0.so:lang/guile2
 GUILE2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
 GUILE2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
 
-USE_XORG=	x11
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \
 		perl5 pkgconfig shebangfix tar:bzip2
+USE_XORG=	x11
 USE_CXXSTD=	c++11
 INSTALLS_ICONS=	yes
 USE_GNOME+=	cairo gtk20 intltool libgnomecanvas libxml2 libxslt
@@ -75,6 +75,7 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-error-on-warning \
 		--disable-doxygen
 SHEBANG_FILES=	src/gnc-test-env.pl src/quotes/gnc-fq-dump
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 GLIB_SCHEMAS=	org.gnucash.dialogs.business.gschema.xml \
 		org.gnucash.dialogs.checkprinting.gschema.xml \
diff --git a/finance/gnucash/distinfo b/finance/gnucash/distinfo
index 0400f643dd35..f04e56a77a29 100644
--- a/finance/gnucash/distinfo
+++ b/finance/gnucash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499106917
-SHA256 (gnucash-2.6.17.tar.bz2) = db965f39b6c5181810a064a1d1f5bb719722ac3b54dfce0cecf43ee7b38e593c
-SIZE (gnucash-2.6.17.tar.bz2) = 13508462
+TIMESTAMP = 1506459146
+SHA256 (gnucash-2.6.18-1.tar.bz2) = 68730bcfcead7485011eb43d3b2c5df032c714571c81f9a15d33d8494fc4249d
+SIZE (gnucash-2.6.18-1.tar.bz2) = 13583327
diff --git a/finance/gnucash/files/patch-configure b/finance/gnucash/files/patch-configure
index 7093e70aae0e..58657343078b 100644
--- a/finance/gnucash/files/patch-configure
+++ b/finance/gnucash/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-12-17 19:13:08 UTC
+--- configure.orig	2017-09-22 22:13:51 UTC
 +++ configure
-@@ -20532,6 +20532,7 @@ $as_echo_n "checking for guile-2.0 >= 2.
+@@ -21090,6 +21090,7 @@ $as_echo_n "checking for guile-2.0 >= 2.0.0... " >&6; 
              { $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 c8d0c17562d8..88c4be03b959 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	2016-12-17 17:28:09 UTC
+--- src/app-utils/guile-util.c.orig	2017-09-19 23:23:17 UTC
 +++ src/app-utils/guile-util.c
-@@ -1083,6 +1083,8 @@ gnc_parse_time_to_time64 (const gchar *s
+@@ -1083,6 +1083,8 @@ gnc_parse_time_to_time64 (const gchar *s, const gchar 
  
      g_return_val_if_fail(s && format, -1);
  
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 f287b7ff2b80..04f1c6176f48 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	2016-12-17 19:13:07 UTC
+--- src/report/report-gnome/Makefile.in.orig	2017-09-22 22:13:50 UTC
 +++ src/report/report-gnome/Makefile.in
-@@ -586,6 +586,7 @@ EXTRA_DIST = \
+@@ -599,6 +599,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 ad784b0caca9..b6a4d060835a 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -509,6 +509,21 @@ share/applications/gnucash.desktop
 %%DATADIR%%/accounts/C/acctchrt_retiremt.gnucash-xea
 %%DATADIR%%/accounts/C/acctchrt_spouseinc.gnucash-xea
 %%DATADIR%%/accounts/C/acctchrt_spouseretire.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_brokerage.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_carloan.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_cdmoneymkt.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_childcare.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_common.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_currency.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_eduloan.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_fixedassets.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_homeloan.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_homeown.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_otherloan.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_renter.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_retiremt.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_spouseinc.gnucash-xea
+%%DATADIR%%/accounts/ca/acctchrt_spouseretire.gnucash-xea
 %%DATADIR%%/accounts/cs/acctchrt_brokerage.gnucash-xea
 %%DATADIR%%/accounts/cs/acctchrt_carloan.gnucash-xea
 %%DATADIR%%/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea