Update to 1.8.2, based on math/gnumeric-current:

Gnumeric 1.8.2

Hans de Goede:
	* Fix broken xls issues.  [#505330]

Jean:
	* Fix corrupted-xls-file problems.  [#514513] [#515343] [#515873]
	  [#515876] [#518939]

Morten:
	* Fix loading of solver constraints.
	* Fix solver issue.  [#512500]
	* Fix corrupted-xls-file problems.  [#512984] [#513005] [#513313]
	  [#513317] [#513361] [#513364] [#513551] [#513605] [#513608] [#513790]
	  [#513787] [#513835] [#513963] [#514229] [#514230] [#514295] [#514435]
	  [#514436] [#514437] [#514506] [#514510] [#514630] [#514637] [#515155]
	  [#515269] [#515275] [#515335] [#515336] [#515339] [#517106] [#518939]
	* Fix non-ascii export problem.  [#511135]
	* Band-aid evaluation problem with broken xls.  [#513559]
	* Fix circular array formula problem.
	* Work around Qt theme bug.  [#512752]
	* Fix paste-as-text bug.  [#514438]
	* Fix corrupted-mps-bug.  [#517141]
	* Fix corrupted-qpro-bugs.  [#517144] [#517376] [#517591]
	* Fix corrupted-sylk-bug.
	* Make <control>KP_Subtract work as <control>minus.  [#516358]
	* Make <control>KP_Add work as <control>plus.
	* Fix corrupted-applix-bugs.  [#517778] [#520873]
	* Fix sylk importer's format handling.
	* Fix memory allocation failure for huge .gnumeric files.  [#519319]
	* Fix mstyle problem.  [#519451]
	* Fix auto-fill problem.  [#519680]
	* Fix corrupted-gnumeric-bug.  [#519761]
	* Fix insert-time problem.

9 files changed, 213 insertions, 256 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 56734c75a9e..3fd4e80ac1f 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,58 +1,52 @@
-# $NetBSD: Makefile,v 1.127 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.128 2008/03/07 21:33:33 wiz Exp $
 #
 
-DISTNAME=		gnumeric-1.6.3
-PKGREVISION=		12
+DISTNAME=		gnumeric-1.8.2
 CATEGORIES=		math gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.8/}
 EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=		rh@NetBSD.org
+MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/projects/gnumeric/
-COMMENT=		Spreadsheet program from the GNOME project
+COMMENT=		Spreadsheet program from the GNOME project (development version)
 
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		gnome2-1.6 xdg-1.1
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-python
-CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
-PYTHON_VERSIONS_ACCEPTED=	24 23
 GCONF_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
+PKGCONFIG_OVERRIDE=	libspreadsheet.pc.in
 
-# XXX: link test against libDynaLoader_pic.a fails; bug
-# in buildlink
-PLIST_SUBST+=	PERL="@comment "
-#.include "../../lang/perl5/buildlink3.mk"
+REPLACE_PERL+=		plugins/perl-func/perl_func.pl
 
+CONFIGURE_ARGS+=	--with-python
+CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
+PYTHON_VERSIONS_ACCEPTED=	24 23
+.include "../../lang/python/application.mk"
+.include "../../devel/py-gobject/buildlink3.mk"
+
+# XXX: that version's not in pkgsrc yet
+#BUILDLINK_API_DEPENDS.libgda+=	libgda>=3.1.1
+#.include "../../databases/libgda/buildlink3.mk"
+#.include "../../databases/libgnomedb/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.6
 .include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/atk/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
-.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
-.include "../../graphics/libgnomecanvas/buildlink3.mk"
-# guile is currently not supported in gnumeric
-#.include "../../lang/guile/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../misc/goffice0.2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../misc/goffice0.6/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
-.include "../../print/libgnomeprint/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.2
-.include "../../print/libgnomeprintui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.10.0
 .include "../../x11/gtk2/buildlink3.mk"
-# XXX: link test against libpython fails
-#.include "../../x11/py-gtk2/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index 1a51a2d4cd8..93c0f5b5a93 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,8 +1,125 @@
-@comment $NetBSD: PLIST,v 1.31 2007/09/25 10:54:15 hira Exp $
+@comment $NetBSD: PLIST,v 1.32 2008/03/07 21:33:33 wiz Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
-lib/bonobo/servers/GNOME_Gnumeric.server
+bin/ssindex
+include/libspreadsheet-1.8/spreadsheet/application.h
+include/libspreadsheet-1.8/spreadsheet/auto-format.h
+include/libspreadsheet-1.8/spreadsheet/cell-draw.h
+include/libspreadsheet-1.8/spreadsheet/cell.h
+include/libspreadsheet-1.8/spreadsheet/cellspan.h
+include/libspreadsheet-1.8/spreadsheet/clipboard.h
+include/libspreadsheet-1.8/spreadsheet/cmd-edit.h
+include/libspreadsheet-1.8/spreadsheet/collect.h
+include/libspreadsheet-1.8/spreadsheet/colrow.h
+include/libspreadsheet-1.8/spreadsheet/command-context-stderr.h
+include/libspreadsheet-1.8/spreadsheet/command-context.h
+include/libspreadsheet-1.8/spreadsheet/commands.h
+include/libspreadsheet-1.8/spreadsheet/complete-sheet.h
+include/libspreadsheet-1.8/spreadsheet/complete.h
+include/libspreadsheet-1.8/spreadsheet/complex.h
+include/libspreadsheet-1.8/spreadsheet/consolidate.h
+include/libspreadsheet-1.8/spreadsheet/dependent.h
+include/libspreadsheet-1.8/spreadsheet/expr-impl.h
+include/libspreadsheet-1.8/spreadsheet/expr-name.h
+include/libspreadsheet-1.8/spreadsheet/expr.h
+include/libspreadsheet-1.8/spreadsheet/file-autoft.h
+include/libspreadsheet-1.8/spreadsheet/format-template.h
+include/libspreadsheet-1.8/spreadsheet/func-builtin.h
+include/libspreadsheet-1.8/spreadsheet/func.h
+include/libspreadsheet-1.8/spreadsheet/gnm-datetime.h
+include/libspreadsheet-1.8/spreadsheet/gnm-format.h
+include/libspreadsheet-1.8/spreadsheet/gnm-graph-window.h
+include/libspreadsheet-1.8/spreadsheet/gnm-pane.h
+include/libspreadsheet-1.8/spreadsheet/gnm-plugin.h
+include/libspreadsheet-1.8/spreadsheet/gnm-so-filled.h
+include/libspreadsheet-1.8/spreadsheet/gnm-so-line.h
+include/libspreadsheet-1.8/spreadsheet/gnm-so-polygon.h
+include/libspreadsheet-1.8/spreadsheet/gnm-style-impl.h
+include/libspreadsheet-1.8/spreadsheet/gnumeric-gconf.h
+include/libspreadsheet-1.8/spreadsheet/gnumeric-simple-canvas.h
+include/libspreadsheet-1.8/spreadsheet/gnumeric.h
+include/libspreadsheet-1.8/spreadsheet/graph.h
+include/libspreadsheet-1.8/spreadsheet/gui-clipboard.h
+include/libspreadsheet-1.8/spreadsheet/gui-file.h
+include/libspreadsheet-1.8/spreadsheet/gui-gnumeric.h
+include/libspreadsheet-1.8/spreadsheet/gui-util.h
+include/libspreadsheet-1.8/spreadsheet/gutils.h
+include/libspreadsheet-1.8/spreadsheet/history.h
+include/libspreadsheet-1.8/spreadsheet/hlink-impl.h
+include/libspreadsheet-1.8/spreadsheet/hlink.h
+include/libspreadsheet-1.8/spreadsheet/input-msg.h
+include/libspreadsheet-1.8/spreadsheet/item-acetate.h
+include/libspreadsheet-1.8/spreadsheet/item-bar.h
+include/libspreadsheet-1.8/spreadsheet/item-cursor.h
+include/libspreadsheet-1.8/spreadsheet/item-debug.h
+include/libspreadsheet-1.8/spreadsheet/item-edit.h
+include/libspreadsheet-1.8/spreadsheet/item-grid.h
+include/libspreadsheet-1.8/spreadsheet/libgnumeric.h
+include/libspreadsheet-1.8/spreadsheet/mathfunc.h
+include/libspreadsheet-1.8/spreadsheet/mstyle.h
+include/libspreadsheet-1.8/spreadsheet/number-match.h
+include/libspreadsheet-1.8/spreadsheet/numbers.h
+include/libspreadsheet-1.8/spreadsheet/parse-util.h
+include/libspreadsheet-1.8/spreadsheet/pattern.h
+include/libspreadsheet-1.8/spreadsheet/position.h
+include/libspreadsheet-1.8/spreadsheet/preview-grid.h
+include/libspreadsheet-1.8/spreadsheet/print-cell.h
+include/libspreadsheet-1.8/spreadsheet/print-info.h
+include/libspreadsheet-1.8/spreadsheet/print.h
+include/libspreadsheet-1.8/spreadsheet/rangefunc-strings.h
+include/libspreadsheet-1.8/spreadsheet/rangefunc.h
+include/libspreadsheet-1.8/spreadsheet/ranges.h
+include/libspreadsheet-1.8/spreadsheet/regression.h
+include/libspreadsheet-1.8/spreadsheet/rendered-value.h
+include/libspreadsheet-1.8/spreadsheet/search.h
+include/libspreadsheet-1.8/spreadsheet/selection.h
+include/libspreadsheet-1.8/spreadsheet/session.h
+include/libspreadsheet-1.8/spreadsheet/sheet-autofill.h
+include/libspreadsheet-1.8/spreadsheet/sheet-control-gui-priv.h
+include/libspreadsheet-1.8/spreadsheet/sheet-control-gui.h
+include/libspreadsheet-1.8/spreadsheet/sheet-control-priv.h
+include/libspreadsheet-1.8/spreadsheet/sheet-control.h
+include/libspreadsheet-1.8/spreadsheet/sheet-filter-combo.h
+include/libspreadsheet-1.8/spreadsheet/sheet-filter.h
+include/libspreadsheet-1.8/spreadsheet/sheet-merge.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object-cell-comment.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object-graph.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object-image.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object-impl.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object-widget.h
+include/libspreadsheet-1.8/spreadsheet/sheet-object.h
+include/libspreadsheet-1.8/spreadsheet/sheet-private.h
+include/libspreadsheet-1.8/spreadsheet/sheet-style.h
+include/libspreadsheet-1.8/spreadsheet/sheet-view.h
+include/libspreadsheet-1.8/spreadsheet/sheet.h
+include/libspreadsheet-1.8/spreadsheet/solver.h
+include/libspreadsheet-1.8/spreadsheet/sort.h
+include/libspreadsheet-1.8/spreadsheet/stf-export.h
+include/libspreadsheet-1.8/spreadsheet/stf-parse.h
+include/libspreadsheet-1.8/spreadsheet/stf.h
+include/libspreadsheet-1.8/spreadsheet/str.h
+include/libspreadsheet-1.8/spreadsheet/style-border.h
+include/libspreadsheet-1.8/spreadsheet/style-color.h
+include/libspreadsheet-1.8/spreadsheet/style-conditions.h
+include/libspreadsheet-1.8/spreadsheet/style-font.h
+include/libspreadsheet-1.8/spreadsheet/style.h
+include/libspreadsheet-1.8/spreadsheet/symbol.h
+include/libspreadsheet-1.8/spreadsheet/validation-combo.h
+include/libspreadsheet-1.8/spreadsheet/validation.h
+include/libspreadsheet-1.8/spreadsheet/value.h
+include/libspreadsheet-1.8/spreadsheet/wbc-gtk-impl.h
+include/libspreadsheet-1.8/spreadsheet/wbc-gtk.h
+include/libspreadsheet-1.8/spreadsheet/workbook-cmd-format.h
+include/libspreadsheet-1.8/spreadsheet/workbook-control-priv.h
+include/libspreadsheet-1.8/spreadsheet/workbook-control.h
+include/libspreadsheet-1.8/spreadsheet/workbook-priv.h
+include/libspreadsheet-1.8/spreadsheet/workbook-view.h
+include/libspreadsheet-1.8/spreadsheet/workbook.h
+include/libspreadsheet-1.8/spreadsheet/xml-io-version.h
+include/libspreadsheet-1.8/spreadsheet/xml-io.h
+include/libspreadsheet-1.8/spreadsheet/xml-sax.h
+lib/gnumeric/${PKGVERSION}/include/gnumeric-features.h
 lib/gnumeric/${PKGVERSION}/plugins/applix/applix.la
 lib/gnumeric/${PKGVERSION}/plugins/applix/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/corba/corba.la
@@ -41,6 +158,11 @@ lib/gnumeric/${PKGVERSION}/plugins/fn-stat/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/fn-stat/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/fn-string/plugin.la
 lib/gnumeric/${PKGVERSION}/plugins/fn-string/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.la
+lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/glossary-po-header
+lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/gnome_glossary.py
+lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/html/html.la
 lib/gnumeric/${PKGVERSION}/plugins/html/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/lotus/lotus.la
@@ -53,12 +175,17 @@ lib/gnumeric/${PKGVERSION}/plugins/oleo/oleo.la
 lib/gnumeric/${PKGVERSION}/plugins/oleo/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/openoffice/openoffice.la
 lib/gnumeric/${PKGVERSION}/plugins/openoffice/plugin.xml
-${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-func/perl_func.pl
-${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-func/plugin.xml
-${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-loader/perl_loader.la
-${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-loader/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/perl-func/perl_func.pl
+lib/gnumeric/${PKGVERSION}/plugins/perl-func/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/perl-loader/perl_loader.la
+lib/gnumeric/${PKGVERSION}/plugins/perl-loader/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/plan_perfect/plan_perfect.la
 lib/gnumeric/${PKGVERSION}/plugins/plan_perfect/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/py-func/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/py-func/py_func.py
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/python_loader.la
+lib/gnumeric/${PKGVERSION}/plugins/python-loader/ui-console-menu.xml
 lib/gnumeric/${PKGVERSION}/plugins/qpro/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/qpro/qpro.la
 lib/gnumeric/${PKGVERSION}/plugins/sample_datasource/plugin.xml
@@ -73,6 +200,7 @@ lib/gnumeric/${PKGVERSION}/plugins/uihello/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/xbase/xbase.la
 lib/libspreadsheet.la
+lib/pkgconfig/libspreadsheet-1.8.pc
 man/man1/gnumeric.1
 man/man1/ssconvert.1
 man/man1/ssindex.1
@@ -104,6 +232,7 @@ share/gnome/help/gnumeric/C/data-delete.xml
 share/gnome/help/gnumeric/C/data-entry-advanced.xml
 share/gnome/help/gnumeric/C/data-entry-external.xml
 share/gnome/help/gnumeric/C/data-entry.xml
+share/gnome/help/gnumeric/C/data-filter.xml
 share/gnome/help/gnumeric/C/data-format.xml
 share/gnome/help/gnumeric/C/data-generate.xml
 share/gnome/help/gnumeric/C/data-insert.xml
@@ -293,7 +422,6 @@ share/gnome/help/gnumeric/C/figures/example-data.png
 share/gnome/help/gnumeric/C/figures/files-html-example.png
 share/gnome/help/gnumeric/C/figures/files-html32-example.png
 share/gnome/help/gnumeric/C/figures/files-html40-example.png
-share/gnome/help/gnumeric/C/figures/gnumeric-empty.510.png
 share/gnome/help/gnumeric/C/figures/gnumeric-icon-24.png
 share/gnome/help/gnumeric/C/figures/gnumeric-labelled.png
 share/gnome/help/gnumeric/C/figures/gnumeric-power-example.png
@@ -430,10 +558,7 @@ share/gnome/help/gnumeric/C/figures/textguru-import-panel1-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel2a-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel2b-withTags.png
 share/gnome/help/gnumeric/C/figures/textguru-import-panel3-withTags.png
-share/gnome/help/gnumeric/C/figures/toolbar-format.510.png
 share/gnome/help/gnumeric/C/figures/toolbar-object.png
-share/gnome/help/gnumeric/C/figures/toolbar-standard.510.png
-share/gnome/help/gnumeric/C/figures/toolbars.510.png
 share/gnome/help/gnumeric/C/figures/widget-checkbox.png
 share/gnome/help/gnumeric/C/figures/widget-combobox.png
 share/gnome/help/gnumeric/C/figures/widget-entryBox-outlined.png
@@ -527,6 +652,7 @@ share/gnumeric/${PKGVERSION}/glade/consolidate.glade
 share/gnumeric/${PKGVERSION}/glade/correlation.glade
 share/gnumeric/${PKGVERSION}/glade/covariance.glade
 share/gnumeric/${PKGVERSION}/glade/dao.glade
+share/gnumeric/${PKGVERSION}/glade/data-table.glade
 share/gnumeric/${PKGVERSION}/glade/define-name.glade
 share/gnumeric/${PKGVERSION}/glade/delete-cells.glade
 share/gnumeric/${PKGVERSION}/glade/descriptive-stats.glade
@@ -543,6 +669,7 @@ share/gnumeric/${PKGVERSION}/glade/function-select.glade
 share/gnumeric/${PKGVERSION}/glade/goalseek.glade
 share/gnumeric/${PKGVERSION}/glade/goto.glade
 share/gnumeric/${PKGVERSION}/glade/hf-config.glade
+share/gnumeric/${PKGVERSION}/glade/hf-dt-format.glade
 share/gnumeric/${PKGVERSION}/glade/histogram.glade
 share/gnumeric/${PKGVERSION}/glade/hyperlink.glade
 share/gnumeric/${PKGVERSION}/glade/insert-cells.glade
@@ -550,7 +677,6 @@ share/gnumeric/${PKGVERSION}/glade/mean-tests.glade
 share/gnumeric/${PKGVERSION}/glade/merge.glade
 share/gnumeric/${PKGVERSION}/glade/moving-averages.glade
 share/gnumeric/${PKGVERSION}/glade/paste-names.glade
-share/gnumeric/${PKGVERSION}/glade/pivottable.glade
 share/gnumeric/${PKGVERSION}/glade/plugin-manager.glade
 share/gnumeric/${PKGVERSION}/glade/preferences.glade
 share/gnumeric/${PKGVERSION}/glade/print.glade
@@ -568,9 +694,9 @@ share/gnumeric/${PKGVERSION}/glade/shuffle.glade
 share/gnumeric/${PKGVERSION}/glade/simulation.glade
 share/gnumeric/${PKGVERSION}/glade/so-checkbox.glade
 share/gnumeric/${PKGVERSION}/glade/so-frame.glade
+share/gnumeric/${PKGVERSION}/glade/so-list.glade
 share/gnumeric/${PKGVERSION}/glade/so-scrollbar.glade
 share/gnumeric/${PKGVERSION}/glade/solver.glade
-share/gnumeric/${PKGVERSION}/glade/summary.glade
 share/gnumeric/${PKGVERSION}/glade/tabulate.glade
 share/gnumeric/${PKGVERSION}/glade/variance-tests.glade
 share/gnumeric/${PKGVERSION}/glade/view.glade
@@ -582,6 +708,8 @@ share/gnumeric/${PKGVERSION}/templates/mileage.gnumeric
 share/gnumeric/${PKGVERSION}/templates/purchase_order.gnumeric
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
 share/locale/am/LC_MESSAGES/gnumeric.mo
+share/locale/ar/LC_MESSAGES/gnumeric-functions.mo
+share/locale/ar/LC_MESSAGES/gnumeric.mo
 share/locale/az/LC_MESSAGES/gnumeric-functions.mo
 share/locale/az/LC_MESSAGES/gnumeric.mo
 share/locale/bg/LC_MESSAGES/gnumeric-functions.mo
@@ -594,6 +722,8 @@ share/locale/da/LC_MESSAGES/gnumeric-functions.mo
 share/locale/da/LC_MESSAGES/gnumeric.mo
 share/locale/de/LC_MESSAGES/gnumeric-functions.mo
 share/locale/de/LC_MESSAGES/gnumeric.mo
+share/locale/dz/LC_MESSAGES/gnumeric-functions.mo
+share/locale/dz/LC_MESSAGES/gnumeric.mo
 share/locale/el/LC_MESSAGES/gnumeric-functions.mo
 share/locale/el/LC_MESSAGES/gnumeric.mo
 share/locale/en_CA/LC_MESSAGES/gnumeric-functions.mo
@@ -628,6 +758,8 @@ share/locale/lt/LC_MESSAGES/gnumeric-functions.mo
 share/locale/lt/LC_MESSAGES/gnumeric.mo
 share/locale/lv/LC_MESSAGES/gnumeric-functions.mo
 share/locale/lv/LC_MESSAGES/gnumeric.mo
+share/locale/mk/LC_MESSAGES/gnumeric-functions.mo
+share/locale/mk/LC_MESSAGES/gnumeric.mo
 share/locale/ml/LC_MESSAGES/gnumeric-functions.mo
 share/locale/ml/LC_MESSAGES/gnumeric.mo
 share/locale/mr/LC_MESSAGES/gnumeric-functions.mo
@@ -636,12 +768,14 @@ share/locale/ms/LC_MESSAGES/gnumeric-functions.mo
 share/locale/ms/LC_MESSAGES/gnumeric.mo
 share/locale/nb/LC_MESSAGES/gnumeric-functions.mo
 share/locale/nb/LC_MESSAGES/gnumeric.mo
+share/locale/ne/LC_MESSAGES/gnumeric-functions.mo
+share/locale/ne/LC_MESSAGES/gnumeric.mo
 share/locale/nl/LC_MESSAGES/gnumeric-functions.mo
 share/locale/nl/LC_MESSAGES/gnumeric.mo
 share/locale/nn/LC_MESSAGES/gnumeric-functions.mo
 share/locale/nn/LC_MESSAGES/gnumeric.mo
-share/locale/no/LC_MESSAGES/gnumeric-functions.mo
-share/locale/no/LC_MESSAGES/gnumeric.mo
+share/locale/oc/LC_MESSAGES/gnumeric-functions.mo
+share/locale/oc/LC_MESSAGES/gnumeric.mo
 share/locale/pl/LC_MESSAGES/gnumeric-functions.mo
 share/locale/pl/LC_MESSAGES/gnumeric.mo
 share/locale/pt/LC_MESSAGES/gnumeric-functions.mo
@@ -674,9 +808,6 @@ share/locale/zh_CN/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_CN/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
-share/mc/templates/gnumeric.desktop
-share/mime-info/gnumeric.keys
-share/mime-info/gnumeric.mime
 share/omf/gnumeric/gnumeric-C.omf
 share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
 share/pixmaps/gnome-application-x-applix-spreadsheet.png
@@ -701,10 +832,7 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm share/pixmaps/gnumeric
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/gnumeric
-@comment in scrollkeeper: @dirrm share/omf
-@comment in xdg-dirs: @dirrm share/mime-info
-@dirrm share/mc/templates
-@unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE}
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnumeric/${PKGVERSION}/templates
 @dirrm share/gnumeric/${PKGVERSION}/idl
 @dirrm share/gnumeric/${PKGVERSION}/glade
@@ -728,15 +856,19 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sc
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sample_datasource
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/qpro
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/python-loader
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/py-func
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plan_perfect
-${PERL}@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-loader
-${PERL}@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-func
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-loader
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-func
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/openoffice
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/oleo
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/numtheory
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/mps
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/lotus
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/html
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-tsa
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-string
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-stat
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-random
@@ -757,6 +889,8 @@ ${PERL}@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-func
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/corba
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/applix
 @dirrm lib/gnumeric/${PKGVERSION}/plugins
+@dirrm lib/gnumeric/${PKGVERSION}/include
 @dirrm lib/gnumeric/${PKGVERSION}
 @dirrm lib/gnumeric
-@comment in libbonobo: @dirrm lib/bonobo/servers
+@dirrm include/libspreadsheet-1.8/spreadsheet
+@dirrm include/libspreadsheet-1.8
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 62426126c9e..af840621b49 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.30 2007/11/23 13:48:19 rillig Exp $
+$NetBSD: distinfo,v 1.31 2008/03/07 21:33:33 wiz Exp $
 
-SHA1 (gnumeric-1.6.3.tar.bz2) = 2261b3276ed5ead65047208a6ddb7f3436b7e544
-RMD160 (gnumeric-1.6.3.tar.bz2) = 49be3b72070555ab6b58f1c59a0c22819b9b9096
-Size (gnumeric-1.6.3.tar.bz2) = 12540950 bytes
-SHA1 (patch-aa) = 1601ae861cdf1851d1939aa44666929d9ad4f1e7
-SHA1 (patch-ab) = 2762921405544d83c8a1290afffafe846e47b3d1
-SHA1 (patch-ac) = 6da3a2eea055c4cb68cf902b2a96e58ca1081326
-SHA1 (patch-ad) = 4089cdb0ed88dfe5cdd400343970b98076dccc3d
-SHA1 (patch-ae) = 6d622a588cb23af7388a5bbca3b5f5e50021a5bf
-SHA1 (patch-af) = 6db5fd63708227ae5e34bf0efb0aacaa011b52c7
+SHA1 (gnumeric-1.8.2.tar.bz2) = 1708da12f206fea1dda5c5341dfdd3eb2d1913dd
+RMD160 (gnumeric-1.8.2.tar.bz2) = fae0899a2369c4c1565a51d30ae2ad32df1ed3fb
+Size (gnumeric-1.8.2.tar.bz2) = 14075967 bytes
+SHA1 (patch-aa) = 593df8dcff9fd84715d05bd06e08b4b0670072c6
+SHA1 (patch-ab) = 42f6bfbcd4eb586bdca5b15b338f8b406c658caa
diff --git a/math/gnumeric/patches/patch-aa b/math/gnumeric/patches/patch-aa
index 57124109b03..89931b577ae 100644
--- a/math/gnumeric/patches/patch-aa
+++ b/math/gnumeric/patches/patch-aa
@@ -1,26 +1,18 @@
-$NetBSD: patch-aa,v 1.19 2006/01/30 18:36:21 joerg Exp $
+$NetBSD: patch-aa,v 1.20 2008/03/07 21:33:33 wiz Exp $
 
---- src/tools/solver/lp_solve/lp_solve.c.orig	2005-08-25 19:28:28.000000000 +0200
-+++ src/tools/solver/lp_solve/lp_solve.c
-@@ -7,6 +7,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <time.h>
-+#include <sys/time.h>
- #include <sys/timeb.h>
+Sunpro doesn't like floating point comparisons in constant expressions.
+
+--- plugins/numtheory/numtheory.c.orig	2007-01-01 03:40:18.000000000 +0100
++++ plugins/numtheory/numtheory.c	2007-11-23 16:17:34.395473000 +0100
+@@ -33,7 +33,10 @@ GNM_PLUGIN_MODULE_HEADER;
+ 
+ #define OUT_OF_BOUNDS "#LIMIT!"
  
- #define LoadInverseLib FALSE
-@@ -15891,10 +15892,10 @@ static double timeNow(void)
- #elif defined CLOCKTIME
-   return((double)clock()/CLOCKS_PER_SEC /* CLK_TCK */);
- #else
--  struct timeb buf;
-+  struct timeval tv;
+-static const double bit_max = MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
++static inline double bit_max_fn(void) {
++	return MIN (1 / GNM_EPSILON, (gnm_float)G_MAXUINT64);
++}
++#define bit_max (bit_max_fn())
  
--  ftime(&buf);
--  return((double)buf.time+((double) buf.millitm)/1000.0);
-+  gettimeofday(&tv, NULL);
-+  return((double)tv.tv_sec+((double) tv.tv_usec)/1000000.0);
- #endif
- }
+ /* ------------------------------------------------------------------------- */
  
diff --git a/math/gnumeric/patches/patch-ab b/math/gnumeric/patches/patch-ab
index 4f8fcf05b13..4ea842e49ff 100644
--- a/math/gnumeric/patches/patch-ab
+++ b/math/gnumeric/patches/patch-ab
@@ -1,20 +1,13 @@
-$NetBSD: patch-ab,v 1.12 2006/09/19 17:45:50 wiz Exp $
+$NetBSD: patch-ab,v 1.13 2008/03/07 21:33:33 wiz Exp $
 
-Patch from jsacco@garnome.
-
---- plugins/gda/plugin-gda.c.orig	2005-08-09 11:49:36.000000000 +0000
-+++ plugins/gda/plugin-gda.c
-@@ -62,11 +62,11 @@ display_recordset (GdaDataModel *recset,
- 	for (row = 0; row < rowcount; row++) {
- 		for (col = 0; col < fieldcount; col++) {
- 			gchar *str;
--			const GdaValue *value;
-+			const GValue *value;
+--- src/gnm-so-polygon.c.orig	2007-09-29 01:48:00.000000000 +0200
++++ src/gnm-so-polygon.c	2007-11-23 15:58:26.784640000 +0100
+@@ -223,7 +223,7 @@ static void
+ gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
+ {
+ 	/* TODO */
+-	return gnm_so_polygon_parent_class->write_xml_sax (so, output);
++	gnm_so_polygon_parent_class->write_xml_sax (so, output);
+ }
  
- 			value = gda_data_model_get_value_at (GDA_DATA_MODEL (recset),
- 							     col, row);
--			str = gda_value_stringify ((GdaValue *) value);
-+			str = gda_value_stringify (value);
- 			value_array_set (array,
- 					 col,
- 					 row,
+ static void
diff --git a/math/gnumeric/patches/patch-ac b/math/gnumeric/patches/patch-ac
deleted file mode 100644
index 655812c0cfd..00000000000
--- a/math/gnumeric/patches/patch-ac
+++ /dev/null
@@ -1,92 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2007/01/21 19:17:33 wiz Exp $
-
---- configure.orig	2006-03-22 04:02:52.000000000 +0000
-+++ configure
-@@ -22088,12 +22088,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GDA_CFLAGS="$GDA_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-2.0 >= 1.3.0" 2>/dev/null`
-+  pkg_cv_GDA_CFLAGS=`$PKG_CONFIG --cflags "libgda-3.0 >= 1.3.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22106,12 +22106,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GDA_LIBS="$GDA_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-2.0 >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgda-2.0 >= 1.3.0") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgda-3.0 >= 1.3.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgda-3.0 >= 1.3.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-2.0 >= 1.3.0" 2>/dev/null`
-+  pkg_cv_GDA_LIBS=`$PKG_CONFIG --libs "libgda-3.0 >= 1.3.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22130,9 +22130,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
-+	        GDA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
-         else
--	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-2.0 >= 1.3.0"`
-+	        GDA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgda-3.0 >= 1.3.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GDA_PKG_ERRORS" >&5
-@@ -22158,12 +22158,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GNOMEDB_CFLAGS="$GNOMEDB_CFLAGS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
-+  pkg_cv_GNOMEDB_CFLAGS=`$PKG_CONFIG --cflags "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22176,12 +22176,12 @@ if test -n "$PKG_CONFIG"; then
-         pkg_cv_GNOMEDB_LIBS="$GNOMEDB_LIBS"
-     else
-         if test -n "$PKG_CONFIG" && \
--    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-2.0 >= 1.3.0\"") >&5
--  ($PKG_CONFIG --exists --print-errors "libgnomedb-2.0 >= 1.3.0") 2>&5
-+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomedb-3.0 >= 1.3.0\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "libgnomedb-3.0 >= 1.3.0") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-2.0 >= 1.3.0" 2>/dev/null`
-+  pkg_cv_GNOMEDB_LIBS=`$PKG_CONFIG --libs "libgnomedb-3.0 >= 1.3.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -22200,9 +22200,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
-+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
-         else
--	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-2.0 >= 1.3.0"`
-+	        GNOMEDB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomedb-3.0 >= 1.3.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GNOMEDB_PKG_ERRORS" >&5
diff --git a/math/gnumeric/patches/patch-ad b/math/gnumeric/patches/patch-ad
deleted file mode 100644
index cf3ae7d4281..00000000000
--- a/math/gnumeric/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2007/11/23 13:48:19 rillig Exp $
-
---- src/dialogs/dialog-doc-metadata.c.orig	2005-09-29 01:29:46.000000000 +0200
-+++ src/dialogs/dialog-doc-metadata.c	2007-11-23 14:27:35.336794000 +0100
-@@ -336,7 +336,7 @@ cb_dialog_doc_metadata_owner_read_clicke
- 	GtkCheckButton * button  = GTK_CHECK_BUTTON (w); 
- 
- 	g_return_if_fail(button != NULL);
--	fprintf(stderr, "%s() - state = %d\n", __FUNCTION__, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
-+	fprintf(stderr, "%s() - state = %d\n", G_STRFUNC, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
- }
- 
- static void
diff --git a/math/gnumeric/patches/patch-ae b/math/gnumeric/patches/patch-ae
deleted file mode 100644
index 9bed82d211a..00000000000
--- a/math/gnumeric/patches/patch-ae
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2007/11/23 13:48:20 rillig Exp $
-
---- src/style.c.orig	2006-03-15 14:55:15.000000000 +0100
-+++ src/style.c	2007-11-23 14:25:49.371371000 +0100
-@@ -216,7 +216,8 @@ style_font_new_simple (PangoContext *con
- 		font->ref_count++;
- 
- #ifdef DEBUG_REF_COUNT
--	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
-+	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
-+		 G_STRFUNC,
- 		 font, font->font_name,
- 		 font->is_bold ? " bold" : "",
- 		 font->is_italic ? " italic" : "",
-@@ -274,7 +275,8 @@ style_font_ref (GnmFont *sf)
- 
- 	sf->ref_count++;
- #ifdef DEBUG_REF_COUNT
--	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
-+	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
-+		 G_STRFUNC,
- 		 sf, sf->font_name,
- 		 sf->is_bold ? " bold" : "",
- 		 sf->is_italic ? " italic" : "",
-@@ -290,7 +292,8 @@ style_font_unref (GnmFont *sf)
- 
- 	sf->ref_count--;
- #ifdef DEBUG_REF_COUNT
--	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
-+	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
-+		 G_STRFUNC,
- 		 sf, sf->font_name,
- 		 sf->is_bold ? " bold" : "",
- 		 sf->is_italic ? " italic" : "",
diff --git a/math/gnumeric/patches/patch-af b/math/gnumeric/patches/patch-af
deleted file mode 100644
index 3c5451e72da..00000000000
--- a/math/gnumeric/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.7 2007/11/23 13:48:20 rillig Exp $
-
---- src/gnm-so-polygon.c.orig	2006-03-14 19:03:29.000000000 +0100
-+++ src/gnm-so-polygon.c	2007-11-23 14:31:18.939985000 +0100
-@@ -214,7 +214,7 @@ static void
- gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
- {
- 	/* TODO */
--	return gnm_so_polygon_parent_class->write_xml_sax (so, output);
-+	gnm_so_polygon_parent_class->write_xml_sax (so, output);
- }
- 
- static void