Conversion to a single libtool environment.

Approved by:	portmgr (kris)

40 files changed, 151 insertions, 35 deletions

diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 9309c54a16ec..fb3c99eb6860 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	blitz++
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	blitz
diff --git a/math/blitz++/pkg-plist b/math/blitz++/pkg-plist
index 52b2c2b6e195..36b9fcab0adb 100644
--- a/math/blitz++/pkg-plist
+++ b/math/blitz++/pkg-plist
@@ -161,6 +161,7 @@ include/random/mt.h
 include/random/normal.h
 include/random/uniform.h
 lib/libblitz.a
+lib/libblitz.la
 lib/libblitz.so
 lib/libblitz.so.0
 libdata/pkgconfig/blitz.pc
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 8980120e7806..ed0f5b04dbd2 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fftw
 PORTVERSION=	2.1.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ 		\
 		ftp://ftp.fftw.org/pub/fftw/old/ 	\
@@ -24,7 +24,7 @@ FFTW_SUFIX=
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-shared
diff --git a/math/fftw/pkg-plist b/math/fftw/pkg-plist
index f86714d348a6..abe07aa51d05 100644
--- a/math/fftw/pkg-plist
+++ b/math/fftw/pkg-plist
@@ -1,9 +1,11 @@
 %%DEF%%include/fftw.h
 %%DEF%%include/rfftw.h
 lib/lib%%FFTW_SUFX%%fftw.a
+lib/lib%%FFTW_SUFX%%fftw.la
 lib/lib%%FFTW_SUFX%%fftw.so
 lib/lib%%FFTW_SUFX%%fftw.so.2
 lib/lib%%FFTW_SUFX%%rfftw.a
+lib/lib%%FFTW_SUFX%%rfftw.la
 lib/lib%%FFTW_SUFX%%rfftw.so
 lib/lib%%FFTW_SUFX%%rfftw.so.2
 %%DEF%%%%PORTDOCS%%%%DOCSDIR%%/fftw.ps
diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 788c7e90f25f..6609d1b2d283 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -22,7 +22,7 @@ FFTW3_FLAVOR?=	default
 FFTW3_SUFX=
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile
index 02cfb06e0dfd..a9a8421850c8 100644
--- a/math/fung-calc/Makefile
+++ b/math/fung-calc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	fung-calc
 PORTVERSION=	1.3.2b
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,13 +16,12 @@ COMMENT=	Advanced graphic calculator
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
-USE_KDELIBS_VER=	3
+USE_KDELIBS_VER=3
 USE_GL=		yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 pre-configure:
diff --git a/math/fung-calc/pkg-plist b/math/fung-calc/pkg-plist
index 48cfc1972ea1..da74c206e425 100644
--- a/math/fung-calc/pkg-plist
+++ b/math/fung-calc/pkg-plist
@@ -41,9 +41,11 @@ include/fung-calc/statinfo.h
 include/fung-calc/statplotgraph.h
 include/fung-calc/whiskerplot.h
 include/fung-calc/zerofunction.h
+lib/libfungcalc.a
 lib/libfungcalc.la
 lib/libfungcalc.so
 lib/libfungcalc.so.1
+lib/libfungcalcui.a
 lib/libfungcalcui.la
 lib/libfungcalcui.so
 lib/libfungcalcui.so.1
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 805671506169..4c80d3bf77a1 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gambit
 PORTVERSION=	0.2005.12.12
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +21,7 @@ LIB_DEPENDS=	wx_gtk2_core-2.6.0:${PORTSDIR}/x11-toolkits/wxgtk26
 USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget gtk20
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
 MAKE_ENV=	WX_CONFIG="${X11BASE}/bin/wxgtk2-2.6-config"
diff --git a/math/gambit/pkg-plist b/math/gambit/pkg-plist
index 74369c36b13d..d5879f440e59 100644
--- a/math/gambit/pkg-plist
+++ b/math/gambit/pkg-plist
@@ -18,5 +18,6 @@ bin/gambit-nfg-simpdiv
 bin/gambit-nfg2html
 bin/gambit-nfg2tex
 lib/libgambit.a
+lib/libgambit.la
 lib/libgambit.so
 lib/libgambit.so.0
