Update to 1.2.13:

Andreas:
	http://bugzilla.gnome.org/show_bug.cgi?id=142219
	* Handle borders in latex export correctly (broken in 1.2.12 only)
	http://bugzilla.gnome.org/show_bug.cgi?id=142219
	* Handle borders in latex export correctly
	http://bugzilla.gnome.org/show_bug.cgi?id=143577
	* fix grid printing

Emmanuel Pacaud:
	http://bugzilla.gnome.org/show_bug.cgi?id=142212
	* In a line graph, don't use '0' if Y value is missing.

Jody:
	http://bugzilla.gnome.org/show_bug.cgi?id=141940
	* Fix MS XL crash when there are too many strings
	* xls import gradient backgrounds in chart elements
	* Restore the font selector to chart editors
	* Support series with no entry in a legend
	http://bugzilla.gnome.org/show_bug.cgi?id=142267
	* Fix drawing selection below hidden merged cells
	http://bugzilla.gnome.org/show_bug.cgi?id=103054
	* Fix xls named expression and addin import/export
	http://bugzilla.gnome.org/show_bug.cgi?id=142474
	* Use first rather than last conditional value fmt as catch-all
	* Enable implicit iteration for operators
	http://bugzilla.gnome.org/show_bug.cgi?id=143577
	* Re-enable gridline printing

Morten:
	* Fix image-inside-xls problem.
	* Improve error handling in xbase plugin.
	* Fix parser problem with single empty arg after expression.

4 files changed, 29 insertions, 8 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index dd70d6c49e9..7727ccac8f9 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2004/06/07 09:23:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.88 2004/07/03 17:12:11 jmmv Exp $
 #
 
-DISTNAME=		gnumeric-1.2.12
-PKGREVISION=		1
+DISTNAME=		gnumeric-1.2.13
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,8 +12,9 @@ COMMENT=		Spreadsheet program from the GNOME project
 
 BUILD_USES_MSGFMT=	YES
 USE_BUILDLINK3=		YES
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
+USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
 USE_LIBTOOL=		YES
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index 2f448b76686..4877767a0d0 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2004/05/24 18:13:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2004/07/03 17:12:11 jmmv Exp $
 bin/gnumeric
 bin/ssconvert
 lib/bonobo/servers/GNOME_Gnumeric.server
@@ -752,7 +752,11 @@ share/pixmaps/gnumeric/stf-druid.png
 share/pixmaps/gnumeric/stock.xpm
 share/pixmaps/gnumeric/surface.xpm
 @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
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/share/gnome/help/gnumeric/C/figures
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/share/gnome/help/gnumeric/C
@@ -773,6 +777,8 @@ share/pixmaps/gnumeric/surface.xpm
 @dirrm share/gnumeric/${PKGVERSION}-bonobo/autoformat-templates
 @dirrm share/gnumeric/${PKGVERSION}-bonobo
 @dirrm share/gnumeric
+@comment in GConf2: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xml_sax
 @dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/xbase
 @dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins/uihello
@@ -815,3 +821,4 @@ share/pixmaps/gnumeric/surface.xpm
 @dirrm lib/gnumeric/${PKGVERSION}-bonobo/plugins
 @dirrm lib/gnumeric/${PKGVERSION}-bonobo
 @dirrm lib/gnumeric
+@comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 4f44c0d0cd7..c71f181326f 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2004/06/07 08:57:24 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2004/07/03 17:12:11 jmmv Exp $
 
-SHA1 (gnumeric-1.2.12.tar.bz2) = 51f37ff5579980ff4177f6bb7cd24cb9dee8b861
-Size (gnumeric-1.2.12.tar.bz2) = 14284997 bytes
+SHA1 (gnumeric-1.2.13.tar.bz2) = 9f64c03bce264c81e36541acf9f1662057f351f0
+Size (gnumeric-1.2.13.tar.bz2) = 14319675 bytes
+SHA1 (patch-aa) = db51346d9335790dcdcb2ab0b73eb8ad65128a8b
 SHA1 (patch-ab) = fd62712cf582aebe3e5dd99a15fa4d4c02ee7198
diff --git a/math/gnumeric/patches/patch-aa b/math/gnumeric/patches/patch-aa
new file mode 100644
index 00000000000..54af0c88e75
--- /dev/null
+++ b/math/gnumeric/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.16 2004/07/03 17:12:11 jmmv Exp $
+
+--- po/am.po.orig	2004-06-23 06:41:03.000000000 +0200
++++ po/am.po
+@@ -5176,7 +5176,7 @@ msgstr ""
+ 
+ #: plugins/fn-info/plugin.xml.in.h:2
+ msgid "Information"
+-msgstr "&መረጃ"
++msgstr "መረጃ"
+ 
+ #: plugins/fn-info/plugin.xml.in.h:3
+ msgid "Information Functions"