Update to version 1.12.21.

Pkgsrc changes:
 * Modify license to dual either gpl2 or gpl3.
 * Adjust BUILDLINK_API_DEPENDS settings from configure.ac.
 * Adjust PLIST to files now installed.
 * Add comments to the existing patches.

Upstream notable changes (see ChangeLog in source for details):
gnumeric 1.12.21:
   * ODS import/export fixes
   * XLSX import/export fixes

gnumeric 1.12.20:
   * ODF import/export fixes and enhancements.
   * XLSX import/export fixes and enhancements.

gnumeric 1.12.19:
   * (no noteworthy major changes)

gnumeric 1.12.18:
   * Workaround gtk+ api/abi breaks.

gnumeric 1.12.17:
   * xlsx import/export improvements.

gnumeric 1.12.16:
   * ODS import/export improvements

gnumeric 1.12.15:
   * ods/xlsx graph import fixes
   * ods import/export fixes

gnumeric 1.12.14:
   * Many fixes related to conditional formats.
   * Try to disable Ubuntu's non-working scroll bars.

gnumeric 1.12.13:
   * ods import/export export fixes.
   * xls import/export export fixes.

gnumeric 1.12.12:
   * Test suite improvements.
   * ods import/export improvements
   * xls import/export improvements
   * xlsx import/export improvements

gnumeric 1.12.11:
   * A problem with saving to Excel97 format was fixed.

gnumeric 1.12.10:
   * Accuracy improvements
   * Work around gtk+ abi breaks
   * Win32 improvements

5 files changed, 24 insertions, 18 deletions

diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile
index 8f5e9b9745b..4264279f48f 100644
--- a/math/gnumeric112/Makefile
+++ b/math/gnumeric112/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2015/06/12 10:50:28 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2015/08/05 21:34:17 he Exp $
 
-DISTNAME=	gnumeric-1.12.9
-PKGREVISION=	4
+DISTNAME=	gnumeric-1.12.21
 CATEGORIES=	math gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnumeric/1.12/}
 EXTRACT_SUFX=	.tar.xz
@@ -9,7 +8,7 @@ EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnumeric.org/
 COMMENT=	Spreadsheet program from the GNOME project
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v2 OR gnu-gpl-v3
 
 USE_TOOLS+=		gmake intltool msgfmt perl:run pkg-config
 USE_LIBTOOL=		yes
@@ -20,8 +19,8 @@ PKGCONFIG_OVERRIDE=	libspreadsheet.pc.in
 REPLACE_PERL+=		plugins/perl-func/perl_func.pl
 
 # PLIST contains versioned directory
-GOFFICE_VERSION=	0.10.0
-PLIST_SUBST+=		GOFFICE_VERSION=${GOFFICE_VERSION}
+#GOFFICE_VERSION=	0.10.0
+#PLIST_SUBST+=		GOFFICE_VERSION=${GOFFICE_VERSION}
 
 .include "options.mk"
 
@@ -38,16 +37,18 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.12.9
 #BUILDLINK_API_DEPENDS.libgda+=	libgda>=3.1.1
 #.include "../../databases/libgda/buildlink3.mk"
 #.include "../../databases/libgnomedb/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.18
+BUILDLINK_API_DEPENDS.libgsf+=	libgsf>=1.14.32
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
-BUILDLINK_API_DEPENDS.goffice0.10+= goffice0.10>=0.10.9
+BUILDLINK_API_DEPENDS.goffice0.10+= goffice0.10>=0.10.21
 .include "../../misc/goffice0.10/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.4.12
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.8.7
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
diff --git a/math/gnumeric112/PLIST b/math/gnumeric112/PLIST
index e1687825152..c71d53d3695 100644
--- a/math/gnumeric112/PLIST
+++ b/math/gnumeric112/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/01/02 18:50:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/08/05 21:34:17 he Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -89,6 +89,7 @@ include/libspreadsheet-1.12/spreadsheet/search.h
 include/libspreadsheet-1.12/spreadsheet/selection.h
 include/libspreadsheet-1.12/spreadsheet/session.h
 include/libspreadsheet-1.12/spreadsheet/sf-bessel.h
+include/libspreadsheet-1.12/spreadsheet/sf-dpq.h
 include/libspreadsheet-1.12/spreadsheet/sf-gamma.h
 include/libspreadsheet-1.12/spreadsheet/sf-trig.h
 include/libspreadsheet-1.12/spreadsheet/sheet-autofill.h
@@ -778,9 +779,9 @@ share/gnumeric/${PKGVERSION}/templates/purchase_order.gnumeric
 share/icons/hicolor/16x16/apps/gnumeric.png
 share/icons/hicolor/22x22/apps/gnumeric.png
 share/icons/hicolor/24x24/apps/gnumeric.png
+share/icons/hicolor/256x256/apps/gnumeric.png
 share/icons/hicolor/32x32/apps/gnumeric.png
 share/icons/hicolor/48x48/apps/gnumeric.png
-share/icons/hicolor/scalable/apps/gnumeric.svg
 share/locale/am/LC_MESSAGES/${PKGNAME}-functions.mo
 share/locale/am/LC_MESSAGES/${PKGNAME}.mo
 share/locale/ar/LC_MESSAGES/${PKGNAME}-functions.mo
diff --git a/math/gnumeric112/distinfo b/math/gnumeric112/distinfo
index 1a10d6a9fb2..adc09ef23f4 100644
--- a/math/gnumeric112/distinfo
+++ b/math/gnumeric112/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2014/01/02 18:50:03 wiz Exp $
+$NetBSD: distinfo,v 1.11 2015/08/05 21:34:17 he Exp $
 
-SHA1 (gnumeric-1.12.9.tar.xz) = f6b85391c3c124cd4f3ba58db420e114ac9ea87a
-RMD160 (gnumeric-1.12.9.tar.xz) = 8b04d2ccdfad540adc3633ae1b8e42ff810b7217
-Size (gnumeric-1.12.9.tar.xz) = 17083264 bytes
-SHA1 (patch-aa) = b842351f041e42e14dbf22f02e333ea53ec9d377
-SHA1 (patch-ab) = 6f8f2d145641bc557c420cf00f3d9b0bef9fff94
+SHA1 (gnumeric-1.12.21.tar.xz) = 29264459d9603feaff7bbb656954b49185a7d9d4
+RMD160 (gnumeric-1.12.21.tar.xz) = 293dcc0b97c4fc63e900572b0c41116806facb26
+Size (gnumeric-1.12.21.tar.xz) = 18460624 bytes
+SHA1 (patch-aa) = 87781e2955442d8edc803cd732b949017b0f4f27
+SHA1 (patch-ab) = f6fe7aed7ab857f1d8292fd99950bda7a9fb96fa
 SHA1 (patch-gnumeric.desktop.in) = 74972fd2429d7f5ed0248e29dcca361cc0d1e2a4
diff --git a/math/gnumeric112/patches/patch-aa b/math/gnumeric112/patches/patch-aa
index 6f570ee5ea4..bebd22b2ed0 100644
--- a/math/gnumeric112/patches/patch-aa
+++ b/math/gnumeric112/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2013/10/06 15:58:15 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2015/08/05 21:34:17 he Exp $
+
+Make bit_max be computed dynamically.
 
 --- plugins/fn-numtheory/numtheory.c.orig	2013-04-17 23:57:13.000000000 +0000
 +++ plugins/fn-numtheory/numtheory.c
diff --git a/math/gnumeric112/patches/patch-ab b/math/gnumeric112/patches/patch-ab
index e5985fd0cba..ad37d490316 100644
--- a/math/gnumeric112/patches/patch-ab
+++ b/math/gnumeric112/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2013/10/06 15:58:15 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2015/08/05 21:34:17 he Exp $
+
+Adapt to our build layout.
 
 --- plugins/excelplugins/Makefile.in.orig	2013-08-16 21:42:10.000000000 +0000
 +++ plugins/excelplugins/Makefile.in