diff --git a/math/gmp/Makefile b/math/gmp/Makefile
index ce45cbb1fce3..5e67f7f2c229 100644
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgmp
 PORTVERSION=	4.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gmp
@@ -17,7 +17,7 @@ DISTNAME=	gmp-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A free library for arbitrary precision arithmetic
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx
 INSTALLS_SHLIB=	yes
diff --git a/math/gmp/pkg-plist b/math/gmp/pkg-plist
index 41ee39245c27..3bf4cc6efb26 100644
--- a/math/gmp/pkg-plist
+++ b/math/gmp/pkg-plist
@@ -1,8 +1,10 @@
 include/gmp.h
 include/gmpxx.h
 lib/libgmp.a
+lib/libgmp.la
 lib/libgmp.so
 lib/libgmp.so.6
 lib/libgmpxx.a
+lib/libgmpxx.la
 lib/libgmpxx.so
 lib/libgmpxx.so.3
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 887f00b58d09..e71e443d9dc3 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.6.2
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -28,7 +29,7 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gnomehier libgnomeprintui \
 USE_PYTHON=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index af98e03f504c..9e4da73142a6 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -1,46 +1,67 @@
 bin/gnumeric
 bin/gnumeric-%%VERSION%%
 bin/ssconvert
+lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/corba/corba.la
 lib/gnumeric/%%VERSION%%/plugins/corba/corba.so
 lib/gnumeric/%%VERSION%%/plugins/corba/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/derivatives/derivatives.la
 lib/gnumeric/%%VERSION%%/plugins/derivatives/derivatives.so
 lib/gnumeric/%%VERSION%%/plugins/derivatives/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/dif/dif.la
 lib/gnumeric/%%VERSION%%/plugins/dif/dif.so
 lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/excel/excel.la
 lib/gnumeric/%%VERSION%%/plugins/excel/excel.so
 lib/gnumeric/%%VERSION%%/plugins/excel/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-erlang/erlang.la
 lib/gnumeric/%%VERSION%%/plugins/fn-erlang/erlang.so
 lib/gnumeric/%%VERSION%%/plugins/fn-erlang/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-r/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-r/rstat.la
 lib/gnumeric/%%VERSION%%/plugins/fn-r/rstat.so
+lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la
 lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
 lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.la
 lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so
 lib/gnumeric/%%VERSION%%/plugins/gnome-db/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/gnome-db/ui.xml
@@ -48,47 +69,63 @@ lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/html/html.la
 lib/gnumeric/%%VERSION%%/plugins/html/html.so
 lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.la
 lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so
 lib/gnumeric/%%VERSION%%/plugins/lotus/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/mps/mps.la
 lib/gnumeric/%%VERSION%%/plugins/mps/mps.so
 lib/gnumeric/%%VERSION%%/plugins/mps/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/numtheory/numtheory.la
 lib/gnumeric/%%VERSION%%/plugins/numtheory/numtheory.so
 lib/gnumeric/%%VERSION%%/plugins/numtheory/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.la
 lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so
 lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.la
 lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.so
 lib/gnumeric/%%VERSION%%/plugins/openoffice/plugin.xml
 %%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/perl_func.pl
 %%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/plugin.xml
+%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.la
 %%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.so
 %%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.la
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.so
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/psiconv/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/psiconv/psiconv.la
 lib/gnumeric/%%VERSION%%/plugins/psiconv/psiconv.so
 lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
 lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
 lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.la
 lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so
 lib/gnumeric/%%VERSION%%/plugins/python-loader/ui-console-menu.xml
 lib/gnumeric/%%VERSION%%/plugins/qpro/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/qpro/qpro.la
 lib/gnumeric/%%VERSION%%/plugins/qpro/qpro.so
 lib/gnumeric/%%VERSION%%/plugins/sample_datasource/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/sample_datasource/sample_datasource.la
 lib/gnumeric/%%VERSION%%/plugins/sample_datasource/sample_datasource.so
 lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/sc/sc.la
 lib/gnumeric/%%VERSION%%/plugins/sc/sc.so
 lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.la
 lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so
 lib/gnumeric/%%VERSION%%/plugins/uihello/hello.xml
+lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.la
 lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
