2 files changed, 40 insertions, 2 deletions

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