Update gnumeric to 0.46

Changes are:

Gnumeric 0.46

Michael:
        * Fixed problems closing workbooks
        * Add pristine workbook discard
        * Fixup html export.
        * Fixed print header/footer setup, users should remove
          ~/.gnome/Gnumeric to speedup load.

Jon:
        * Lots of Excel style export work:
        format, font, colors, borders, alignment, wrap, rotation.
        * Excel export row/col sizing.
        * Excel fixed up DBCELL collating to export lots of rows correctly.

JP:
        * Added sorting of infinite ranges
        * Got rid of blank sheets when printing

Frank:
        * Worked on Excel summary export

Jody:
        * Begin exception handling for corba vs gui.
        * Add some simple version protection for plugins.
        * Improve error reporting for file loading.
        * Explicitly disable passord protected XL spreadsheets.
        * Bug fixing.

Cort:
        * Expanded CORBA API.

Andrew:
        * Many improvement for multi-dimensional linear regression.

Jukka:
        * Implemented Simplex algorithm for Solver
        * Solver can now solve some simple LP problems (more interesting
          stuff is coming later).

--------------------------------------------------------------------------

Gnumeric 0.45

JP:
        * Improved sort dialog

Nat:
        * Updated bonobo infastructure

Kevin:
        * Plan Perfect plugin
        * DIF export / import

Jody:
        * Improved clipboard ops.
        * import Excel auto-ranges
        * better range instersection
        * Guile plugin fixed
        * Auto fill display fixes.

Jon:
        * Style hashing

Michael:
        * Misc cleans
        * Fix #2110

--------------------------------------------------------------------------

Gnumeric 0.44

Jon:
        * Vastly improved col / row sizing in excel import
        * ditto for Excel object placement.

JP:
        * Expanded sort dialog to allow sorting of rows as well as columns
        * Added advanced button to sort dialog to allow sorting but case
        sensitivty and text (rather value)

--------------------------------------------------------------------------

Gnumeric 0.43

        * Minor build fix.

--------------------------------------------------------------------------

Gnumeric 0.42

Michael:
        * Totaly re-wrote style engine.

Jukka:
        * Implemented IRR and XIRR financial functions
        * Fixed the handling of the database function criterias
        * Fixed the non-numeric return values of DGET
        * One-dimensional GROWTH and TREND should work now
        * Documentation of the db functions improved

Jody:
        * Complete transition of cut/paste to cell movement code.
        * 1st pass at borders & patterns
        * Improve edit popup.
        * Rework cell format dialog.
        * Some support for inter book references (no dependencies yet)

Daniel:
        * Excel Name export.

Federico:
        * Improved dragging and zooming behavior in the print preview.
        * Added "open hand" and "closed hand" cursors for dragging the
          print preview.

Robert:
        * Primitive oleo import : supports numbers and text.

Frank:
        * Huge chunk of summary-info re-structuring.
        * Import and export lots of new summary fields.

JPR:
        * Improving sort dialog

Jeff:
        * Sylk import filter.
        * CSV export filter.

5 files changed, 90 insertions, 36 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 139873d4a45..f1d61e6e73a 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 1999/11/17 10:54:03 rh Exp $
+# $NetBSD: Makefile,v 1.15 2000/01/01 14:23:24 rh Exp $
 #
 
-DISTNAME=	gnumeric-0.41
+DISTNAME=	gnumeric-0.46
 CATEGORIES=	math gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnumeric/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/gnumeric/
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnome.org/gnumeric/
 BUILD_DEPENDS+=	${LOCALBASE}/bin/python:../../lang/python
 DEPENDS+=	gnome-core-*:../../x11/gnome-core
 DEPENDS+=	gnome-print-*:../../print/gnome-print
-DEPENDS+=	libglade-*:../../devel/libglade
+DEPENDS+=	libglade>=0.11:../../devel/libglade
 
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
diff --git a/math/gnumeric/files/md5 b/math/gnumeric/files/md5
index a641e465148..96d4f31a3f8 100644
--- a/math/gnumeric/files/md5
+++ b/math/gnumeric/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/11/17 10:54:07 rh Exp $
+$NetBSD: md5,v 1.6 2000/01/01 14:23:25 rh Exp $
 
-MD5 (gnumeric-0.41.tar.gz) = 1b03122ce3755c1841434b6723355670
+MD5 (gnumeric-0.46.tar.gz) = e873180c7f9cad1004ac75ea57170ed2
diff --git a/math/gnumeric/files/patch-sum b/math/gnumeric/files/patch-sum
index f988d559f22..89cf4eefee1 100644
--- a/math/gnumeric/files/patch-sum
+++ b/math/gnumeric/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.3 1999/09/08 16:16:07 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/01/01 14:23:25 rh Exp $
 