-lib/libspreadsheet.a
 lib/libspreadsheet-%%VERSION%%.so
+lib/libspreadsheet.la
 lib/libspreadsheet.so
 libdata/bonobo/servers/GNOME_Gnumeric.server
 @exec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index da0f04a4a3fc..0422a39685a1 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsl
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,7 +20,6 @@ MAINTAINER=	jon.drews@gmail.com
 COMMENT=	The GNU Scientific Library - mathematical libs
 
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:13:inc
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	MAKEINFO='makeinfo --no-split'
diff --git a/math/gsl/pkg-plist b/math/gsl/pkg-plist
index e10aec93d458..68e0dddcbf51 100644
--- a/math/gsl/pkg-plist
+++ b/math/gsl/pkg-plist
@@ -216,9 +216,11 @@ include/gsl/gsl_version.h
 include/gsl/gsl_wavelet.h
 include/gsl/gsl_wavelet2d.h
 lib/libgsl.a
+lib/libgsl.la
 lib/libgsl.so
 lib/libgsl.so.7
 lib/libgslcblas.a
+lib/libgslcblas.la
 lib/libgslcblas.so
 lib/libgslcblas.so.0
 libdata/pkgconfig/gsl.pc
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 7acd17c54199..e2e833f5a58e 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -29,7 +30,7 @@ USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index dd5e3c34fcee..e7f5117ec760 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -29,58 +29,84 @@ include/ksim/progress.h
 include/ksim/themeloader.h
 include/ksim/themetypes.h
 include/kwidgetstreamer.h
+lib/kde3/ark.a
 lib/kde3/ark.la
 lib/kde3/ark.so
+lib/kde3/irkick.a
 lib/kde3/irkick.la
 lib/kde3/irkick.so
+lib/kde3/kcalc.a
 lib/kde3/kcalc.la
 lib/kde3/kcalc.so
+lib/kde3/kcharselect_panelapplet.a
 lib/kde3/kcharselect_panelapplet.la
 lib/kde3/kcharselect_panelapplet.so
+lib/kde3/kcm_kcmlirc.a
 lib/kde3/kcm_kcmlirc.la
 lib/kde3/kcm_kcmlirc.so
+lib/kde3/kcm_kdf.a
 lib/kde3/kcm_kdf.la
 lib/kde3/kcm_kdf.so
+lib/kde3/kcm_kwallet.a
 lib/kde3/kcm_kwallet.la
 lib/kde3/kcm_kwallet.so
+lib/kde3/kedit.a
 lib/kde3/kedit.la
 lib/kde3/kedit.so
+lib/kde3/ksim_cpu.a
 lib/kde3/ksim_cpu.la
 lib/kde3/ksim_cpu.so
+lib/kde3/ksim_disk.a
 lib/kde3/ksim_disk.la
 lib/kde3/ksim_disk.so
+lib/kde3/ksim_filesystem.a
 lib/kde3/ksim_filesystem.la
 lib/kde3/ksim_filesystem.so
+lib/kde3/ksim_net.a
 lib/kde3/ksim_net.la
 lib/kde3/ksim_net.so
+lib/kde3/ksim_panelextension.a
 lib/kde3/ksim_panelextension.la
 lib/kde3/ksim_panelextension.so
+lib/kde3/ksim_sensors.a
 lib/kde3/ksim_sensors.la
 lib/kde3/ksim_sensors.so
+lib/kde3/ksim_snmp.a
 lib/kde3/ksim_snmp.la
 lib/kde3/ksim_snmp.so
+lib/kde3/libarkpart.a
 lib/kde3/libarkpart.la
 lib/kde3/libarkpart.so
+lib/kde3/libkbyteseditwidget.a
 lib/kde3/libkbyteseditwidget.la
 lib/kde3/libkbyteseditwidget.so
+lib/kde3/libkhexedit2part.a
 lib/kde3/libkhexedit2part.la
 lib/kde3/libkhexedit2part.so
+lib/kde3/libkregexpeditorgui.a
 lib/kde3/libkregexpeditorgui.la
 lib/kde3/libkregexpeditorgui.so
+lib/libkdeinit_ark.a
 lib/libkdeinit_ark.la
 lib/libkdeinit_ark.so
