Update to 1.1.12.

5 files changed, 31 insertions, 12 deletions

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 6a7ad8088d35..c22aa1952042 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnumeric2
-PORTVERSION=	1.1.11
+PORTVERSION=	1.1.12
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.1
diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo
index f052c6e90884..042aeb8cd530 100644
--- a/math/gnumeric2/distinfo
+++ b/math/gnumeric2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnumeric-1.1.11.tar.bz2) = f73e9d3f38a5ecbdab9b8c829150d735
+MD5 (gnome2/gnumeric-1.1.12.tar.bz2) = c0bcad7c9d839f2b73600946660ea911
diff --git a/math/gnumeric2/files/patch-configure b/math/gnumeric2/files/patch-configure
index 0556ddc28540..4feaedadedd2 100644
--- a/math/gnumeric2/files/patch-configure
+++ b/math/gnumeric2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Sep 12 00:39:10 2002
-+++ configure	Thu Sep 12 00:39:36 2002
-@@ -8114,6 +8114,7 @@
+--- configure.orig	Wed Nov 13 14:39:44 2002
++++ configure	Fri Nov 15 20:11:48 2002
+@@ -8244,6 +8244,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,12 +8,22 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13797,7 +13798,7 @@
+@@ -9562,7 +9563,8 @@
+ int
+ main ()
+ {
+-FILE *f = fdopen(1, "r")
++FILE *f;
++f = fdopen(1, "r")
+   ;
+   return 0;
+ }
+@@ -13997,7 +13999,7 @@
  }'
  fi
  
 -DEFS=-DHAVE_CONFIG_H
 +DEFS="$DEFS -DHAVE_CONFIG_H"
  
- 
- 
+ ac_libobjs=
+ ac_ltlibobjs=
diff --git a/math/gnumeric2/files/patch-doc_C_keybinding-appendix.xml b/math/gnumeric2/files/patch-doc_C_keybinding-appendix.xml
new file mode 100644
index 000000000000..df1355984e71
--- /dev/null
+++ b/math/gnumeric2/files/patch-doc_C_keybinding-appendix.xml
@@ -0,0 +1,11 @@
+--- doc/C/keybinding-appendix.xml.orig	Sat Nov 16 16:55:01 2002
++++ doc/C/keybinding-appendix.xml	Sat Nov 16 16:55:12 2002
+@@ -111,7 +111,7 @@
+     </listitem>
+     <listitem>
+       <para>
+-	<keycap>Ctl-&</keycap> Adds a thin border around the current selection
++	<keycap>Ctl-&amp;</keycap> Adds a thin border around the current selection
+       </para>
+     </listitem>
+     <listitem>
diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist
index 08db5a9bfc14..cb3388ecfa9d 100644
--- a/math/gnumeric2/pkg-plist
+++ b/math/gnumeric2/pkg-plist
@@ -7,7 +7,6 @@ etc/gconf/gconf.xml.defaults/apps/gnumeric/core/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/defaultfont/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/import/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/editing/%gconf.xml
@@ -34,7 +33,6 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/defaultfont/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/import/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/editing/%gconf.xml
@@ -129,6 +127,7 @@ lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
 lib/gnumeric/%%VERSION%%/plugins/xml_sax/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/xml_sax/xml_sax.so
+lib/libfoocanvas.a
 libdata/bonobo/servers/GNOME_Gnumeric.server
 share/gnome/applications/gnumeric.desktop
 share/gnome/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
@@ -525,6 +524,7 @@ share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/functions.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/gnumeric.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/graphs.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/gui-elements.xml
+share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/keybinding-appendix.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/license.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/menus.xml
 share/gnome/gnumeric/%%VERSION%%/help/gnumeric/C/number-format.xml
@@ -786,7 +786,6 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui/editing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/gui
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/save
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/import
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file/history
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/file
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/core/defaultfont
@@ -813,7 +812,6 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui/editing
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/gui
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/save
-@dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/import
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file/history
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/file
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/core/defaultfont