Conversion to a single libtool environment.

Approved by:	portmgr (kris)

17 files changed, 85 insertions, 24 deletions

diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index e271c658ff8b..12c3ea1e2fbf 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aqbanking
 PORTVERSION=	1.0.11
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	aqbanking
@@ -21,7 +22,6 @@ OPTIONS=	OFX		"LibOFX support"	off	\
 
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/finance/aqbanking/pkg-plist b/finance/aqbanking/pkg-plist
index 7e36124f96d8..14120c973e68 100644
--- a/finance/aqbanking/pkg-plist
+++ b/finance/aqbanking/pkg-plist
@@ -43,47 +43,59 @@ include/aqbanking/transaction.h
 include/aqbanking/transactionlimits.h
 include/aqbanking/value.h
 include/aqbanking/version.h
+lib/aqbanking/plugins/0/bankinfo/at.la
 lib/aqbanking/plugins/0/bankinfo/at.so
 lib/aqbanking/plugins/0/bankinfo/at.so.0
 lib/aqbanking/plugins/0/bankinfo/at.xml
+lib/aqbanking/plugins/0/bankinfo/ch.la
 lib/aqbanking/plugins/0/bankinfo/ch.so
 lib/aqbanking/plugins/0/bankinfo/ch.so.0
 lib/aqbanking/plugins/0/bankinfo/ch.xml
+lib/aqbanking/plugins/0/bankinfo/de.la
 lib/aqbanking/plugins/0/bankinfo/de.so
 lib/aqbanking/plugins/0/bankinfo/de.so.0
 lib/aqbanking/plugins/0/bankinfo/de.xml
+lib/aqbanking/plugins/0/bankinfo/us.la
 lib/aqbanking/plugins/0/bankinfo/us.so
 lib/aqbanking/plugins/0/bankinfo/us.so.0
 lib/aqbanking/plugins/0/bankinfo/us.xml
+lib/aqbanking/plugins/0/imexporters/csv.la
 lib/aqbanking/plugins/0/imexporters/csv.so
 lib/aqbanking/plugins/0/imexporters/csv.so.0
 lib/aqbanking/plugins/0/imexporters/csv.xml
 lib/aqbanking/plugins/0/imexporters/dbio.xml
+lib/aqbanking/plugins/0/imexporters/dtaus.la
 lib/aqbanking/plugins/0/imexporters/dtaus.so
 lib/aqbanking/plugins/0/imexporters/dtaus.so.0
 lib/aqbanking/plugins/0/imexporters/dtaus.xml
+%%OFX%%lib/aqbanking/plugins/0/imexporters/ofx.la
 %%OFX%%lib/aqbanking/plugins/0/imexporters/ofx.so
 %%OFX%%lib/aqbanking/plugins/0/imexporters/ofx.so.0
 %%OFX%%lib/aqbanking/plugins/0/imexporters/ofx.xml
+lib/aqbanking/plugins/0/imexporters/openhbci1.la
 lib/aqbanking/plugins/0/imexporters/openhbci1.so
 lib/aqbanking/plugins/0/imexporters/openhbci1.so.0
 lib/aqbanking/plugins/0/imexporters/openhbci1.xml
+lib/aqbanking/plugins/0/imexporters/qif.la
 lib/aqbanking/plugins/0/imexporters/qif.so
 lib/aqbanking/plugins/0/imexporters/qif.so.0
 lib/aqbanking/plugins/0/imexporters/qif.xml
+lib/aqbanking/plugins/0/imexporters/swift.la
 lib/aqbanking/plugins/0/imexporters/swift.so
 lib/aqbanking/plugins/0/imexporters/swift.so.0
 lib/aqbanking/plugins/0/imexporters/swift.xml
+lib/gwenhywfar/plugins/17/dbio/dtaus.la
 lib/gwenhywfar/plugins/17/dbio/dtaus.so
 lib/gwenhywfar/plugins/17/dbio/dtaus.so.0
 lib/gwenhywfar/plugins/17/dbio/dtaus.xml
+lib/gwenhywfar/plugins/17/dbio/swift.la
 lib/gwenhywfar/plugins/17/dbio/swift.so
 lib/gwenhywfar/plugins/17/dbio/swift.so.0
 lib/gwenhywfar/plugins/17/dbio/swift.xml
-lib/libaqbanking.a
+lib/libaqbanking.la
 lib/libaqbanking.so
 lib/libaqbanking.so.5
-lib/libaqbankingpp.a
+lib/libaqbankingpp.la
 lib/libaqbankingpp.so
 lib/libaqbankingpp.so.0
 share/aclocal/aqbanking.m4
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 2e95a742630d..1030908c3968 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnofin
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	Light-weight GNOME based financial management program
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/finance/gnofin/pkg-plist b/finance/gnofin/pkg-plist
index acf4aead69f9..7c6d384afcd4 100644
--- a/finance/gnofin/pkg-plist
+++ b/finance/gnofin/pkg-plist
@@ -1,19 +1,27 @@
 bin/gnofin
 lib/gnofin/plugins/libcbb.a
+lib/gnofin/plugins/libcbb.la
 lib/gnofin/plugins/libcbb.so
 lib/gnofin/plugins/libfind.a
+lib/gnofin/plugins/libfind.la
 lib/gnofin/plugins/libfind.so
 lib/gnofin/plugins/libhtml.a
+lib/gnofin/plugins/libhtml.la
 lib/gnofin/plugins/libhtml.so
 lib/gnofin/plugins/liblatex.a
+lib/gnofin/plugins/liblatex.la
 lib/gnofin/plugins/liblatex.so
 lib/gnofin/plugins/libqif.a
+lib/gnofin/plugins/libqif.la
 lib/gnofin/plugins/libqif.so
 lib/gnofin/plugins/libreconcile.a
+lib/gnofin/plugins/libreconcile.la
 lib/gnofin/plugins/libreconcile.so
 lib/gnofin/plugins/libsched.a
+lib/gnofin/plugins/libsched.la
 lib/gnofin/plugins/libsched.so
 lib/gnofin/plugins/libtext.a
+lib/gnofin/plugins/libtext.la
 lib/gnofin/plugins/libtext.so
 share/gnome/apps/Applications/gnofin.desktop
 share/locale/cs/LC_MESSAGES/gnofin.mo
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index d8759d5e76f4..17b342a6f1f0 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	KDE currency converter
 
-USE_KDELIBS_VER=	3
-GNU_CONFIGURE=		yes
-USE_REINPLACE=		yes
+USE_KDELIBS_VER=3
+USE_AUTOTOOLS=	libtool:15
+USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 5afbdaa47f23..1434ff864fd5 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -17,11 +17,10 @@ COMMENT=	Simple KDE-base financial manager
 LIB_DEPENDS=	qhacc.7:${PORTSDIR}/finance/qhacc
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USE_KDELIBS_VER=	3
-USE_PERL5_BUILD=	yes
+USE_KDELIBS_VER=3
+USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19:env autoconf:259:env
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	automake:19:env autoconf:259:env libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qhacc-config=${X11BASE}/bin
 MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index a81bd074121d..0b558be20557 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmymoney2
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,10 +17,9 @@ COMMENT=	KDE-based personal finance assistant
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_AUTOTOOLS=		libtool:15
 USE_PERL5=		yes
 USE_BZIP2=		yes
-USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 
 MAN1=			kmymoney2.1
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index c9cdca72dc5b..bdd1f22db8a6 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -30,9 +30,11 @@ include/kmymoney/mymoneyutils.h
 include/kmymoney/statementinterface.h
 include/kmymoney/viewinterface.h
 lib/libkmm_mymoney.a
-lib/libkmm_plugin.a
+lib/libkmm_mymoney.la
 lib/libkmm_mymoney.so
 lib/libkmm_mymoney.so.1
+lib/libkmm_plugin.a
+lib/libkmm_plugin.la
 lib/libkmm_plugin.so
 lib/libkmm_plugin.so.0
 share/applications/kde/kmymoney2.desktop
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index a81bd074121d..0b558be20557 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmymoney2
 PORTVERSION=	0.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,10 +17,9 @@ COMMENT=	KDE-based personal finance assistant
 
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
+USE_AUTOTOOLS=		libtool:15
 USE_PERL5=		yes
 USE_BZIP2=		yes
-USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=		yes
 
 MAN1=			kmymoney2.1
diff --git a/finance/kmymoney2/pkg-plist b/finance/kmymoney2/pkg-plist
index c9cdca72dc5b..bdd1f22db8a6 100644
--- a/finance/kmymoney2/pkg-plist
+++ b/finance/kmymoney2/pkg-plist
@@ -30,9 +30,11 @@ include/kmymoney/mymoneyutils.h
 include/kmymoney/statementinterface.h
 include/kmymoney/viewinterface.h
 lib/libkmm_mymoney.a
-lib/libkmm_plugin.a
+lib/libkmm_mymoney.la
 lib/libkmm_mymoney.so
 lib/libkmm_mymoney.so.1
+lib/libkmm_plugin.a
+lib/libkmm_plugin.la
 lib/libkmm_plugin.so
 lib/libkmm_plugin.so.0
 share/applications/kde/kmymoney2.desktop
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index 91b1472abc9d..31858b5fc505 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ktoblzcheck
 PORTVERSION=	1.9
+PORTREVISION=	1
 CATEGORIES=	finance german
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/finance/ktoblzcheck/pkg-plist b/finance/ktoblzcheck/pkg-plist
index 6b52a8325a95..4e0c057f07db 100644
--- a/finance/ktoblzcheck/pkg-plist
+++ b/finance/ktoblzcheck/pkg-plist
@@ -2,6 +2,7 @@ bin/ktoblzcheck
 include/iban.h
 include/ktoblzcheck.h
 lib/libktoblzcheck.a
+lib/libktoblzcheck.la
 lib/libktoblzcheck.so
 lib/libktoblzcheck.so.4
 %%PYTHON_SITELIBDIR%%/ktoblzcheck.py
diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile
index 23041008a7c3..69856475f2ea 100644
--- a/finance/libofx/Makefile
+++ b/finance/libofx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libofx
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +21,7 @@ LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl \
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
 USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--disable-doxygen --disable-dot --disable-gengetopt \
 		--with-opensp-includes=${LOCALBASE}/include/OpenSP
diff --git a/finance/libofx/pkg-plist b/finance/libofx/pkg-plist
index 3fcbd521bc78..edca46ee0b52 100644
--- a/finance/libofx/pkg-plist
+++ b/finance/libofx/pkg-plist
@@ -3,6 +3,7 @@ bin/ofxconnect
 bin/ofxdump
 include/libofx/libofx.h
 lib/libofx.a
+lib/libofx.la
 lib/libofx.so
 lib/libofx.so.2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 3d039a5b4c28..a8273b8d93ac 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -18,7 +18,6 @@ WRKSRC=			${WRKDIR}/${PORTNAME}-0.9.17
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=		yes
-USE_AUTOTOOLS=	libtool:15:inc
 
 .include <bsd.port.pre.mk>
 
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index c40ae044d97c..d3df6c93bdab 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +21,7 @@ USE_QT_VER=	3
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-qt-moc=${QT_PREFIX}/bin \
 		--with-qt-libs=${QT_PREFIX}/lib
diff --git a/finance/qhacc/pkg-plist b/finance/qhacc/pkg-plist
index 30229182bbbb..561cc93346cb 100644
--- a/finance/qhacc/pkg-plist
+++ b/finance/qhacc/pkg-plist
@@ -16,114 +16,151 @@ include/resultset.h
 include/sqldbplugin.h
 include/tableops.h
 lib/libacct.a
+lib/libacct.la
 lib/libacct.so
 lib/libacct.so.1
 lib/libarcio.a
+lib/libarcio.la
 lib/libarcio.so
 lib/libarcio.so.2
 lib/libaves.a
+lib/libaves.la
 lib/libaves.so
 lib/libaves.so.1
 lib/libbalances.a
+lib/libbalances.la
 lib/libbalances.so
 lib/libbalances.so.1
 lib/libbudget.a
+lib/libbudget.la
 lib/libbudget.so
 lib/libbudget.so.1
 lib/libcliimpio.a
+lib/libcliimpio.la
 lib/libcliimpio.so
 lib/libcliimpio.so.2
 lib/libdbbase.a
+lib/libdbbase.la
 lib/libdbbase.so
 lib/libdbbase.so.7
 lib/libdeltas.a
+lib/libdeltas.la
 lib/libdeltas.so
 lib/libdeltas.so.1
 lib/libdoublebargraph.a
+lib/libdoublebargraph.la
 lib/libdoublebargraph.so
 lib/libdoublebargraph.so.1
 lib/libdoublelinegraph.a
+lib/libdoublelinegraph.la
 lib/libdoublelinegraph.so
 lib/libdoublelinegraph.so.1
 lib/libextprgio.a
+lib/libextprgio.la
 lib/libextprgio.so
 lib/libextprgio.so.2
 lib/libfiledbio.a
+lib/libfiledbio.la
 lib/libfiledbio.so
 lib/libfiledbio.so.7
 %%GENERATOR%%lib/libgenio.a
+%%GENERATOR%%lib/libgenio.la
 %%GENERATOR%%lib/libgenio.so
 %%GENERATOR%%lib/libgenio.so.1
 %%GPGME%%lib/libgpgio.a
+%%GPGME%%lib/libgpgio.la
 %%GPGME%%lib/libgpgio.so
 %%GPGME%%lib/libgpgio.so.2
 lib/libgraphbase.a
+lib/libgraphbase.la
 lib/libgraphbase.so
 lib/libgraphbase.so.1
 lib/libjournal.a
+lib/libjournal.la
 lib/libjournal.so
 lib/libjournal.so.1
 %%SQLITE%%lib/liblfsqliteio.a
+%%SQLITE%%lib/liblfsqliteio.la
 %%SQLITE%%lib/liblfsqliteio.so
 %%SQLITE%%lib/liblfsqliteio.so.3
 %%MYSQL%%lib/libmysqlio.a
+%%MYSQL%%lib/libmysqlio.la
 %%MYSQL%%lib/libmysqlio.so
 %%MYSQL%%lib/libmysqlio.so.2
 lib/libmbudget.a
+lib/libmbudget.la
 lib/libmbudget.so
 lib/libmbudget.so.1
 lib/libmonthlygraph.a
+lib/libmonthlygraph.la
 lib/libmonthlygraph.so
 lib/libmonthlygraph.so.1
 lib/libnativedbio.a
+lib/libnativedbio.la
 lib/libnativedbio.so
 lib/libnativedbio.so.7
 lib/libpayee.a
+lib/libpayee.la
 lib/libpayee.so
 lib/libpayee.so.1
 %%PGSQL%%lib/libpsqlio.a
+%%PGSQL%%lib/libpsqlio.la
 %%PGSQL%%lib/libpsqlio.so
 %%PGSQL%%lib/libpsqlio.so.2
 lib/libpiegraph.a
+lib/libpiegraph.la
 lib/libpiegraph.so
 lib/libpiegraph.so.1
 lib/libprofitloss.a
+lib/libprofitloss.la
 lib/libprofitloss.so
 lib/libprofitloss.so.1
 lib/libqhacc.a
+lib/libqhacc.la
 lib/libqhacc.so
 lib/libqhacc.so.7
 lib/libqhaccext.a
+lib/libqhaccext.la
 lib/libqhaccext.so
 lib/libqhaccext.so.7
 lib/libqhaccutils.a
+lib/libqhaccutils.la
 lib/libqhaccutils.so
 lib/libqhaccutils.so.7
 lib/libqifio.a
+lib/libqifio.la
 lib/libqifio.so
 lib/libqifio.so.2
 lib/libshares.a
+lib/libshares.la
 lib/libshares.so
 lib/libshares.so.1
 lib/libsinglebargraph.a
+lib/libsinglebargraph.la
 lib/libsinglebargraph.so
 lib/libsinglebargraph.so.1
 lib/libsinglelinegraph.a
+lib/libsinglelinegraph.la
 lib/libsinglelinegraph.so
 lib/libsinglelinegraph.so.1
 %%SQLITE%%lib/libsqliteio.a
+%%SQLITE%%lib/libsqliteio.la
 %%SQLITE%%lib/libsqliteio.so
 %%SQLITE%%lib/libsqliteio.so.3
 lib/libtbal.a
+lib/libtbal.la
 lib/libtbal.so
 lib/libtbal.so.1
 lib/libtrans.a
+lib/libtrans.la
 lib/libtrans.so
 lib/libtrans.so.1
 lib/libupgradeio.a
+lib/libupgradeio.la
 lib/libupgradeio.so
 lib/libupgradeio.so.2
 lib/libxmlio.a
+lib/libxmlio.la
 lib/libxmlio.so
 lib/libxmlio.so.2
 lib/plugins/db/libextprgio.so