* Update to 1.1.19 (Now with graphing support!)

* Fix German translation

5 files changed, 91 insertions, 28 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index c3f03f8caede..7af4e4db2fe3 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.1.17
-PORTREVISION=	1
+PORTVERSION=	1.1.19
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
@@ -35,8 +34,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 PLIST_SUB=	VERSION=${PORTVERSION}-bonobo
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC}/plugins -name "plugin.xml.in" | ${XARGS} \
 		${REINPLACE_CMD} -e 's|\.la|.so|g'
 	@${RM} -f ${WRKSRC}/GNOME_Gnumeric.server.in
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index aa216b4b4d8f..4c176c32507d 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.1.17.tar.bz2) = 7a03f24e492479b90c50c71448cc83b7
+MD5 (gnome2/gnumeric-1.1.19.tar.bz2) = 9477a2e9b4919fb4eb7048c2e3d7b4fb
diff --git a/math/gnumeric2/files/patch-po_de.po b/math/gnumeric2/files/patch-po_de.po
index 437ddbca0403..83645f150966 100644
--- a/math/gnumeric2/files/patch-po_de.po
+++ b/math/gnumeric2/files/patch-po_de.po
@@ -1,11 +1,73 @@
---- po/de.po.orig	Fri Feb  7 01:56:00 2003
-+++ po/de.po	Fri Feb  7 02:13:28 2003
-@@ -36,7 +36,7 @@
- "Last-Translator: Christian Neumair <chris@gnome-de.org>\n"
- "Language-Team: German <gnome-de@gnome.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
- #: GNOME_Gnumeric.server.in.in.h:1
+--- po/de.po.orig	Sat Jun  7 13:25:35 2003
++++ po/de.po	Wed Jun 11 20:49:26 2003
+@@ -17418,8 +17418,6 @@
+ msgid "Modify the workbook attributes"
+ msgstr "Eigenschaften des Arbeitsbuches ändern"
+ 
+-# Or "Währung"?
+-# 2001-02-17 07:30:29 CET -ke-
+ #: src/GNOME_Gnumeric.xml.h:157 src/workbook-format-toolbar.c:460
+ msgid "Money"
+ msgstr "Geld"
+@@ -17567,8 +17565,6 @@
+ msgid "Rectangle"
+ msgstr "Rechteck"
+ 
+-# Or just: "Rückgängig wiederherstellen"
+-# 2001-02-14 08:43:51 CET -ke-
+ #: src/GNOME_Gnumeric.xml.h:191 src/workbook-control-gui.c:4298
+ msgid "Redo the undone action"
+ msgstr "Rückgängig gemachte Aktion wiederherstellen"
+@@ -26334,7 +26330,6 @@
+ msgid "Sheet 1"
+ msgstr "Blatt 1"
+ 
+-# or better: Einzug?
+ # 2001-11-27 14:16:24 CET -ke-
+ #: src/print-info.c:509
+ msgid "tab"
+@@ -26492,7 +26487,6 @@
+ msgid "(Non Blanks...)"
+ msgstr "(Nicht leere...)"
+ 
+-# "überlappt"?
+ # 2001-07-15 06:40:24 CEST -ke-
+ #: src/sheet-merge.c:80
+ #, c-format
+@@ -26627,7 +26621,6 @@
+ msgid "Column %i"
+ msgstr "Spalte %i"
+ 
+-# CHECK, = numerisch?
+ # 2001-02-11 07:05:07 CET -ke-
+ #: src/tools/analysis-tools.c:222
+ #, c-format
+@@ -26657,15 +26650,6 @@
+ msgid "Covariance (%s)"
+ msgstr "Kovarianz (%s)"
+ 
+-# skewness = Schräge / Bitversatz? (lt. leo)
+-# 2001-02-10 00:50:23 CET -ke-
+-#.
+-#. * Note to translators: in the following string and others like it,
+-#. * the "/" is a separator character that can be changed to anything
+-#. * if the translation needs the slash; just use, say, "|" instead.
+-#. *
+-#. * The items are bundled like this to increase translation context.
+-#.
+ #: src/tools/analysis-tools.c:941
+ msgid ""
+ "/Mean/Standard Error/Median/Mode/Standard Deviation/Sample Variance/Kurtosis/"
+@@ -28120,12 +28104,6 @@
+ msgid "Nothing"
+ msgstr "Nichts"
+ 
+-# CHECK
+-# "entfrieren" (sic!)
+-# "auftauen"?
+-# 2001-07-15 06:44:59 CEST -ke-
+-# hmmm, auftauen
+-# 2001-12-24 -cm-
+ #: src/workbook-control-gui.c:1496
+ msgid "Un_freeze Panes"
+ msgstr "Flächen au_ftauen"
diff --git a/math/gnumeric2/files/patch-src::stf-parse.c b/math/gnumeric2/files/patch-src::stf-parse.c
deleted file mode 100644
index 09b8ea27785d..000000000000
--- a/math/gnumeric2/files/patch-src::stf-parse.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/stf-parse.c.orig	Thu Sep 12 00:21:07 2002
-+++ src/stf-parse.c	Thu Sep 12 00:21:59 2002
-@@ -876,8 +876,7 @@
- 		if (len == -1)
- 			return (char *)s;
- 		if (len > 1) {
--			if (mbstowcs (&wstr, s, 1) == 1 &&
--			    !iswprint (wstr) && !iswspace (wstr))
-+			if (mbstowcs (&wstr, s, 1) == 1)
- 				return (char *)s;
- 			s += len;
- 		} else
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 16c58ec8793e..869a78878dc7 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -111,6 +111,14 @@ lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.so
 lib/gnumeric/%%VERSION%%/plugins/openoffice/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.so
 lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_barcol/barcol.so
