Update devel/gwenhywfar to 5.3.0 [1]

Update finance/aqbanking to 6.2.1
Fix gwenhywfar dependency in finance/gnucash

PR:		246812 [1]
Reported by:	Jens Grassel <freebsd-ports@jan0sch.de> [1]

5 files changed, 100 insertions, 207 deletions

diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 23c1654130cf..88658d0fe855 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	aqbanking
-PORTVERSION=	5.8.2
+PORTVERSION=	6.2.1
 CATEGORIES=	finance
-MASTER_SITES=	https://www.aquamaniac.de/rdm/attachments/download/107/
+MASTER_SITES=	https://www.aquamaniac.de/rdm/attachments/download/328/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Online banking interface and financial data framework
@@ -25,7 +25,7 @@ INSTALL_TARGET=	install-strip
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 
-AQB_SHLIB_VER=	35
+AQB_SHLIB_VER=	44
 PLIST_SUB=	AQB_SHLIB_VER="${AQB_SHLIB_VER}" \
 		AQB_MAJ_MIN_VER="${PORTVERSION:R}"
 
@@ -41,7 +41,7 @@ EBICS_DESC=		Enable EBICS backend
 EBICS_LIB_DEPENDS=	libxmlsec1.so:security/xmlsec1
 EBICS_USES=		gnome
 EBICS_USE=		GNOME=libxml2,libxslt
-EBICS_CONFIGURE_OFF=	--with-backends="aqhbci aqnone aqofxconnect aqpaypal"
+EBICS_CONFIGURE_OFF=	--with-backends="aqhbci aqofxconnect aqpaypal"
 
 KTOBLZCHECK_DESC=	Enable KtoBlzCheck support
 
diff --git a/finance/aqbanking/distinfo b/finance/aqbanking/distinfo
index 71baf07a86c6..0a8bd4bdcde7 100644
--- a/finance/aqbanking/distinfo
+++ b/finance/aqbanking/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577529990
-SHA256 (aqbanking-5.8.2.tar.gz) = 93ca523fe175e72042db75f8c3fc6255ab058cf82caf52796e15f030809fb15e
-SIZE (aqbanking-5.8.2.tar.gz) = 3824997
+TIMESTAMP = 1593353388
+SHA256 (aqbanking-6.2.1.tar.gz) = bab601bf7c3402912438aa2919cd84d498a65749238214fcf881d2a2cfea1fd4
+SIZE (aqbanking-6.2.1.tar.gz) = 2556774
diff --git a/finance/aqbanking/pkg-plist b/finance/aqbanking/pkg-plist
index 84fb2560367d..b1e04838912c 100644
--- a/finance/aqbanking/pkg-plist
+++ b/finance/aqbanking/pkg-plist
@@ -3,207 +3,62 @@ bin/aqbanking-config
 %%EBICS%%bin/aqebics-tool
 bin/aqhbci-tool4
 bin/aqpaypal-tool