+lib/libkdeinit_irkick.a
 lib/libkdeinit_irkick.la
 lib/libkdeinit_irkick.so
+lib/libkdeinit_kcalc.a
 lib/libkdeinit_kcalc.la
 lib/libkdeinit_kcalc.so
+lib/libkdeinit_kedit.a
 lib/libkdeinit_kedit.la
 lib/libkdeinit_kedit.so
+lib/libkhexeditcommon.a
 lib/libkhexeditcommon.la
 lib/libkhexeditcommon.so
 lib/libkhexeditcommon.so.0
+lib/libkregexpeditorcommon.a
 lib/libkregexpeditorcommon.la
 lib/libkregexpeditorcommon.so
 lib/libkregexpeditorcommon.so.1
+lib/libksimcore.a
 lib/libksimcore.la
 lib/libksimcore.so
 lib/libksimcore.so.1
diff --git a/math/koctave/Makefile b/math/koctave/Makefile
index 958c3fe6e1e4..bf593462e005 100644
--- a/math/koctave/Makefile
+++ b/math/koctave/Makefile
@@ -17,11 +17,10 @@ COMMENT=	KDEGUI for octave
 RUN_DEPENDS=	octave:${PORTSDIR}/math/octave
 
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:13:inc
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 
 CONFIGURE_ARGS+=--program-transform-name=koctave3
 
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index ccbd6188c0c0..cf44ebf8a2fa 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	LabPlot
 PORTVERSION=	1.5.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
@@ -31,7 +31,6 @@ USE_QT_VER=	3
 USE_KDELIBS_VER=3
 USE_GL=		yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib
diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist
index 54fbbae8b25b..a6d73845c4c2 100644
--- a/math/labplot/pkg-plist
+++ b/math/labplot/pkg-plist
@@ -1,10 +1,13 @@
 bin/LabPlot
 bin/labplot
-lib/libLabPlotcephes.so.6
-lib/libLabPlotcephes.so
 lib/libLabPlotcephes.a
-lib/libLabPlot.so.6
+lib/libLabPlotcephes.la
+lib/libLabPlotcephes.so
+lib/libLabPlotcephes.so.6
+lib/libLabPlot.a
+lib/libLabPlot.la
 lib/libLabPlot.so
+lib/libLabPlot.so.6
 share/doc/HTML/de/LabPlot/index.docbook
 share/doc/HTML/de/LabPlot/small_pics
 share/doc/HTML/de/labplot
diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile
index ce45cbb1fce3..5e67f7f2c229 100644
--- a/math/libgmp4/Makefile
+++ b/math/libgmp4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgmp
 PORTVERSION=	4.1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gmp
@@ -17,7 +17,7 @@ DISTNAME=	gmp-${PORTVERSION}
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	A free library for arbitrary precision arithmetic
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--enable-cxx
 INSTALLS_SHLIB=	yes
diff --git a/math/libgmp4/pkg-plist b/math/libgmp4/pkg-plist
index 41ee39245c27..3bf4cc6efb26 100644
--- a/math/libgmp4/pkg-plist
+++ b/math/libgmp4/pkg-plist
@@ -1,8 +1,10 @@
 include/gmp.h
 include/gmpxx.h
 lib/libgmp.a
+lib/libgmp.la
 lib/libgmp.so
 lib/libgmp.so.6
 lib/libgmpxx.a
+lib/libgmpxx.la
 lib/libgmpxx.so
 lib/libgmpxx.so.3
diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile
index aa184ebb9ce0..65c83d104347 100644
--- a/math/libmath++/Makefile
+++ b/math/libmath++/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	jhb@FreeBSD.org
 COMMENT=	C++ Library for Symbolic and Numeric Calculus Applications
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/math/libneural/Makefile b/math/libneural/Makefile
index 5723be9fcd0c..186a1dc0fd31 100644
--- a/math/libneural/Makefile
+++ b/math/libneural/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	libneural
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ implementation of the classic 3-layer perceptron in library form
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 
diff --git a/math/libneural/pkg-plist b/math/libneural/pkg-plist
index d7c4c4438cc2..dd19dbd3f825 100644
--- a/math/libneural/pkg-plist
+++ b/math/libneural/pkg-plist
@@ -1,5 +1,6 @@
 include/neuron.h
 include/nnwork.h
 lib/libneural.a
+lib/libneural.la
 lib/libneural.so
 lib/libneural.so.0
diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile
index 27d3d8ff5e5e..23a24913f9c4 100644
--- a/math/libqalculate/Makefile
+++ b/math/libqalculate/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libqalculate
 PORTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qalculate
@@ -17,7 +18,7 @@ COMMENT=	Very powerful GUI calculator for GNOME (backend library)
 LIB_DEPENDS=	cln.4:${PORTSDIR}/math/cln
 
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack gnomehack glib20 libxml2
 INSTALLS_SHLIB=	yes
 
diff --git a/math/libqalculate/pkg-plist b/math/libqalculate/pkg-plist
index e14e8e85351b..077100aab8fa 100644
--- a/math/libqalculate/pkg-plist
+++ b/math/libqalculate/pkg-plist
@@ -13,6 +13,7 @@ include/libqalculate/Unit.h
 include/libqalculate/BuiltinFunctions.h
 include/libqalculate/qalculate.h
 lib/libqalculate.a
+lib/libqalculate.la
 lib/libqalculate.so
 lib/libqalculate.so.0
 libdata/pkgconfig/libqalculate.pc
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
index 1109611e0c5b..a6d4258b8ad5 100644
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mpfr
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	http://www.mpfr.org/mpfr-current/
 
@@ -15,7 +16,7 @@ COMMENT=	A library for multiple-precision floating-point computations
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE} \
 		--enable-shared
 INSTALLS_SHLIB=	yes
diff --git a/math/mpfr/pkg-plist b/math/mpfr/pkg-plist
index e3ee60146e39..1363efa6c1b9 100644
--- a/math/mpfr/pkg-plist
+++ b/math/mpfr/pkg-plist
@@ -1,5 +1,6 @@
 include/mpfr.h
 include/mpf2mpfr.h
 lib/libmpfr.a
+lib/libmpfr.la
 lib/libmpfr.so
 lib/libmpfr.so.1
diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile
index 1aaa8cacb235..5f52e72d7c1b 100644
--- a/math/pgcalc/Makefile
+++ b/math/pgcalc/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A powerful scientific skinnable calculator
 USE_QT_VER=	3
 USE_KDELIBS_VER= 3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index b74c9e596396..cf4666edffea 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libglade2 libgnome
 INSTALLS_OMF=	yes
 
diff --git a/math/qhull/Makefile b/math/qhull/Makefile
index 65e139a8a117..853ebaf8995a 100644
--- a/math/qhull/Makefile
+++ b/math/qhull/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qhull
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.qhull.org/download/
 DISTNAME=	${PORTNAME}-2003.1
@@ -16,7 +17,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/qhull/pkg-plist b/math/qhull/pkg-plist
index ca983a89c1b9..75d2a12ad700 100644
--- a/math/qhull/pkg-plist
+++ b/math/qhull/pkg-plist
@@ -15,6 +15,7 @@ include/qhull/qhull.h
 include/qhull/qset.h
 include/qhull/user.h
 lib/libqhull.a
+lib/libqhull.la
 lib/libqhull.so
 lib/libqhull.so.5
 @comment These doc files must be ditributed even with NOPORTDOCS
diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile
index 65e139a8a117..853ebaf8995a 100644
--- a/math/qhull5/Makefile
+++ b/math/qhull5/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	qhull
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.qhull.org/download/
 DISTNAME=	${PORTNAME}-2003.1
@@ -16,7 +17,7 @@ COMMENT=	Qhull computes convex hulls, Delaunay triangulations and halfspaces
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
 .if !defined(NOPORTDOCS)
diff --git a/math/qhull5/pkg-plist b/math/qhull5/pkg-plist
index ca983a89c1b9..75d2a12ad700 100644
--- a/math/qhull5/pkg-plist
+++ b/math/qhull5/pkg-plist
@@ -15,6 +15,7 @@ include/qhull/qhull.h
 include/qhull/qset.h
 include/qhull/user.h
 lib/libqhull.a
+lib/libqhull.la
 lib/libqhull.so
 lib/libqhull.so.5
 @comment These doc files must be ditributed even with NOPORTDOCS
diff --git a/math/spar/Makefile b/math/spar/Makefile
index 00866bf3f899..86edd2685e93 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	spar
 PORTVERSION=	0.5.10
+PORTREVISION=	1
 CATEGORIES=	math devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	A modular math parser
 
 USE_GETOPT_LONG=yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=	spar.1
diff --git a/math/spar/pkg-plist b/math/spar/pkg-plist
index 192f9f27bb85..2fe3edee8849 100644
--- a/math/spar/pkg-plist
+++ b/math/spar/pkg-plist
@@ -26,11 +26,20 @@ include/spar/sl_util.h
 include/spar/sl_vector.h
 include/spar/sl_version.h
 lib/libspar.a
+lib/libspar.la
 lib/libspar.so
 lib/libspar.so.5
+lib/spar/solve_c.a
+lib/spar/solve_c.la
 lib/spar/solve_c.so
+lib/spar/solve_q.a
+lib/spar/solve_q.la
 lib/spar/solve_q.so
+lib/spar/zsolve_c.a
+lib/spar/zsolve_c.la
 lib/spar/zsolve_c.so
+lib/spar/zsolve_q.a
+lib/spar/zsolve_q.la
 lib/spar/zsolve_q.so
 share/spar/modules_config
 @dirrm include/spar
diff --git a/math/tablix/Makefile b/math/tablix/Makefile
index cfae8a155c89..58a1f3adf38f 100644
--- a/math/tablix/Makefile
+++ b/math/tablix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tablix2
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	math www
 MASTER_SITES=	http://www.tablix.org/releases/stable/
 
@@ -18,10 +19,9 @@ RUN_DEPENDS=	pvm:${PORTSDIR}/net/pvm
 
 PVM_ROOT=	${PREFIX}/lib/pvm
 
-GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/math/tablix/pkg-plist b/math/tablix/pkg-plist
index 94142325bdb1..462ba061166e 100644
--- a/math/tablix/pkg-plist
+++ b/math/tablix/pkg-plist
@@ -7,22 +7,39 @@ bin/tablix2_test
 lib/pvm/bin/FREEBSD/tablix2
 lib/pvm/bin/FREEBSD/tablix2_kernel
 lib/pvm/bin/FREEBSD/tablix2_output
+lib/tablix2/consecutive.la
 lib/tablix2/consecutive.so
+lib/tablix2/export_csv.la
 lib/tablix2/export_csv.so
+lib/tablix2/export_htmlcss.la
 lib/tablix2/export_htmlcss.so
+lib/tablix2/export_ttf.la
 lib/tablix2/export_ttf.so
+lib/tablix2/fixedtime.la
 lib/tablix2/fixedtime.so
+lib/tablix2/freemorning.la
 lib/tablix2/freemorning.so
+lib/tablix2/freeperiod.la
 lib/tablix2/freeperiod.so
+lib/tablix2/holes.la
 lib/tablix2/holes.so
+lib/tablix2/perday.la
 lib/tablix2/perday.so
+lib/tablix2/placecapability.la
 lib/tablix2/placecapability.so
+lib/tablix2/preferredroom.la
 lib/tablix2/preferredroom.so
+lib/tablix2/preferredtime.la
 lib/tablix2/preferredtime.so
+lib/tablix2/sameday.la
 lib/tablix2/sameday.so
+lib/tablix2/sametime.la
 lib/tablix2/sametime.so
+lib/tablix2/sametimeas.la
 lib/tablix2/sametimeas.so
+lib/tablix2/timeplace.la
 lib/tablix2/timeplace.so
+lib/tablix2/walk.la
 lib/tablix2/walk.so
 share/locale/sl/LC_MESSAGES/tablix2.mo
 share/tablix2/modulesref.xml
diff --git a/math/wfmath/Makefile b/math/wfmath/Makefile
index d35482aa35cf..326ffc0b2bb6 100644
--- a/math/wfmath/Makefile
+++ b/math/wfmath/Makefile
@@ -18,6 +18,6 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnomehack
 INSTALLS_SHLIB=	yes
 USE_GCC=	3.4
-USE_AUTOTOOLS=	libtool:15:inc
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>