- Add NLS option

- Add missed dependency reported by stage-qa
- Enable AQBANKING and OFX options by default [1]
- Sort options and option helpers

Requested by:	David Newman <dnewman@networktest.com> [1]

2 files changed, 70 insertions, 65 deletions

diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index ee6ff07fe46c..f3dd467e634b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	2.6.20
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -40,36 +41,40 @@ guile2_BUILD_DEPENDS=	slib-guile2>0:lang/slib-guile2
 guile2_RUN_DEPENDS=	slib-guile2>0:lang/slib-guile2
 guile2_CONFLICTS_INSTALL=	gnucash-guile1-[0-9]*
 
-OPTIONS_DEFINE=	AQBANKING OFX DATABASE LOCALE_TAX PYTHON GTKMM DOCS
+OPTIONS_DEFINE=		AQBANKING DATABASE DOCS GTKMM LOCALE_TAX NLS OFX PYTHON
+OPTIONS_DEFAULT=	AQBANKING OFX
 
 AQBANKING_DESC=	AqBanking support (HBCI/OpenHBCI)
-OFX_DESC=	OFX support
 DATABASE_DESC=	Enable SQL database backends
-LOCALE_TAX_DESC=	Enable localized tax categories
 GTKMM_DESC=	Enable GTKMM based UI
+LOCALE_TAX_DESC=	Enable localized tax categories
+OFX_DESC=	OFX support
 
 OPTIONS_SUB=		yes
 AQBANKING_CONFIGURE_ENABLE=aqbanking
 AQBANKING_LIB_DEPENDS=	libgwengui-gtk2.so:devel/gwenhywfar-gtk2 \
+			libgwenhywfar.so:devel/gwenhywfar \
 			libktoblzcheck.so:finance/ktoblzcheck \
 			libaqbanking.so:finance/aqbanking
 AQBANKING_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml
-OFX_CONFIGURE_ENABLE=	ofx
-OFX_LIB_DEPENDS=	libofx.so:finance/libofx
-OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml
 DATABASE_CONFIGURE_ENABLE=dbi
 DATABASE_BUILD_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 DATABASE_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DATABASE_RUN_DEPENDS=	libdbi-drivers>=0:databases/libdbi-drivers
 DATABASE_CONFIGURE_ON=	--with-dbi-dbd-dir=${LOCALBASE}/lib/dbd
-LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax
-PYTHON_CONFIGURE_ON=	--enable-python
-PYTHON_USES=		python:2.7
 GTKMM_USE=		GNOME=gtkmm24
 GTKMM_CONFIGURE_ON=	--enable-gtkmm
 GTKMM_CONFIGURE_OFF=	--disable-gtkmm
+LOCALE_TAX_CONFIGURE_ON=--enable-locale-specific-tax
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
+OFX_CONFIGURE_ENABLE=	ofx
+OFX_LIB_DEPENDS=	libofx.so:finance/libofx
+OFX_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml
+PYTHON_CONFIGURE_ON=	--enable-python
+PYTHON_USES=		python:2.7
 
-USES=		compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \
+USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake libtool localbase \
 		perl5 pkgconfig shebangfix tar:bzip2
 USE_XORG=	x11
 USE_CXXSTD=	c++11
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 6063bc566678..b4186e0acfd2 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -1206,58 +1206,58 @@ share/icons/hicolor/48x48/apps/gnucash-icon.png
 share/icons/hicolor/64x64/apps/gnucash-icon.png
 share/icons/hicolor/96x96/apps/gnucash-icon.png
 share/icons/hicolor/scalable/apps/gnucash-icon.svg
-share/locale/ar/LC_MESSAGES/gnucash.mo
-share/locale/as/LC_MESSAGES/gnucash.mo
-share/locale/az/LC_MESSAGES/gnucash.mo
-share/locale/bg/LC_MESSAGES/gnucash.mo
-share/locale/brx/LC_MESSAGES/gnucash.mo
-share/locale/ca/LC_MESSAGES/gnucash.mo
-share/locale/cs/LC_MESSAGES/gnucash.mo
-share/locale/da/LC_MESSAGES/gnucash.mo
-share/locale/de/LC_MESSAGES/gnucash.mo
-share/locale/doi/LC_MESSAGES/gnucash.mo
-share/locale/el/LC_MESSAGES/gnucash.mo
-share/locale/en_GB/LC_MESSAGES/gnucash.mo
-share/locale/es/LC_MESSAGES/gnucash.mo
-share/locale/es_NI/LC_MESSAGES/gnucash.mo
-share/locale/eu/LC_MESSAGES/gnucash.mo
-share/locale/fa/LC_MESSAGES/gnucash.mo
-share/locale/fi/LC_MESSAGES/gnucash.mo
-share/locale/fr/LC_MESSAGES/gnucash.mo
-share/locale/gu/LC_MESSAGES/gnucash.mo
-share/locale/he/LC_MESSAGES/gnucash.mo
-share/locale/hi/LC_MESSAGES/gnucash.mo
-share/locale/hu/LC_MESSAGES/gnucash.mo
-share/locale/it/LC_MESSAGES/gnucash.mo
-share/locale/ja/LC_MESSAGES/gnucash.mo
-share/locale/kn/LC_MESSAGES/gnucash.mo
-share/locale/ko/LC_MESSAGES/gnucash.mo
-share/locale/kok/LC_MESSAGES/gnucash.mo
-share/locale/kok@latin/LC_MESSAGES/gnucash.mo
-share/locale/ks/LC_MESSAGES/gnucash.mo
-share/locale/lt/LC_MESSAGES/gnucash.mo
-share/locale/lv/LC_MESSAGES/gnucash.mo
-share/locale/mai/LC_MESSAGES/gnucash.mo
-share/locale/mni/LC_MESSAGES/gnucash.mo
-share/locale/mni@bengali/LC_MESSAGES/gnucash.mo
-share/locale/mr/LC_MESSAGES/gnucash.mo
-share/locale/nb/LC_MESSAGES/gnucash.mo
-share/locale/ne/LC_MESSAGES/gnucash.mo
-share/locale/nl/LC_MESSAGES/gnucash.mo
-share/locale/pl/LC_MESSAGES/gnucash.mo
-share/locale/pt/LC_MESSAGES/gnucash.mo
-share/locale/pt_BR/LC_MESSAGES/gnucash.mo
-share/locale/ro/LC_MESSAGES/gnucash.mo
-share/locale/ru/LC_MESSAGES/gnucash.mo
-share/locale/rw/LC_MESSAGES/gnucash.mo
-share/locale/sk/LC_MESSAGES/gnucash.mo
-share/locale/sr/LC_MESSAGES/gnucash.mo
-share/locale/sv/LC_MESSAGES/gnucash.mo
-share/locale/ta/LC_MESSAGES/gnucash.mo
-share/locale/te/LC_MESSAGES/gnucash.mo
-share/locale/tr/LC_MESSAGES/gnucash.mo
-share/locale/uk/LC_MESSAGES/gnucash.mo
-share/locale/ur/LC_MESSAGES/gnucash.mo
-share/locale/vi/LC_MESSAGES/gnucash.mo
-share/locale/zh_CN/LC_MESSAGES/gnucash.mo
-share/locale/zh_TW/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/as/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/az/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/brx/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/doi/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/el/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/es_NI/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/he/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/it/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/kn/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/kok/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/kok@latin/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ks/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/mai/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/mni/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/mni@bengali/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/te/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnucash.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/gnucash.mo