-bin/hbcixml3
-include/aqbanking5/aqbanking/ab_accountqueue.h
-include/aqbanking5/aqbanking/ab_accountqueuefns.h
-include/aqbanking5/aqbanking/ab_jobqueue.h
-include/aqbanking5/aqbanking/ab_queue.h
-include/aqbanking5/aqbanking/ab_queuefns.h
-include/aqbanking5/aqbanking/ab_userqueue.h
-include/aqbanking5/aqbanking/ab_userqueuefns.h
-include/aqbanking5/aqbanking/abgui.h
-include/aqbanking5/aqbanking/account.h
-include/aqbanking5/aqbanking/account_be.h
-include/aqbanking5/aqbanking/accstatus.h
-include/aqbanking5/aqbanking/balance.h
-include/aqbanking5/aqbanking/bankinfo.h
-include/aqbanking5/aqbanking/bankinfoplugin.h
-include/aqbanking5/aqbanking/bankinfoplugin_be.h
-include/aqbanking5/aqbanking/bankinfoservice.h
-include/aqbanking5/aqbanking/banking.h
-include/aqbanking5/aqbanking/banking_be.h
-include/aqbanking5/aqbanking/banking_cfg.h
-include/aqbanking5/aqbanking/banking_imex.h
-include/aqbanking5/aqbanking/banking_info.h
-include/aqbanking5/aqbanking/banking_ob.h
-include/aqbanking5/aqbanking/banking_simple.h
-include/aqbanking5/aqbanking/banking_virt.h
-include/aqbanking5/aqbanking/cellphoneproduct.h
-include/aqbanking5/aqbanking/country.h
-include/aqbanking5/aqbanking/dlg_editaccount.h
-include/aqbanking5/aqbanking/dlg_edituser.h
-include/aqbanking5/aqbanking/dlg_importer.h
-include/aqbanking5/aqbanking/dlg_newaccount_be.h
-include/aqbanking5/aqbanking/dlg_newuser_be.h
-include/aqbanking5/aqbanking/dlg_selectbackend.h
-include/aqbanking5/aqbanking/dlg_selectbankinfo.h
-include/aqbanking5/aqbanking/dlg_setup.h
-include/aqbanking5/aqbanking/dlg_setup_newuser.h
-include/aqbanking5/aqbanking/dlg_usertype_page_be.h
-include/aqbanking5/aqbanking/error.h
-include/aqbanking5/aqbanking/eutransferinfo.h
-include/aqbanking5/aqbanking/httpsession.h
-include/aqbanking5/aqbanking/imexporter.h
-include/aqbanking5/aqbanking/imexporter_be.h
-include/aqbanking5/aqbanking/job.h
-include/aqbanking5/aqbanking/job_be.h
-include/aqbanking5/aqbanking/jobcreatedatedtransfer.h
-include/aqbanking5/aqbanking/jobcreatedatedtransfer_be.h
-include/aqbanking5/aqbanking/jobcreatesto.h
-include/aqbanking5/aqbanking/jobcreatesto_be.h
-include/aqbanking5/aqbanking/jobdeletedatedtransfer.h
-include/aqbanking5/aqbanking/jobdeletedatedtransfer_be.h
-include/aqbanking5/aqbanking/jobdeletesto.h
-include/aqbanking5/aqbanking/jobdeletesto_be.h
-include/aqbanking5/aqbanking/jobeutransfer.h
-include/aqbanking5/aqbanking/jobeutransfer_be.h
-include/aqbanking5/aqbanking/jobgetbalance.h
-include/aqbanking5/aqbanking/jobgetbalance_be.h
-include/aqbanking5/aqbanking/jobgetdatedtransfers.h
-include/aqbanking5/aqbanking/jobgetdatedtransfers_be.h
-include/aqbanking5/aqbanking/jobgetstandingorders.h
-include/aqbanking5/aqbanking/jobgetstandingorders_be.h
-include/aqbanking5/aqbanking/jobgettransactions.h
-include/aqbanking5/aqbanking/jobgettransactions_be.h
-include/aqbanking5/aqbanking/jobinternaltransfer.h
-include/aqbanking5/aqbanking/jobinternaltransfer_be.h
-include/aqbanking5/aqbanking/jobloadcellphone.h
-include/aqbanking5/aqbanking/jobloadcellphone_be.h
-include/aqbanking5/aqbanking/jobmodifydatedtransfer.h
-include/aqbanking5/aqbanking/jobmodifydatedtransfer_be.h
-include/aqbanking5/aqbanking/jobmodifysto.h
-include/aqbanking5/aqbanking/jobmodifysto_be.h
-include/aqbanking5/aqbanking/jobsepadebitnote.h
-include/aqbanking5/aqbanking/jobsepadebitnote_be.h
-include/aqbanking5/aqbanking/jobsepaflashdebitnote.h
-include/aqbanking5/aqbanking/jobsepagetstandingorders.h
-include/aqbanking5/aqbanking/jobsepatransfer.h
-include/aqbanking5/aqbanking/jobsepatransfer_be.h
-include/aqbanking5/aqbanking/jobsingledebitnote.h
-include/aqbanking5/aqbanking/jobsingledebitnote_be.h
-include/aqbanking5/aqbanking/jobsingletransfer.h
-include/aqbanking5/aqbanking/jobsingletransfer_be.h
-include/aqbanking5/aqbanking/message.h
-include/aqbanking5/aqbanking/msgengine.h
-include/aqbanking5/aqbanking/provider.h
-include/aqbanking5/aqbanking/provider_be.h
-include/aqbanking5/aqbanking/security.h
-include/aqbanking5/aqbanking/system.h
-include/aqbanking5/aqbanking/textkeydescr.h
-include/aqbanking5/aqbanking/transaction.h
-include/aqbanking5/aqbanking/transactionfns.h
-include/aqbanking5/aqbanking/transactionlimits.h
-include/aqbanking5/aqbanking/user.h
-include/aqbanking5/aqbanking/userfns.h
-include/aqbanking5/aqbanking/value.h
-include/aqbanking5/aqbanking/version.h
-include/aqbanking5/aqbankingpp/accountstatus.hpp
-include/aqbanking5/aqbankingpp/aqbankingppdecl.hpp
-include/aqbanking5/aqbankingpp/balance.hpp
-include/aqbanking5/aqbankingpp/cxxwrap.hpp
-include/aqbanking5/aqbankingpp/stringlist.hpp
-include/aqbanking5/aqbankingpp/time.hpp
-include/aqbanking5/aqbankingpp/value.hpp
-include/aqbanking5/aqhbci/account.h
-include/aqbanking5/aqhbci/aqhbci.h
-include/aqbanking5/aqhbci/msgengine.h
-include/aqbanking5/aqhbci/provider.h
-include/aqbanking5/aqhbci/tanmethod.h
-include/aqbanking5/aqhbci/user.h
-include/aqbanking5/aqofxconnect/account.h
-include/aqbanking5/aqofxconnect/aqofxconnect.h
-include/aqbanking5/aqofxconnect/dlg_getinst.h
-include/aqbanking5/aqofxconnect/ofxhome.h
-include/aqbanking5/aqofxconnect/oh_institute_data.h
-include/aqbanking5/aqofxconnect/oh_institute_data_fns.h
-include/aqbanking5/aqofxconnect/oh_institute_spec.h
-include/aqbanking5/aqofxconnect/oh_institute_spec_fns.h
-include/aqbanking5/aqofxconnect/provider.h
-include/aqbanking5/aqofxconnect/user.h
-include/aqbanking5/aqofxconnect/version.h
-%%EBICS%%include/aqebics/aqebics.h
-%%EBICS%%include/aqebics/client/account.h
-%%EBICS%%include/aqebics/client/provider.h
-%%EBICS%%include/aqebics/client/user.h
-include/aqpaypal/aqpaypal.h
-include/aqpaypal/provider.h
-include/aqpaypal/user.h
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/at.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/at.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ca.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ca.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ch.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ch.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/de.so
+include/aqbanking6/aqbanking/account_type.h
+include/aqbanking6/aqbanking/banking.h
+include/aqbanking6/aqbanking/banking_bankinfo.h
+include/aqbanking6/aqbanking/banking_dialogs.h
+include/aqbanking6/aqbanking/banking_imex.h
+include/aqbanking6/aqbanking/banking_online.h
+include/aqbanking6/aqbanking/banking_transaction.h
+include/aqbanking6/aqbanking/error.h
+include/aqbanking6/aqbanking/gui/abgui.h
+include/aqbanking6/aqbanking/system.h
+include/aqbanking6/aqbanking/types/account_spec.h
+include/aqbanking6/aqbanking/types/balance.h
+include/aqbanking6/aqbanking/types/bankinfo.h
+include/aqbanking6/aqbanking/types/bankinfoservice.h
+include/aqbanking6/aqbanking/types/document.h
+include/aqbanking6/aqbanking/types/imexporter_accountinfo.h
+include/aqbanking6/aqbanking/types/imexporter_context.h
+include/aqbanking6/aqbanking/types/message.h
+include/aqbanking6/aqbanking/types/security.h
+include/aqbanking6/aqbanking/types/transaction.h
+include/aqbanking6/aqbanking/types/transactionlimits.h
+include/aqbanking6/aqbanking/types/value.h
+include/aqbanking6/aqbanking/version.h
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/de.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/dbio/dtaus.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/dbio/dtaus.xml
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/dbio/swift.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/dbio/swift.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.so
+lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/camt.xml
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ctxfile.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ctxfile.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/dtaus.so
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/dtaus.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/eri2.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/eri2.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ofx.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ofx.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/openhbci1.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/openhbci1.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/q43.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/q43.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/sepa.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/sepa.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/swift.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/swift.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xmldb.so
+lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xml.xml
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xmldb.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.xml
-%%EBICS%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqebics.so
 %%EBICS%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqebics.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqhbci.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqhbci.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqnone.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqnone.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqofxconnect.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqofxconnect.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.xml
 lib/cmake/aqbanking-%%AQB_MAJ_MIN_VER%%/aqbanking-config-version.cmake
 lib/cmake/aqbanking-%%AQB_MAJ_MIN_VER%%/aqbanking-config.cmake
 lib/libaqbanking.so
 lib/libaqbanking.so.%%AQB_SHLIB_VER%%
-lib/libaqbanking.so.%%AQB_SHLIB_VER%%.7.10
-lib/libaqbankingpp.so
-lib/libaqbankingpp.so.0
-lib/libaqbankingpp.so.0.0.0
-%%EBICS%%lib/libaqebics.so
-%%EBICS%%lib/libaqebics.so.0
-%%EBICS%%lib/libaqebics.so.0.0.0
-lib/libaqhbci.so
-lib/libaqhbci.so.24
-lib/libaqhbci.so.24.0.1
-lib/libaqnone.so
-lib/libaqnone.so.%%AQB_SHLIB_VER%%
-lib/libaqnone.so.%%AQB_SHLIB_VER%%.7.10
-lib/libaqofxconnect.so
-lib/libaqofxconnect.so.7
-lib/libaqofxconnect.so.7.0.2
-lib/libaqpaypal.so
-lib/libaqpaypal.so.0
-lib/libaqpaypal.so.0.0.0
+lib/libaqbanking.so.%%AQB_SHLIB_VER%%.2.1
 libdata/pkgconfig/aqbanking.pc
 share/aclocal/aqbanking.m4
 %%DATADIR%%/aqbanking/typemaker2/c/ab_account.tm2
-%%DATADIR%%/aqbanking/typemaker2/c/ab_job.tm2
-%%DATADIR%%/aqbanking/typemaker2/c/ab_job_list.tm2
-%%DATADIR%%/aqbanking/typemaker2/c/ab_job_list2.tm2
+%%DATADIR%%/aqbanking/typemaker2/c/ab_provider.tm2
 %%DATADIR%%/aqbanking/typemaker2/c/ab_user.tm2
+%%DATADIR%%/aqbanking/typemaker2/c/ab_value.tm2
+%%DATADIR%%/aqbanking/typemaker2/c/ab_value_list.tm2
+%%DATADIR%%/aqbanking/typemaker2/c/ab_value_list2.tm2
 %%EBICS%%%%DATADIR%%/backends/aqebics/dialogs/dlg_edituser.dlg
 %%EBICS%%%%DATADIR%%/backends/aqebics/dialogs/dlg_newkeyfile.dlg
 %%EBICS%%%%DATADIR%%/backends/aqebics/dialogs/dlg_user_special.dlg
@@ -220,6 +75,7 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/backends/aqhbci/dialogs/dlg_newuser.dlg
 %%DATADIR%%/backends/aqhbci/dialogs/dlg_pintan.dlg
 %%DATADIR%%/backends/aqhbci/dialogs/dlg_pintan_special.dlg
+%%DATADIR%%/backends/aqhbci/dialogs/dlg_pintan_tanmode.dlg
 %%DATADIR%%/backends/aqhbci/dialogs/dlg_rdh_special.dlg
 %%DATADIR%%/backends/aqhbci/dialogs/dlg_zkacard.dlg
 %%DATADIR%%/backends/aqhbci/dialogs/keyfile.png
@@ -232,26 +88,10 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/backends/aqpaypal/dialogs/dlg_editsecret.dlg
 %%DATADIR%%/backends/aqpaypal/dialogs/dlg_edituser.dlg
 %%DATADIR%%/backends/aqpaypal/dialogs/dlg_newuser.dlg
-%%DATADIR%%/bankinfo/at/banks.data
-%%DATADIR%%/bankinfo/at/bic.idx
-%%DATADIR%%/bankinfo/at/blz.idx
-%%DATADIR%%/bankinfo/at/namloc.idx
-%%DATADIR%%/bankinfo/ca/banks.data
-%%DATADIR%%/bankinfo/ca/bic.idx
-%%DATADIR%%/bankinfo/ca/blz.idx
-%%DATADIR%%/bankinfo/ca/namloc.idx
-%%DATADIR%%/bankinfo/ch/banks.data
-%%DATADIR%%/bankinfo/ch/bic.idx
-%%DATADIR%%/bankinfo/ch/blz.idx
-%%DATADIR%%/bankinfo/ch/namloc.idx
 %%DATADIR%%/bankinfo/de/banks.data
 %%DATADIR%%/bankinfo/de/bic.idx
 %%DATADIR%%/bankinfo/de/blz.idx
 %%DATADIR%%/bankinfo/de/namloc.idx
