Update gnumeric to 1.12.18.

Disable paradox, enable introspection.
Sort plist.

PR:		188629 (based on)
Submitted by:	olivierd@

3 files changed, 63 insertions, 59 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index d1544ae13bb2..9b8977f09c3a 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,10 +1,8 @@
 # Created by: Yukihiro Nakai <Nakai@technologist.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/math/gnumeric/Makefile 18444 2013-05-11 12:51:26Z kwm $
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.12.11
-PORTREVISION=	3
+PORTVERSION=	1.12.18
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,12 +20,14 @@ RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig \
 		python:2 shebangfix tar:xz
-USE_GNOME=	gnomeprefix intlhack libgsf pygobject3
+USE_GNOME=	intlhack libgsf pygobject3
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-compile-warnings
+CONFIGURE_ARGS=	--disable-compile-warnings \
+		--without-paradox \
+		--enable-introspection
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
@@ -38,7 +38,9 @@ GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
 
 SHEBANG_FILES=	plugins/perl-func/perl_func.pl
 
-PLIST_SUB=	VERSION=${PORTVERSION} GOFFICE=0.10 SHORT_VER=1.12
+PLIST_SUB=	VERSION=${PORTVERSION} \
+		GOFFICE=0.10 \
+		SHORT_VER=${PORTVERSION:R}
 
 OPTIONS_DEFINE=	PERL GDA
 OPTIONS_DEFAULT=PERL
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 926abec17b43..39cee3a796fa 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnumeric-1.12.11.tar.xz) = 554224f8a91743702b90010bf4bd7f04b9086e89c023a2aa1b2dbc31426c538f
-SIZE (gnome3/gnumeric-1.12.11.tar.xz) = 18035884
+SHA256 (gnome3/gnumeric-1.12.18.tar.xz) = 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9
+SIZE (gnome3/gnumeric-1.12.18.tar.xz) = 18064824
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index fa7fb198aaa5..40ad76e67a90 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -2,8 +2,8 @@ bin/gnumeric
 bin/gnumeric-%%VERSION%%
 bin/ssconvert
 bin/ssdiff
-bin/ssindex
 bin/ssgrep
+bin/ssindex
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/application.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/auto-format.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/cell-draw.h
@@ -104,8 +104,8 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-component.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-graph.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-image.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-impl.h
-include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-widget.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-widget-impl.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object-widget.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-object.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-private.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-style.h
@@ -140,6 +140,7 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-view.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-io-version.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-sax.h
+lib/girepository-1.0/Gnm-%%SHORT_VER%%.typelib
 lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
 lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/dif/dif.so
@@ -251,42 +252,7 @@ man/man1/ssgrep.1.gz
 man/man1/ssindex.1.gz
 share/appdata/gnumeric.appdata.xml
 share/applications/gnumeric.desktop
-share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
-share/gnumeric/%%VERSION%%/Gnumeric-embed.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/General/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/List/.category
-share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
-share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
-share/gnumeric/%%VERSION%%/templates/calendar.gnumeric
-share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
-share/gnumeric/%%VERSION%%/templates/loan.gnumeric
-share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
-share/gnumeric/%%VERSION%%/templates/purchase_order.gnumeric
+share/gir-1.0/Gnm-%%SHORT_VER%%.gir
 share/gnome/help/gnumeric/C/about-authors.xml
 share/gnome/help/gnumeric/C/about-history.xml
 share/gnome/help/gnumeric/C/about-license.xml
@@ -782,25 +748,48 @@ share/gnome/help/gnumeric/C/quick-start.xml
 share/gnome/help/gnumeric/C/welcome.xml
 share/gnome/help/gnumeric/C/workbooks.xml
 share/gnome/help/gnumeric/C/worksheets.xml
+share/gnumeric/%%VERSION%%/GNOME_Gnumeric-gtk.xml
+share/gnumeric/%%VERSION%%/Gnumeric-embed.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.button.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/3D/autoformat.3D.list.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.cool.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.simple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Classical/autoformat.Classical.trendy.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.banana.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.black.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.blue.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.orange.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Colourful/autoformat.Colourful.vanilla.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.desert.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.ice.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.modern.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/Financial/autoformat.Financial.purple.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.advanced.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.empty.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/General/autoformat.General.table.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/.category
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.basic.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.green.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.lila.xml
+share/gnumeric/%%VERSION%%/autoformat-templates/List/autoformat.List.simple.xml
+share/gnumeric/%%VERSION%%/templates/calendar.gnumeric
+share/gnumeric/%%VERSION%%/templates/invoice.gnumeric
+share/gnumeric/%%VERSION%%/templates/loan.gnumeric
+share/gnumeric/%%VERSION%%/templates/mileage.gnumeric
+share/gnumeric/%%VERSION%%/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/omf/gnumeric/gnumeric-C.omf
-share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
-share/pixmaps/gnome-application-x-applix-spreadsheet.png
-share/pixmaps/gnome-application-x-generic-spreadsheet.png
-share/pixmaps/gnome-application-x-gnumeric.png
-share/pixmaps/gnome-application-x-xls.png
-share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
-share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
-share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
-share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
-share/pixmaps/gnumeric/gnome-application-x-xls.png
-share/pixmaps/gnumeric/win32-gnumeric.ico
-share/pixmaps/win32-gnumeric.ico
 share/locale/am/LC_MESSAGES/gnumeric-functions.mo
 share/locale/am/LC_MESSAGES/gnumeric.mo
 share/locale/ar/LC_MESSAGES/gnumeric-functions.mo
@@ -921,3 +910,16 @@ share/locale/zh_HK/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_HK/LC_MESSAGES/gnumeric.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric-functions.mo
 share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
+share/omf/gnumeric/gnumeric-C.omf
+share/pixmaps/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnome-application-x-gnumeric.png
+share/pixmaps/gnome-application-x-xls.png
+share/pixmaps/gnumeric/gnome-application-vnd.lotus-1-2-3.png
+share/pixmaps/gnumeric/gnome-application-x-applix-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-generic-spreadsheet.png
+share/pixmaps/gnumeric/gnome-application-x-gnumeric.png
+share/pixmaps/gnumeric/gnome-application-x-xls.png
+share/pixmaps/gnumeric/win32-gnumeric.ico
+share/pixmaps/win32-gnumeric.ico