-MD5 (patch-aa) = 9729f95f3c6acb477a3cd1b881daa0c3
+MD5 (patch-aa) = f12069a47577c828e0643bfae9b05b12
diff --git a/math/gnumeric/patches/patch-aa b/math/gnumeric/patches/patch-aa
index 2708e2d9fb5..04c86f3c7ab 100644
--- a/math/gnumeric/patches/patch-aa
+++ b/math/gnumeric/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 1999/09/08 16:16:07 rh Exp $
+$NetBSD: patch-aa,v 1.4 2000/01/01 14:23:25 rh Exp $
 
---- configure.orig	Tue Sep  7 06:16:32 1999
-+++ configure	Wed Sep  8 12:23:31 1999
-@@ -2063,8 +2063,10 @@
+--- configure.orig	Fri Dec 31 01:02:16 1999
++++ configure	Sat Jan  1 13:54:50 2000
+@@ -2065,8 +2065,10 @@
    ac_tool_prefix=
  fi
  
@@ -13,25 +13,25 @@ $NetBSD: patch-aa,v 1.3 1999/09/08 16:16:07 rh Exp $
  
  # Check for any special flags to pass to ltconfig.
  libtool_flags=
-@@ -3333,7 +3335,7 @@
+@@ -3335,7 +3337,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
 +LIBS="-L${LOCALBASE}/lib -lxml -lz ${LIBS}"
  cat > conftest.$ac_ext <<EOF
- #line 3339 "configure"
+ #line 3341 "configure"
  #include "confdefs.h"
-@@ -3364,7 +3366,7 @@
+@@ -3365,7 +3367,7 @@
+   echo "$ac_t""yes" 1>&6
    
  		
- 		
 -		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
 +		GNOME_XML_LIB=-lxml
  	
  else
    echo "$ac_t""no" 1>&6
-@@ -6449,10 +6451,12 @@
+@@ -6556,10 +6558,12 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/math/gnumeric/pkg/PLIST b/math/gnumeric/pkg/PLIST
index f3ee554eedb..5ca0eca902f 100644
--- a/math/gnumeric/pkg/PLIST
+++ b/math/gnumeric/pkg/PLIST
@@ -1,22 +1,30 @@
-@comment $NetBSD: PLIST,v 1.6 1999/11/17 10:54:07 rh Exp $
+@comment $NetBSD: PLIST,v 1.7 2000/01/01 14:23:26 rh Exp $
 bin/gnumeric
 etc/CORBA/servers/gnumeric.gnorba
-lib/gnumeric/plugins/libsample.so.0.0
-lib/gnumeric/plugins/libsample.a
-lib/gnumeric/plugins/libstat.so.0.0
-lib/gnumeric/plugins/libstat.a
-lib/gnumeric/plugins/liblotus.so.0.0
-lib/gnumeric/plugins/liblotus.a
-lib/gnumeric/plugins/libcsv.so.0.0
-lib/gnumeric/plugins/libcsv.a
-lib/gnumeric/plugins/libtext.so.0.0
-lib/gnumeric/plugins/libtext.a
-lib/gnumeric/plugins/libxbase.so.0.0
-lib/gnumeric/plugins/libxbase.a
-lib/gnumeric/plugins/libhtml.so.0.0
-lib/gnumeric/plugins/libhtml.a
-lib/gnumeric/plugins/libpython.so.0.0
-lib/gnumeric/plugins/libpython.a
+lib/gnumeric/plugins/0.46/libgnum_sample.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_sample.a
+lib/gnumeric/plugins/0.46/libgnum_stat.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_stat.a
+lib/gnumeric/plugins/0.46/libgnum_lotus.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_lotus.a
+lib/gnumeric/plugins/0.46/libgnum_oleo.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_oleo.a
+lib/gnumeric/plugins/0.46/libgnum_sc.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_sc.a
+lib/gnumeric/plugins/0.46/libgnum_sylk.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_sylk.a
+lib/gnumeric/plugins/0.46/libgnum_csv.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_csv.a
+lib/gnumeric/plugins/0.46/libgnum_text.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_text.a
+lib/gnumeric/plugins/0.46/libgnum_xbase.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_xbase.a
+lib/gnumeric/plugins/0.46/libgnum_html.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_html.a
+lib/gnumeric/plugins/0.46/libgnum_dif.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_dif.a
+lib/gnumeric/plugins/0.46/libgnum_python.so.0.0
+lib/gnumeric/plugins/0.46/libgnum_python.a
 share/locale/zh_TW.Big5/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
 share/locale/sv/LC_MESSAGES/gnumeric.mo
@@ -46,6 +54,7 @@ share/locale/es_PA/LC_MESSAGES/gnumeric.mo
 share/locale/es_PE/LC_MESSAGES/gnumeric.mo
 share/locale/es_SV/LC_MESSAGES/gnumeric.mo
 share/locale/en_GB/LC_MESSAGES/gnumeric.mo
+share/locale/uk/LC_MESSAGES/gnumeric.mo
 share/idl/Gnumeric.idl
 share/idl/Gnumeric-value.idl
 share/pixmaps/gnumeric/orient-horizontal.png
@@ -125,9 +134,50 @@ share/pixmaps/gnumeric/chart_surface_1_1.png
 share/pixmaps/gnumeric/chart_surface_1_2.png
 share/pixmaps/gnumeric/chart_surface_2_1.png
 share/pixmaps/gnumeric/chart_surface_2_2.png
+share/pixmaps/gnumeric/gp_125grey
+share/pixmaps/gnumeric/gp_25grey
+share/pixmaps/gnumeric/gp_50grey
+share/pixmaps/gnumeric/gp_625grey
+share/pixmaps/gnumeric/gp_75grey
+share/pixmaps/gnumeric/gp_diag
+share/pixmaps/gnumeric/gp_diag_cross
+share/pixmaps/gnumeric/gp_horiz
+share/pixmaps/gnumeric/gp_rev_diag
+share/pixmaps/gnumeric/gp_solid
+share/pixmaps/gnumeric/gp_thick_diag_cross
+share/pixmaps/gnumeric/gp_thin_diag
+share/pixmaps/gnumeric/gp_thin_diag_cross
+share/pixmaps/gnumeric/gp_thin_horiz
+share/pixmaps/gnumeric/gp_thin_horiz_cross
+share/pixmaps/gnumeric/gp_thin_rev_diag
+share/pixmaps/gnumeric/gp_thin_vert
+share/pixmaps/gnumeric/gp_vert
+share/pixmaps/gnumeric/line_pattern_dash_dot
+share/pixmaps/gnumeric/line_pattern_dash_dot_dot
+share/pixmaps/gnumeric/line_pattern_dashed
+share/pixmaps/gnumeric/line_pattern_dotted
+share/pixmaps/gnumeric/line_pattern_double
+share/pixmaps/gnumeric/line_pattern_hair
+share/pixmaps/gnumeric/line_pattern_medium
+share/pixmaps/gnumeric/line_pattern_medium_dash
+share/pixmaps/gnumeric/line_pattern_medium_dash_dot
+share/pixmaps/gnumeric/line_pattern_slant
+share/pixmaps/gnumeric/line_pattern_medium_dash_dot_dot
+share/pixmaps/gnumeric/line_pattern_thick
+share/pixmaps/gnumeric/line_pattern_thin
+share/pixmaps/gnumeric/bottom_border
+share/pixmaps/gnumeric/diag_border
+share/pixmaps/gnumeric/left_border
+share/pixmaps/gnumeric/rev_diag_border
+share/pixmaps/gnumeric/right_border
+share/pixmaps/gnumeric/top_border
+share/pixmaps/gnumeric/inside_horiz_border
+share/pixmaps/gnumeric/inside_vert_border
+share/pixmaps/gnumeric/inside_border
+share/pixmaps/gnumeric/outline_border
+share/pixmaps/gnumeric/no_border
 share/pixmaps/gnome-gnumeric.png
 share/pixmaps/gnome-gnumeric-xl.png
-share/mc/templates/gnumeric.desktop
 share/gnome/help/gnumeric/C/gnumeric.html
 share/gnome/help/gnumeric/C/topic.dat
 share/gnome/help/gnumeric/C/images/autofill-1.jpg
@@ -507,10 +557,11 @@ share/gnome/help/gnumeric/C/tutorials.html
 share/gnome/help/gnumeric/C/worksheet.html
 share/gnome/help/gnumeric/C/x176.html
 share/gnome/help/gnumeric/C/x222.html
-share/gnome/help/gnumeric/C/x674.html
+share/gnome/help/gnumeric/C/x669.html
 share/gnome/help/gnumeric/C/x682.html
 share/gnome/help/gnumeric/C/docbook.css
 share/gnome/apps/Applications/gnumeric.desktop
+share/mc/templates/gnumeric.desktop
 share/mime-info/gnumeric.keys
 share/mime-info/gnumeric.mime
 share/gnumeric/python/gnumeric_startup.py
@@ -526,6 +577,9 @@ share/gnumeric/glade/summary.glade
 share/gnumeric/glade/dialog-zoom.glade
 share/gnumeric/glade/insert-cells.glade
 share/gnumeric/glade/delete-cells.glade
+share/gnumeric/glade/cell-format.glade
+share/gnumeric/glade/cell-sort.glade
+@dirrm lib/gnumeric/plugins/0.46
 @dirrm lib/gnumeric/plugins
 @dirrm lib/gnumeric
 @dirrm share/pixmaps/gnumeric