+lib/gnumeric/%%VERSION%%/plugins/plot_barcol/gog-barcol-prefs.glade
+lib/gnumeric/%%VERSION%%/plugins/plot_barcol/plot-types.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_barcol/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_pie/gog-pie-prefs.glade
+lib/gnumeric/%%VERSION%%/plugins/plot_pie/pie.so
+lib/gnumeric/%%VERSION%%/plugins/plot_pie/plot-types.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_pie/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
 lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
@@ -192,7 +200,13 @@ share/gnome/gnumeric/%%VERSION%%/glade/formula-guru.glade
 share/gnome/gnumeric/%%VERSION%%/glade/fourier-analysis.glade
 share/gnome/gnumeric/%%VERSION%%/glade/function-select.glade
 share/gnome/gnumeric/%%VERSION%%/glade/goalseek.glade
+share/gnome/gnumeric/%%VERSION%%/glade/gog-guru.glade
+share/gnome/gnumeric/%%VERSION%%/glade/gog-style-prefs.glade
 share/gnome/gnumeric/%%VERSION%%/glade/goto.glade
+share/gnome/gnumeric/%%VERSION%%/glade/gradient_n2s.png
+share/gnome/gnumeric/%%VERSION%%/glade/gradient_ne2sw.png
+share/gnome/gnumeric/%%VERSION%%/glade/gradient_nw2se.png
+share/gnome/gnumeric/%%VERSION%%/glade/gradient_w2e.png
 share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade
 share/gnome/gnumeric/%%VERSION%%/glade/histogram.glade
 share/gnome/gnumeric/%%VERSION%%/glade/hyperlink.glade
@@ -226,6 +240,7 @@ share/gnome/gnumeric/%%VERSION%%/glade/solver.glade
 share/gnome/gnumeric/%%VERSION%%/glade/summary.glade
 share/gnome/gnumeric/%%VERSION%%/glade/tabulate.glade
 share/gnome/gnumeric/%%VERSION%%/glade/variance-tests.glade
+share/gnome/gnumeric/%%VERSION%%/glade/view.glade
 share/gnome/gnumeric/%%VERSION%%/glade/workbook-attr.glade
 share/gnome/gnumeric/%%VERSION%%/gnome-2.0/ui/GNOME_Gnumeric.xml
 share/gnome/gnumeric/%%VERSION%%/gnome-2.0/ui/GNOME_Gnumeric_Component.xml
@@ -710,6 +725,7 @@ share/locale/fi/LC_MESSAGES/gnumeric.mo
 share/locale/fr/LC_MESSAGES/gnumeric.mo
 share/locale/ga/LC_MESSAGES/gnumeric.mo
 share/locale/gl/LC_MESSAGES/gnumeric.mo
+share/locale/he/LC_MESSAGES/gnumeric.mo
 share/locale/hi/LC_MESSAGES/gnumeric.mo
 share/locale/hr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo