Update to 1.1.17.

5 files changed, 20 insertions, 143 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 915f6efda6ca..d62357a1c4d4 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.1.16
-PORTREVISION=	2
+PORTVERSION=	1.1.17
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
@@ -17,7 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The GNOME 2 spreadsheet
 
-LIB_DEPENDS=	gsf-1.8:${PORTSDIR}/devel/libgsf
+LIB_DEPENDS=	gsf-1.9:${PORTSDIR}/devel/libgsf
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -27,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui gal2 libgda2
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-guile --with-bonobo
+CONFIGURE_ARGS=	--without-guile --with-bonobo --with-gnome-db
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
 		DEFS="-I${X11BASE}/include/gal-2.0"
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index 9e4e8cf952f5..aa216b4b4d8f 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.1.16.tar.bz2) = 6961bbceafa2a7b2355dbb2a43002919
+MD5 (gnome2/gnumeric-1.1.17.tar.bz2) = 7a03f24e492479b90c50c71448cc83b7
diff --git a/math/gnumeric2/files/patch-doc_xmldocs.make b/math/gnumeric2/files/patch-doc_xmldocs.make
index 082315756e0c..33e74ec239be 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 Sep 24 09:15:18 2002
-+++ doc/xmldocs.make	Sat Oct  5 02:43:17 2002
+--- doc/xmldocs.make.orig	Tue Apr 22 04:37:57 2003
++++ doc/xmldocs.make	Tue May 13 01:59:56 2003
 @@ -32,7 +32,7 @@
  #   dist-hook: app-dist-hook
  #
  
--docdir = $(gnumeric_datadir)/share/gnome/help/$(docname)/$(lang)
+-docdir = $(gnumeric_datadir)/gnome/help/$(docname)/$(lang)
 +docdir = $(gnumeric_datadir)/help/$(docname)/$(lang)
  
  xml_files = $(entities) $(docname).xml
diff --git a/math/gnumeric2/files/patch-src_dialogs_dialog-stf.glade b/math/gnumeric2/files/patch-src_dialogs_dialog-stf.glade
deleted file mode 100644
index 82bc0c084190..000000000000
--- a/math/gnumeric2/files/patch-src_dialogs_dialog-stf.glade
+++ /dev/null
@@ -1,132 +0,0 @@
---- src/dialogs/dialog-stf.glade.orig	Mon Apr 14 14:41:34 2003
-+++ src/dialogs/dialog-stf.glade	Mon Apr 14 14:41:38 2003
-@@ -23,7 +23,7 @@
- 	<widget class="GnomeDruidPageStandard" id="main_page">
- 	  <property name="visible">True</property>
- 	  <property name="title" translatable="yes">Data type and number of lines</property>
--	  <property name="logo">stf-druid.png</property>
-+	  <property name="logo">../../../pixmaps/gnumeric/stf-druid.png</property>
- 
- 	  <child internal-child="vbox">
- 	    <widget class="GtkVBox" id="vbox1">
-@@ -123,7 +123,7 @@
- 			  <property name="visible">True</property>
- 			  <property name="tooltip" translatable="yes">Trim leading and trailing spaces from each column, if you are unsure you should leave this at the default setting.</property>
- 			  <property name="can_focus">True</property>
--			  <property name="history">-1</property>
-+			  <property name="history">0</property>
- 
- 			  <child internal-child="menu">
- 			    <widget class="GtkMenu" id="convertwidget1">
-@@ -132,18 +132,24 @@
- 			      <child>
- 				<widget class="GtkMenuItem" id="convertwidget2">
- 				  <property name="visible">True</property>
-+			          <property name="label" translatable="yes">Always (Both Sides)</property>
-+			          <property name="use_underline">True</property>
- 				</widget>
- 			      </child>
- 
- 			      <child>
- 				<widget class="GtkMenuItem" id="convertwidget3">
- 				  <property name="visible">True</property>
-+				  <property name="label" translatable="yes">Never</property>
-+				  <property name="use_underline">True</property>
- 				</widget>
- 			      </child>
- 
- 			      <child>
- 				<widget class="GtkMenuItem" id="convertwidget4">
- 				  <property name="visible">True</property>
-+				  <property name="label" translatable="yes">On left side only</property>
-+				  <property name="use_underline">True</property>
- 				</widget>
- 			      </child>
- 
-@@ -451,7 +457,7 @@
- 	<widget class="GnomeDruidPageStandard" id="csv_page">
- 	  <property name="visible">True</property>
- 	  <property name="title" translatable="yes">Separation customization</property>
--	  <property name="logo">stf-druid.png</property>
-+	  <property name="logo">../../../pixmaps/gnumeric/stf-druid.png</property>
- 
- 	  <child internal-child="vbox">
- 	    <widget class="GtkVBox" id="vbox4">
-@@ -1107,7 +1113,7 @@
- 	<widget class="GnomeDruidPageStandard" id="fixed_page">
- 	  <property name="visible">True</property>
- 	  <property name="title" translatable="yes">Fixed width customization</property>
--	  <property name="logo">stf-druid.png</property>
-+	  <property name="logo">../../../pixmaps/gnumeric/stf-druid.png</property>
- 
- 	  <child internal-child="vbox">
- 	    <widget class="GtkVBox" id="vbox7">
-@@ -1169,7 +1175,7 @@
- 				<widget class="GtkCList" id="fixed_collist">
- 				  <property name="visible">True</property>
- 				  <property name="can_focus">True</property>
--				  <property name="n_columns">1</property>
-+				  <property name="n_columns">2</property>
- 				  <property name="column_widths">80</property>
- 				  <property name="selection_mode">GTK_SELECTION_SINGLE</property>
- 				  <property name="show_titles">True</property>
-@@ -1177,19 +1183,32 @@
- 
- 				  <child>
- 				    <widget class="GtkLabel" id="label14">
--				      <property name="visible">True</property>
- 				      <property name="label" translatable="yes">Column</property>
- 				      <property name="use_underline">False</property>
- 				      <property name="use_markup">False</property>
- 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
- 				      <property name="wrap">False</property>
- 				      <property name="selectable">False</property>
--				      <property name="xalign">7.45058e-09</property>
-+				      <property name="xalign">0</property>
- 				      <property name="yalign">0.5</property>
- 				      <property name="xpad">0</property>
- 				      <property name="ypad">0</property>
- 				    </widget>
- 				  </child>
-+				  <child>
-+				      <widget class="GtkLabel" id="label15">
-+					  <property name="label" translatable="yes">End</property>
-+					  <property name="use_underline">False</property>
-+					  <property name="use_markup">False</property>
-+					  <property name="hustify">GTK_JUSTIFY_LEFT</property>
-+					  <property name="wrap">False</property>
-+					  <property name="selectable">False</property>
-+					  <property name="xalign">0</property>
-+					  <property name="yalign">0.5</property>
-+					  <property name="xpad">0</property>
-+					  <property name="ypad">0</property>
-+				      </widget>
-+				  </child>
- 				</widget>
- 			      </child>
- 			    </widget>
-@@ -1509,7 +1528,7 @@
- 	<widget class="GnomeDruidPageStandard" id="format_page">
- 	  <property name="visible">True</property>
- 	  <property name="title" translatable="yes">Column formatting</property>
--	  <property name="logo">stf-druid.png</property>
-+	  <property name="logo">../../../pixmaps/gnumeric/stf-druid.png</property>
- 
- 	  <child internal-child="vbox">
- 	    <widget class="GtkVBox" id="druid-vbox4">
-@@ -1573,7 +1592,6 @@
- 
- 			      <child>
- 				<widget class="GtkLabel" id="label12">
--				  <property name="visible">True</property>
- 				  <property name="label" translatable="yes">Column</property>
- 				  <property name="use_underline">False</property>
- 				  <property name="use_markup">False</property>
-@@ -1677,7 +1695,6 @@
- 
- 				  <child>
- 				    <widget class="GtkLabel" id="label8">
--				      <property name="visible">True</property>
- 				      <property name="label" translatable="yes"></property>
- 				      <property name="use_underline">False</property>
- 				      <property name="use_markup">False</property>
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index ff98179090a0..16c58ec8793e 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -18,6 +18,7 @@ etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/default/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/dialog/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/workbook/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/xml/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnumeric/cut-and-paste/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/rs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/file/%gconf.xml
@@ -46,6 +47,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/default/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/sort/dialog/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/workbook/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/xml/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/cut-and-paste/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/rs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/functionselector/%gconf.xml
@@ -184,13 +186,13 @@ share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf-export.glade
 share/gnome/gnumeric/%%VERSION%%/glade/dialog-stf.glade
 share/gnome/gnumeric/%%VERSION%%/glade/dialog-zoom.glade
 share/gnome/gnumeric/%%VERSION%%/glade/exp-smoothing.glade
+share/gnome/gnumeric/%%VERSION%%/glade/fill-series.glade
 share/gnome/gnumeric/%%VERSION%%/glade/font-sel.glade
 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/goto.glade
-share/gnome/gnumeric/%%VERSION%%/glade/graph-guru.glade
 share/gnome/gnumeric/%%VERSION%%/glade/hf-config.glade
 share/gnome/gnumeric/%%VERSION%%/glade/histogram.glade
 share/gnome/gnumeric/%%VERSION%%/glade/hyperlink.glade
@@ -208,9 +210,12 @@ share/gnome/gnumeric/%%VERSION%%/glade/rank.glade
 share/gnome/gnumeric/%%VERSION%%/glade/regression.glade
 share/gnome/gnumeric/%%VERSION%%/glade/row-height.glade
 share/gnome/gnumeric/%%VERSION%%/glade/sampling.glade
+share/gnome/gnumeric/%%VERSION%%/glade/scenario-add.glade
+share/gnome/gnumeric/%%VERSION%%/glade/scenario-manager.glade
 share/gnome/gnumeric/%%VERSION%%/glade/search-replace.glade
 share/gnome/gnumeric/%%VERSION%%/glade/search.glade
 share/gnome/gnumeric/%%VERSION%%/glade/sheet-order.glade
+share/gnome/gnumeric/%%VERSION%%/glade/shuffle.glade
 share/gnome/gnumeric/%%VERSION%%/glade/simulation.glade
 share/gnome/gnumeric/%%VERSION%%/glade/so-arrow.glade
 share/gnome/gnumeric/%%VERSION%%/glade/so-checkbox.glade
@@ -522,6 +527,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/zoom-dialog.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/zoom-toolbar.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/figures/zoom.png
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/files.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/fill-series.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/filter.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/formulas.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/func-footer.xml
@@ -536,13 +542,14 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/menus.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/number-format.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/preface.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/printing.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/scenarios.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/selections.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/simulation.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/shuffling.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/solver.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/toolbars.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/worksheet.xml
 share/gnome/gnumeric/%%VERSION%%/idl/GNOME_Gnumeric.idl
-share/gnome/gnumeric/%%VERSION%%/plot-types.xml
 share/gnome/gnumeric/%%VERSION%%/templates/invoice.gnumeric
 share/gnome/gnumeric/%%VERSION%%/templates/loan.gnumeric
 share/gnome/gnumeric/%%VERSION%%/templates/mileage.gnumeric
@@ -703,13 +710,14 @@ 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/hi/LC_MESSAGES/gnumeric.mo
 share/locale/hr/LC_MESSAGES/gnumeric.mo
 share/locale/hu/LC_MESSAGES/gnumeric.mo
 share/locale/it/LC_MESSAGES/gnumeric.mo
 share/locale/ja/LC_MESSAGES/gnumeric.mo
 share/locale/ko/LC_MESSAGES/gnumeric.mo
 share/locale/lv/LC_MESSAGES/gnumeric.mo
-share/locale/mr_IN/LC_MESSAGES/gnumeric.mo
+share/locale/ml/LC_MESSAGES/gnumeric.mo
 share/locale/ms/LC_MESSAGES/gnumeric.mo
 share/locale/nl/LC_MESSAGES/gnumeric.mo
 share/locale/nn/LC_MESSAGES/gnumeric.mo
@@ -787,6 +795,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/plugins
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/functionselector
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs/rs
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/cut-and-paste
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/dialogs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/xml
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/workbook
@@ -816,6 +825,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/file
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs/rs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/dialogs
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/cut-and-paste
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/xml
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/workbook
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/sort/dialog