Update to 1.2.0.

4 files changed, 14 insertions, 11 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 88bb5eb7b352..c4de4f68fb08 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.1.20
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index d28998a573c2..dee8d6ed43b3 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.1.20.tar.bz2) = 665cc405f0aaec6a36cca18189b8ff2c
+MD5 (gnome2/gnumeric-1.2.0.tar.bz2) = 21f565b128b22246a7c2a51267e575df
diff --git a/math/gnumeric2/files/patch-doc_xmldocs.make b/math/gnumeric2/files/patch-doc_xmldocs.make
index 33e74ec239be..e4f9a4864510 100644
--- a/math/gnumeric2/files/patch-doc_xmldocs.make
+++ b/math/gnumeric2/files/patch-doc_xmldocs.make
@@ -1,10 +1,10 @@
---- doc/xmldocs.make.orig	Tue Apr 22 04:37:57 2003
-+++ doc/xmldocs.make	Tue May 13 01:59:56 2003
+--- doc/xmldocs.make.orig	Sun Sep  7 22:37:55 2003
++++ doc/xmldocs.make	Sat Sep 13 02:47:14 2003
 @@ -32,7 +32,7 @@
  #   dist-hook: app-dist-hook
  #
  
--docdir = $(gnumeric_datadir)/gnome/help/$(docname)/$(lang)
+-docdir = $(gnumeric_datadir)/share/gnome/help/$(docname)/$(lang)
 +docdir = $(gnumeric_datadir)/help/$(docname)/$(lang)
  
  xml_files = $(entities) $(docname).xml
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 358d89053979..272e1d72d8aa 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -126,6 +126,9 @@ lib/gnumeric/%%VERSION%%/plugins/plot_pie/gog-ring-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/plot_xy/plot-types.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_xy/plugin.xml
+lib/gnumeric/%%VERSION%%/plugins/plot_xy/xy.so
 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
@@ -212,10 +215,6 @@ share/gnome/gnumeric/%%VERSION%%/glade/gog-axis-prefs.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
@@ -251,6 +250,7 @@ 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
 share/gnome/gnumeric/%%VERSION%%/gnome-2.0/ui/GNOME_Gnumeric.xml
 share/gnome/gnumeric/%%VERSION%%/gnome-2.0/ui/GNOME_Gnumeric_Component.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/about-authors.xml
@@ -259,7 +259,9 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/about-get-involved.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/about-history.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/about-license.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-complexNumbers.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-goalseek.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-overview.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-scenarios.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-simulation.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-solver.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/analysis-statistical.xml
@@ -674,6 +676,7 @@ share/gnome/pixmaps/gnumeric/stf-druid.png
 share/gnome/pixmaps/gnumeric/stock.xpm
 share/gnome/pixmaps/gnumeric/surface.xpm
 share/locale/am/LC_MESSAGES/gnumeric.mo
+share/locale/az/LC_MESSAGES/gnumeric.mo
 share/locale/bg/LC_MESSAGES/gnumeric.mo
 share/locale/ca/LC_MESSAGES/gnumeric.mo
 share/locale/cs/LC_MESSAGES/gnumeric.mo
@@ -744,6 +747,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/qpro
 @dirrm lib/gnumeric/%%VERSION%%/plugins/python-loader
 @dirrm lib/gnumeric/%%VERSION%%/plugins/py-func
+@dirrm lib/gnumeric/%%VERSION%%/plugins/plot_xy
 @dirrm lib/gnumeric/%%VERSION%%/plugins/plot_pie
 @dirrm lib/gnumeric/%%VERSION%%/plugins/plot_barcol
 @dirrm lib/gnumeric/%%VERSION%%/plugins/plan_perfect