Remove obsolete entry from desktop file that generates warnings during

package installation.
Bump PKGREVISION.

5 files changed, 26 insertions, 10 deletions

diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile
index 1acc70454a6..2d841112c0d 100644
--- a/math/gnumeric112/Makefile
+++ b/math/gnumeric112/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/09/02 19:51:15 adam Exp $
+# $NetBSD: Makefile,v 1.12 2013/10/06 15:58:15 wiz Exp $
 
 DISTNAME=	gnumeric-1.12.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/1.12/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/math/gnumeric112/distinfo b/math/gnumeric112/distinfo
index 1a284cc5b24..dd659389b8f 100644
--- a/math/gnumeric112/distinfo
+++ b/math/gnumeric112/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/08/21 15:15:37 drochner Exp $
+$NetBSD: distinfo,v 1.7 2013/10/06 15:58:15 wiz Exp $
 
 SHA1 (gnumeric-1.12.5.tar.xz) = c2d01c7446c8846e17d15fa025634293613db103
 RMD160 (gnumeric-1.12.5.tar.xz) = 6c75de94669c150b7e6d27bf728a7e5c00ecfb6e
 Size (gnumeric-1.12.5.tar.xz) = 15523064 bytes
-SHA1 (patch-aa) = f1cefe02242eebccef616365bd08627d5e9fb4cd
-SHA1 (patch-ab) = cb1f97384986219f8f54c3a87af5499d27dc8b1b
+SHA1 (patch-aa) = b842351f041e42e14dbf22f02e333ea53ec9d377
+SHA1 (patch-ab) = 6f8f2d145641bc557c420cf00f3d9b0bef9fff94
+SHA1 (patch-gnumeric.desktop.in) = 74972fd2429d7f5ed0248e29dcca361cc0d1e2a4
diff --git a/math/gnumeric112/patches/patch-aa b/math/gnumeric112/patches/patch-aa
index c49cdceb6ae..6f570ee5ea4 100644
--- a/math/gnumeric112/patches/patch-aa
+++ b/math/gnumeric112/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2013/03/14 19:00:45 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2013/10/06 15:58:15 wiz Exp $
 
---- plugins/fn-numtheory/numtheory.c.orig	2009-09-07 02:03:35.000000000 +0000
+--- plugins/fn-numtheory/numtheory.c.orig	2013-04-17 23:57:13.000000000 +0000
 +++ plugins/fn-numtheory/numtheory.c
 @@ -38,7 +38,10 @@ GNM_PLUGIN_MODULE_HEADER;
   * represented in a gnm_float _and_ in a guint64.  (For regular "double",
diff --git a/math/gnumeric112/patches/patch-ab b/math/gnumeric112/patches/patch-ab
index 7a7edf30347..e5985fd0cba 100644
--- a/math/gnumeric112/patches/patch-ab
+++ b/math/gnumeric112/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2013/03/14 19:00:45 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2013/10/06 15:58:15 wiz Exp $
 
---- plugins/excelplugins/Makefile.in.orig	2013-03-01 23:01:25.000000000 +0000
+--- plugins/excelplugins/Makefile.in.orig	2013-08-16 21:42:10.000000000 +0000
 +++ plugins/excelplugins/Makefile.in
 @@ -93,7 +93,7 @@ am__uninstall_files_from_dir = { \
  am__installdirs = "$(DESTDIR)$(gnumeric_plugin_excelpluginsdir)" \
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2013/03/14 19:00:45 drochner Exp $
  am_plugin_la_OBJECTS = excelplugins.lo
  plugin_la_OBJECTS = $(am_plugin_la_OBJECTS)
  AM_V_lt = $(am__v_lt_@AM_V@)
-@@ -376,7 +376,7 @@ gnumeric_plugin_excelpluginsdir = $(gnum
+@@ -377,7 +377,7 @@ gnumeric_plugin_excelpluginsdir = $(gnum
  xmldir = $(gnumeric_plugin_excelpluginsdir)
  gnumeric_plugin_excelplugins_LTLIBRARIES = plugin.la xlcall32.la
  plugin_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
diff --git a/math/gnumeric112/patches/patch-gnumeric.desktop.in b/math/gnumeric112/patches/patch-gnumeric.desktop.in
new file mode 100644
index 00000000000..d9ac6c44e7a
--- /dev/null
+++ b/math/gnumeric112/patches/patch-gnumeric.desktop.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-gnumeric.desktop.in,v 1.3 2013/10/06 15:58:15 wiz Exp $
+
+Warning in file "/usr/pkg/share/applications/gnumeric.desktop":
+usage of MIME type "zz-application/zz-winassoc-xls" is discouraged
+("zz-application/zz-winassoc-xls" should be replaced with
+"application/vnd.ms-excel")
+
+--- gnumeric.desktop.in.orig	2013-07-25 23:33:41.000000000 +0000
++++ gnumeric.desktop.in
+@@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Product=Gnumeric
+ X-GNOME-Bugzilla-Version=BUGZILLAVERSION
+ X-GNOME-Bugzilla-Component=General
+ X-GNOME-DocPath=gnumeric
+-MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;zz-application/zz-winassoc-xls;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase;application/vnd.oasis.opendocument.spreadsheet;
++MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase;application/vnd.oasis.opendocument.spreadsheet;