-%%DATADIR%%/bankinfo/us/banks.data
-%%DATADIR%%/bankinfo/us/bic.idx
-%%DATADIR%%/bankinfo/us/blz.idx
-%%DATADIR%%/bankinfo/us/namloc.idx
 %%DATADIR%%/dialogs/dlg_editaccount.dlg
 %%DATADIR%%/dialogs/dlg_edituser.dlg
 %%DATADIR%%/dialogs/dlg_importer.dlg
@@ -260,6 +100,8 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/dialogs/dlg_setup.dlg
 %%DATADIR%%/dialogs/dlg_setup_newuser.dlg
 %%DATADIR%%/dialogs/dlg_usertype_pagedefault.dlg
+%%DATADIR%%/imexporters/camt/profiles/052_001_02.conf
+%%DATADIR%%/imexporters/camt/profiles/default.conf
 %%DATADIR%%/imexporters/csv/dialogs/csv_editprofile.dlg
 %%DATADIR%%/imexporters/csv/profiles/amex.conf
 %%DATADIR%%/imexporters/csv/profiles/aqmoney1.conf
@@ -273,6 +115,7 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/imexporters/csv/profiles/dkb-cash.conf
 %%DATADIR%%/imexporters/csv/profiles/dkb.conf
 %%DATADIR%%/imexporters/csv/profiles/full.conf
+%%DATADIR%%/imexporters/csv/profiles/homebank.conf
 %%DATADIR%%/imexporters/csv/profiles/hypovereinsbank.conf
 %%DATADIR%%/imexporters/csv/profiles/lbbberlin.conf
 %%DATADIR%%/imexporters/csv/profiles/mijnpostbank.conf
@@ -283,14 +126,12 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/imexporters/csv/profiles/sns.conf
 %%DATADIR%%/imexporters/csv/profiles/sparda.conf
 %%DATADIR%%/imexporters/csv/profiles/spk-aachen.conf
+%%DATADIR%%/imexporters/csv/profiles/spk-mainz.conf
 %%DATADIR%%/imexporters/csv/profiles/spk-steiermark.conf
 %%DATADIR%%/imexporters/csv/profiles/tonline-banking.conf
 %%DATADIR%%/imexporters/csv/profiles/transfers.conf
 %%DATADIR%%/imexporters/csv/profiles/vrnetworld.conf
 %%DATADIR%%/imexporters/ctxfile/profiles/default.conf
-%%DATADIR%%/imexporters/dtaus/profiles/debitnote.conf
-%%DATADIR%%/imexporters/dtaus/profiles/default.conf
-%%DATADIR%%/imexporters/dtaus/profiles/transfer.conf
 %%DATADIR%%/imexporters/eri/profiles/default.conf
 %%DATADIR%%/imexporters/eri2/eriformat.xml
 %%DATADIR%%/imexporters/ofx/profiles/default.conf
@@ -309,16 +150,69 @@ share/aclocal/aqbanking.m4
 %%DATADIR%%/imexporters/swift/profiles/swiftmt535.conf
 %%DATADIR%%/imexporters/swift/profiles/swiftmt940.conf
 %%DATADIR%%/imexporters/swift/profiles/swiftmt942.conf
+%%DATADIR%%/imexporters/xml/data/camt_052_001_02.xml
+%%DATADIR%%/imexporters/xml/data/camt_053_001_04.xml
+%%DATADIR%%/imexporters/xml/data/ofx2.xml
+%%DATADIR%%/imexporters/xml/data/pain_001_001_03.xml
+%%DATADIR%%/imexporters/xml/data/pain_001_003_03.xml
+%%DATADIR%%/imexporters/xml/data/pain_008_001_02.xml
+%%DATADIR%%/imexporters/xml/data/pain_008_003_02.xml
+%%DATADIR%%/imexporters/xml/profiles/camt_052_001_02.conf
+%%DATADIR%%/imexporters/xml/profiles/camt_053_001_04.conf
+%%DATADIR%%/imexporters/xml/profiles/default.conf
+%%DATADIR%%/imexporters/xml/profiles/ofx2.conf
+%%DATADIR%%/imexporters/xml/profiles/pain_001_001_03.conf
+%%DATADIR%%/imexporters/xml/profiles/pain_001_003_03.conf
+%%DATADIR%%/imexporters/xml/profiles/pain_008_001_02.conf
+%%DATADIR%%/imexporters/xml/profiles/pain_008_003_02.conf
+%%DATADIR%%/imexporters/xml/profiles/sepa.conf
 %%DATADIR%%/imexporters/xmldb/profiles/default.conf
 %%DATADIR%%/imexporters/yellownet/profiles/default.conf
