2 files changed, 11 insertions, 63 deletions

diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index ae132856c6b1..374eb420f82a 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	aqbanking
 PORTVERSION=	5.0.25
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=/
 
@@ -15,13 +15,13 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	libgwenhywfar.so:${PORTSDIR}/devel/gwenhywfar \
 		libgmp.so:${PORTSDIR}/math/gmp
 
-USE_AUTOTOOLS=	libtool
-USES=		pathfix pkgconfig gettext gmake
+USES=		pathfix pkgconfig gettext gmake libtool
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-lintl
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_SUB=	AQB_SHLIB_VER="${AQB_SHLIB_VER}" \
@@ -31,6 +31,8 @@ USE_LDCONFIG=	yes
 AQB_SHLIB_VER=	34
 GWEN_SHLIB_VER=	60
 
+PORTDOCS=	*
+
 OPTIONS_DEFINE=		DOXYGEN KTOBLZCHECK PAYPAL
 OPTIONS_DEFAULT=	KTOBLZCHECK
 OPTIONS_SUB=		yes
@@ -60,10 +62,6 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/apidoc
 	cd ${WRKSRC}/apidoc && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/apidoc
-	@${FIND} -P ${STAGEDIR}${DOCSDIR} -type f 2>/dev/null | \
-		${SED} -ne 's|^${STAGEDIR}${PREFIX}/||p' >> ${TMPPLIST}
-	@${FIND} -P -d ${STAGEDIR}${DOCSDIR} -type d 2>/dev/null | \
-		${SED} -ne 's|^${STAGEDIR}${PREFIX}/|@dirrm |p' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>
diff --git a/finance/aqbanking/pkg-plist b/finance/aqbanking/pkg-plist
index 6914b8227359..779aa655dee6 100644
--- a/finance/aqbanking/pkg-plist
+++ b/finance/aqbanking/pkg-plist
@@ -121,118 +121,68 @@ include/aqbanking5/aqofxconnect/version.h
 %%PAYPAL%%include/aqpaypal/aqpaypal.h
 %%PAYPAL%%include/aqpaypal/provider.h
 %%PAYPAL%%include/aqpaypal/user.h
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/at.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/at.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ca.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/ch.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/de.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/de.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/de.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/bankinfo/us.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/csv.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ctxfile.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ctxfile.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/dtaus.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/eri2.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/ofx.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/openhbci1.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/q43.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/sepa.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/swift.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xmldb.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xmldb.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/xmldb.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/imexporters/yellownet.xml
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqhbci.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqhbci.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqnone.la
 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.a
-lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqofxconnect.la
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqofxconnect.so
 lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqofxconnect.xml
-%%PAYPAL%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.a
-%%PAYPAL%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.la
 %%PAYPAL%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.so
 %%PAYPAL%%lib/aqbanking/plugins/%%AQB_SHLIB_VER%%/providers/aqpaypal.xml
-lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/dtaus.a
-lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/dtaus.la
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/dtaus.so
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/dtaus.xml
-lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/swift.a
-lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/swift.la
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/swift.so
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/swift.xml
-lib/libaqbanking.a
-lib/libaqbanking.la
 lib/libaqbanking.so
 lib/libaqbanking.so.%%AQB_SHLIB_VER%%
-lib/libaqbankingpp.a
-lib/libaqbankingpp.la
+lib/libaqbanking.so.%%AQB_SHLIB_VER%%.0.25
 lib/libaqbankingpp.so
 lib/libaqbankingpp.so.0
-lib/libaqhbci.a
-lib/libaqhbci.la
+lib/libaqbankingpp.so.0.0.0
 lib/libaqhbci.so
 lib/libaqhbci.so.20
-lib/libaqnone.a
-lib/libaqnone.la
+lib/libaqhbci.so.20.0.4
 lib/libaqnone.so
 lib/libaqnone.so.%%AQB_SHLIB_VER%%
-lib/libaqofxconnect.a
-lib/libaqofxconnect.la
+lib/libaqnone.so.%%AQB_SHLIB_VER%%.0.25
 lib/libaqofxconnect.so
 lib/libaqofxconnect.so.7
-%%PAYPAL%%lib/libaqpaypal.a
-%%PAYPAL%%lib/libaqpaypal.la
+lib/libaqofxconnect.so.7.0.2
 %%PAYPAL%%lib/libaqpaypal.so
 %%PAYPAL%%lib/libaqpaypal.so.0
+%%PAYPAL%%lib/libaqpaypal.so.0.0.0
 libdata/pkgconfig/aqbanking.pc
 share/aclocal/aqbanking.m4
 share/aqbanking/aqbanking/typemaker2/c/ab_account.tm2