Update to 1.6.2:

Gnumeric 1.6.2

Ivan, Y.C. Wong:
	* Fix Gdk-WARNING when cutting or copying cells. [#314210]
	* No more debug command prompt. Error/warning messages will
	  go to an existing command prompt (if any).

Jody:
	* Disable the IRC link in the help menu.
	* Use the cannonical web page in case of problems.
	* Silence some warnings in the ODS importer.

Morten:
	* Fix COUNTBLANK.
	* Fix ATAN2(0,0).
	* Make AND, OR, and XOR ignore strings as claimed.
	* Fix TRIM for non-ASCII case with spaces at end.
	* Improve Excel compatibility of BIN2DEC, BIN2HEX, and
	  BIN2OCT.  [#323787]
	* Fix crash on xml load.  [#323888]
	* Fix file corruption on saving scenarios.  [#323927]
	* Fix a pile of leaks in solver and scenario saving and loading.
	* Fix leaks in solver dialog.
	* Fix parser leak.  [#301127]
	* Fix solver dialog crash.  [#324585]
	* Fix FMR in SUBSTITUTE.
	* Fix REPLACE and SEARCH for non-ASCII strings.
	* Fix division-by-zero problems in FIXED, ROUND, ROUNDUP,
	  ROUNDDOWN, TRUNC.
	* Fix accuracy of ROUND, ROUNDUP, ROUNDDOWN, TRUNC.
	* Fix out-of-memory problem in REPT.
	* Fix lots of little XL compatibility problems in string
	  functions.
	* Fix error on Search-and-replace.
	* Fix near-infinite loop in FACTDOUBLE.
	* Fix text-to-columns crash probably affecting stf import too.
	* Fix font preference crash.  [#326830]
	* Fix memory allocation problem for writing charts.
	* Fix loading of boolean constants from ods files.
	* Fix MID for out-of-bounds values.
	* Fix constructed-range parsing for OO.
	* Fix SECOND, MINUTE, HOUR compatibility problems.
	* Fix DATE compatibility for bizarre input.
	* Cleanup parameter handling in financial functions.

Jon Kåre:
        * Hand clipboard off to clipboard manager when exiting.

Nick Lamb:
	* Fix CONVERT crash.  [#323678]

3 files changed, 26 insertions, 13 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 527cdc331fa..eadfb070ff7 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.103 2006/01/30 21:02:52 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2006/02/04 17:03:51 wiz Exp $
 #
 
-DISTNAME=		gnumeric-1.6.1
-PKGREVISION=		3
+DISTNAME=		gnumeric-1.6.2
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,15 +23,11 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
 
-.include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../lang/python/application.mk"
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../databases/libgnomedb/buildlink3.mk"
-BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.12.2
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
@@ -44,6 +39,8 @@ BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.12.2
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 # guile is currently not supported in gnumeric
 #.include "../../lang/guile/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../misc/goffice/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
@@ -53,5 +50,8 @@ BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.2
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.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 22d977dcfc1..b7f45bf58c9 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2005/12/17 20:49:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2006/02/04 17:03:52 wiz Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -41,6 +41,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/gdaif/gdaif.la
+lib/gnumeric/${PKGVERSION}/plugins/gdaif/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/gnome-db/gnomedb.la
+lib/gnumeric/${PKGVERSION}/plugins/gnome-db/plugin.xml
+lib/gnumeric/${PKGVERSION}/plugins/gnome-db/ui.xml
 lib/gnumeric/${PKGVERSION}/plugins/html/html.la
 lib/gnumeric/${PKGVERSION}/plugins/html/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/lotus/lotus.la
@@ -53,6 +58,10 @@ 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
+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/qpro/plugin.xml
@@ -700,6 +709,7 @@ share/pixmaps/win32-gnumeric.ico
 @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}
 @dirrm share/gnumeric/${PKGVERSION}/templates
 @dirrm share/gnumeric/${PKGVERSION}/idl
 @dirrm share/gnumeric/${PKGVERSION}/glade
@@ -724,12 +734,16 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sample_datasource
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/qpro
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plan_perfect
+@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-db
+@dirrm lib/gnumeric/${PKGVERSION}/plugins/gdaif
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-string
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-stat
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/fn-random
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index f269dcec38a..12a5616d9d0 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.25 2006/01/31 20:32:07 wiz Exp $
+$NetBSD: distinfo,v 1.26 2006/02/04 17:03:52 wiz Exp $
 
-SHA1 (gnumeric-1.6.1.tar.bz2) = 26d82fed4b94236079831f743fa89943b0c1ab9d
-RMD160 (gnumeric-1.6.1.tar.bz2) = 708b8bced428426b67efa199c547aad67542cbf1
-Size (gnumeric-1.6.1.tar.bz2) = 12529002 bytes
+SHA1 (gnumeric-1.6.2.tar.bz2) = 20c2028a7b0165e68e681f571f710d59782e488a
+RMD160 (gnumeric-1.6.2.tar.bz2) = e9273b1305a0bf2b4d5c701a9c8c3cf599805617
+Size (gnumeric-1.6.2.tar.bz2) = 12539827 bytes
 SHA1 (patch-aa) = 1601ae861cdf1851d1939aa44666929d9ad4f1e7
-SHA1 (patch-ab) = 03ad45d2128aaedd577a094b305d90d682dd4c39