+%%DATADIR%%/typemaker2/c/ab_account.tm2
+%%DATADIR%%/typemaker2/c/ab_account_list.tm2
+%%DATADIR%%/typemaker2/c/ab_account_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_account_spec.tm2
+%%DATADIR%%/typemaker2/c/ab_account_spec_list.tm2
+%%DATADIR%%/typemaker2/c/ab_account_spec_list2.tm2
 %%DATADIR%%/typemaker2/c/ab_accountqueue.tm2
 %%DATADIR%%/typemaker2/c/ab_accountqueue_list.tm2
+%%DATADIR%%/typemaker2/c/ab_balance.tm2
+%%DATADIR%%/typemaker2/c/ab_balance_list.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo_list.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo_service.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo_service_list.tm2
+%%DATADIR%%/typemaker2/c/ab_bankinfo_service_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_document.tm2
+%%DATADIR%%/typemaker2/c/ab_document_list.tm2
+%%DATADIR%%/typemaker2/c/ab_document_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_accountinfo.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_accountinfo_list.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_accountinfo_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_context.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_context_list.tm2
+%%DATADIR%%/typemaker2/c/ab_imexporter_context_list2.tm2
 %%DATADIR%%/typemaker2/c/ab_jobqueue.tm2
 %%DATADIR%%/typemaker2/c/ab_jobqueue_list.tm2
+%%DATADIR%%/typemaker2/c/ab_message.tm2
+%%DATADIR%%/typemaker2/c/ab_message_list.tm2
+%%DATADIR%%/typemaker2/c/ab_message_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_providerqueue.tm2
+%%DATADIR%%/typemaker2/c/ab_providerqueue_list.tm2
 %%DATADIR%%/typemaker2/c/ab_queue.tm2
+%%DATADIR%%/typemaker2/c/ab_security.tm2
+%%DATADIR%%/typemaker2/c/ab_security_list.tm2
+%%DATADIR%%/typemaker2/c/ab_security_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction_limits.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction_limits_list.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction_limits_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction_list.tm2
+%%DATADIR%%/typemaker2/c/ab_transaction_list2.tm2
+%%DATADIR%%/typemaker2/c/ab_user.tm2
+%%DATADIR%%/typemaker2/c/ab_user_list.tm2
+%%DATADIR%%/typemaker2/c/ab_user_list2.tm2
 %%DATADIR%%/typemaker2/c/ab_userqueue.tm2
 %%DATADIR%%/typemaker2/c/ab_userqueue_list.tm2
-%%EBICS%%share/doc/aqebics/aqebics-tool/README
-share/doc/aqhbci/aqhbci-tool/README
-share/doc/aqpaypal/aqpaypal-tool/README
 share/locale/de/LC_MESSAGES/aqbanking.mo
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index ef7bd56f0e9f..5108b25a8165 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnucash
 PORTVERSION=	3.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -70,7 +70,7 @@ OFX_DESC=	OFX support
 OPTIONS_SUB=		yes
 AQBANKING_CMAKE_BOOL=	WITH_AQBANKING
 AQBANKING_LIB_DEPENDS=	libgwenhywfar.so:devel/gwenhywfar \
-			libgwenhywfar.so:devel/gwenhywfar \
+			libgwengui-gtk3.so:devel/gwenhywfar-gtk3 \
 			libktoblzcheck.so:finance/ktoblzcheck \
 			libaqbanking.so:finance/aqbanking
 AQBANKING_VARS=		GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml
diff --git a/finance/gnucash/pkg-plist b/finance/gnucash/pkg-plist
index 77dc525a8311..1f1300d141ec 100644
--- a/finance/gnucash/pkg-plist
+++ b/finance/gnucash/pkg-plist
@@ -406,7 +406,6 @@ lib/libgnc-backend-xml-utils.so
 lib/libgnc-core-utils.so
 lib/libgnc-gnome.so
 lib/libgnc-module.so
-%%AQBANKING%%lib/libgwengui-gtk3.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gnucash/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc