Update gnumeric to 1.0.12. Changes include:

	* Guile support (NetBSD package)
	* Bugfixes
        * backport small text import cleanup.
        * Remove the patch to the xml importer in 1.0.11 and solve the
          problem using a blunt object.
        * Support the global outline buttons
        * Use the back port of the new xml parser in libxml1 (thanks DV)
        * Fix GAMMAINV.

4 files changed, 91 insertions, 83 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 059f8cd7ca6..7a138320a48 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2002/12/24 06:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2003/01/09 12:41:11 rh Exp $
 #
 
-DISTNAME=		gnumeric-1.0.10
-PKGREVISION=		1
+DISTNAME=		gnumeric-1.0.12
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.0/}
 
@@ -23,7 +22,6 @@ USE_GMAKE=		YES
 USE_PERL5=		YES
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--without-guile		# needs CVS-only guile-1.5
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-psiconv
 CONFIGURE_ARGS+=	--localstatedir=${SCROLLKEEPER_DATADIR}
@@ -38,6 +36,7 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../devel/libole2/buildlink2.mk"
 .include "../../devel/oaf/buildlink2.mk"
+.include "../../lang/guile/buildlink2.mk"
 .include "../../print/gnome-print/buildlink2.mk"
 .include "../../textproc/libunicode/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index 1741d9acc47..353c8cd0af0 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,37 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2002/07/26 01:09:51 mjl Exp $
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnumeric.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnumeric.mo
+@comment $NetBSD: PLIST,v 1.17 2003/01/09 12:41:11 rh Exp $
 bin/gnumeric
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix/applix.la
@@ -49,6 +16,10 @@ lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel/excel.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel/excel.la
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel/excel.so
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel/plugin.xml
+lib/gnumeric/${PKGVERSION}-bonobo/plugins/guile/guile.a
+lib/gnumeric/${PKGVERSION}-bonobo/plugins/guile/guile.la
+lib/gnumeric/${PKGVERSION}-bonobo/plugins/guile/guile.so
+lib/gnumeric/${PKGVERSION}-bonobo/plugins/guile/plugin.xml
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/html/html.a
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/html/html.la
 lib/gnumeric/${PKGVERSION}-bonobo/plugins/html/html.so
@@ -815,10 +786,10 @@ share/gnome/help/gnumeric/C/solver.html
 share/gnome/help/gnumeric/C/solver.sgml
 share/gnome/help/gnumeric/C/std-toolbar.html
 share/gnome/help/gnumeric/C/t-test.html
-share/gnome/help/gnumeric/C/topic.dat
 share/gnome/help/gnumeric/C/toolbars.html
 share/gnome/help/gnumeric/C/toolbars.sgml
 share/gnome/help/gnumeric/C/tools-menu.html
+share/gnome/help/gnumeric/C/topic.dat
 share/gnome/help/gnumeric/C/view-menu.html
 share/gnome/help/gnumeric/C/worksheet.sgml
 share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/3D/.category
@@ -900,12 +871,47 @@ share/gnumeric/${PKGVERSION}-bonobo/glade/tabulate.glade
 share/gnumeric/${PKGVERSION}-bonobo/glade/variance-tests.glade
 share/gnumeric/${PKGVERSION}-bonobo/glade/workbook-attr.glade
 share/gnumeric/${PKGVERSION}-bonobo/gnome/ui/GNOME_Gnumeric.xml
+share/gnumeric/${PKGVERSION}-bonobo/guile/functions.scm
+share/gnumeric/${PKGVERSION}-bonobo/guile/gnumeric_startup.scm
 share/gnumeric/${PKGVERSION}-bonobo/idl/GNOME_Gnumeric.idl
 share/gnumeric/${PKGVERSION}-bonobo/idl/GNOME_Gnumeric_Graph.idl
 share/gnumeric/${PKGVERSION}-bonobo/templates/invoice.gnumeric
 share/gnumeric/${PKGVERSION}-bonobo/templates/loan.gnumeric
 share/gnumeric/${PKGVERSION}-bonobo/templates/mileage.gnumeric
 share/gnumeric/${PKGVERSION}-bonobo/templates/purchase_order.gnumeric
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/en_AU/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnumeric.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 share/mc/templates/gnumeric.desktop
 share/mime-info/gnumeric.keys
 share/mime-info/gnumeric.mime
@@ -970,39 +976,42 @@ share/pixmaps/gnumeric/right-down.png
 share/pixmaps/gnumeric/right_border
 share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/top_border
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/derivatives
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/dif
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/html
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/lotus
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/mps
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/numtheory
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/oleo
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/sc
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/sylk
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xbase
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xml_sax
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins
-@dirrm lib/gnumeric/${PKGVERSION}-bonobo
-@dirrm lib/gnumeric
-@dirrm share/gnome/help/gnumeric/C/figures
-@dirrm share/gnome/help/gnumeric/C/stylesheet-images
-@dirrm share/gnome/help/gnumeric/C
-@dirrm share/gnome/help/gnumeric
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/3D
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Classical
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Colourful
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Financial
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/General
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/List
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/glade
+@dirrm share/pixmaps/gnumeric
+@dirrm share/omf/gnumeric
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/idl
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/guile
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/gnome/ui
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/gnome
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/idl
-@dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/glade
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/List
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/General
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Financial
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Colourful
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/Classical
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates/3D
+@dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo
 @dirrm share/gnumeric
-@dirrm share/omf/gnumeric
-@dirrm share/pixmaps/gnumeric
+@exec ${MKDIR} %D/share/gnome/help/gnumeric/C/stylesheet-images
+@dirrm share/gnome/help/gnumeric/C/stylesheet-images
+@dirrm share/gnome/help/gnumeric/C/figures
+@dirrm share/gnome/help/gnumeric/C
+@dirrm share/gnome/help/gnumeric
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xml_sax
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xbase
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/sylk
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/sc
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/oleo
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/numtheory
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/mps
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/lotus
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/html
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/guile
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/excel
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/dif
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/derivatives
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/applix
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins
+@dirrm lib/gnumeric/${PKGVERSION}-bonobo
+@dirrm lib/gnumeric
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index d6a60b604eb..8ed17b5e9b0 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2002/10/16 11:31:24 martti Exp $
+$NetBSD: distinfo,v 1.15 2003/01/09 12:41:11 rh Exp $
 
-SHA1 (gnumeric-1.0.10.tar.gz) = af6c474a8b0b0cd69eb922c6e50741664c5ed089
-Size (gnumeric-1.0.10.tar.gz) = 14179667 bytes
-SHA1 (patch-aa) = fdd803fddef9c2762bba11eea26dc6f05dc0bcb4
+SHA1 (gnumeric-1.0.12.tar.gz) = 5fc3641e57ebb3aac295254322c68352976d51a8
+Size (gnumeric-1.0.12.tar.gz) = 12873311 bytes
+SHA1 (patch-aa) = ee1d9dd712638c1ce99a3b0280125e5c7788184d
diff --git a/math/gnumeric/patches/patch-aa b/math/gnumeric/patches/patch-aa
index 5758c154db6..cba7a8bd2dd 100644
--- a/math/gnumeric/patches/patch-aa
+++ b/math/gnumeric/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.13 2002/03/21 13:32:28 martti Exp $
+$NetBSD: patch-aa,v 1.14 2003/01/09 12:41:12 rh Exp $
 
---- doc/Makefile.in.orig	Thu Mar 21 12:00:57 2002
-+++ doc/Makefile.in	Thu Mar 21 12:01:19 2002
-@@ -185,7 +185,7 @@
- perl_val = @perl_val@
- python_val = @python_val@
+--- doc/Makefile.in.orig	Sat Jan  4 04:30:42 2003
++++ doc/Makefile.in
+@@ -274,7 +274,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
 -SUBDIRS = C de es hu ja nl no pl pt ru sk sv
 +SUBDIRS = C
  
- EXTRA_DIST =  	sgmldocs.make gnumeric-doc.make make-func-list.pl 	translating.sgml			Design					Future-Roadmap				README					saving.txt				writing-functions.sgml			excel-format-doc.txt			linux-expo-99-gnumeric.tex      	linuxexpo.sty 				Dependencies.txt 			Styles.txt 				features.txt 				pref-attributes.txt 			guile-gnumeric.txt			python-gnumeric.txt 			stf-export.txt 				stf-parser.txt
- 
+ EXTRA_DIST = \
+ 	sgmldocs.make gnumeric-doc.make make-func-list.pl \