Update to 1.12.9.

Sort USES, stageify and add support for libgda5.

4 files changed, 44 insertions, 40 deletions

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index bb0f8e7f716f..b2b8021ed34d 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/math/gnumeric/Makefile 18444 2013-05-11 12:51:26Z kwm $
 
 PORTNAME=	gnumeric
-PORTVERSION=	1.12.3
+PORTVERSION=	1.12.9
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,12 +15,13 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
-LIB_DEPENDS=	goffice-0.10:${PORTSDIR}/devel/goffice010 \
-		psiconv:${PORTSDIR}/converters/psiconv
+LIB_DEPENDS=	libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 \
+		libpsiconv.so:${PORTSDIR}/converters/psiconv
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_XZ=		yes
-USES=		desktop-file-utils gettext pathfix shared-mime-info gmake pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig \
+		shared-mime-info shebangfix
 USE_GNOME=	gnomehier gnomeprefix intlhack libgsf pygobject3
 USE_PYTHON=	-2.7
 INSTALLS_OMF=	yes
@@ -34,15 +35,15 @@ GLIB_SCHEMAS=	org.gnome.gnumeric.dialogs.gschema.xml \
 		org.gnome.gnumeric.gschema.xml \
 		org.gnome.gnumeric.plugin.gschema.xml
 
-MAN1=		gnumeric.1 ssconvert.1 ssdiff.1 ssindex.1 ssgrep.1
+SHEBANG_FILES=	plugins/perl-func/perl_func.pl
 
 PLIST_SUB=	VERSION=${PORTVERSION} GOFFICE=0.10 SHORT_VER=1.12
 
-OPTIONS_DEFINE=	PERL
+OPTIONS_DEFINE=	PERL GDA
 OPTIONS_DEFAULT=PERL
+GDA_DESC=	Gnome Database Access plugin
 PERL_DESC=	Support Perl as extension language
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERL}
@@ -53,24 +54,29 @@ CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		PERL="@comment "
 .endif
 
-#.if defined(WITH_GNOMEDB)
-#USE_GNOME+=		libgnomedb
-#CONFIGURE_ARGS+=	--with-gda
-#PLIST_SUB+=		GNOMEDB=""
-#.else
+.if defined(WITH_GDA)
+USE_GNOME+=		libgda5-ui
+CONFIGURE_ARGS+=	--with-gda
+PLIST_SUB+=		GDA=""
+.else
 CONFIGURE_ARGS+=	--without-gda
-PLIST_SUB+=		GNOMEDB="@comment "
-#.endif
+PLIST_SUB+=		GDA="@comment "
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^GETTEXT_PACKAGE=gnumeric-$${VERSION}|GETTEXT_PACKAGE=gnumeric|g' \
 		${WRKSRC}/configure
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${PREFIX}/share/mime-info
-.for dir in share lib
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/${dir}/gnumeric
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/gnumeric.mime ${STAGEDIR}${PREFIX}/share/mime-info
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \
+		${STAGEDIR}${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \
+		${STAGEDIR}${PREFIX}/${dir}/gnumeric -f ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libspreadsheet-${PORTVERSION}.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnumeric/${PORTVERSION}/plugins/*/*.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/goffice/0.10/plugins/gnumeric/gnumeric.so
 
 .include <bsd.port.mk>
+
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 97bc96c7d448..66bda8f42b9f 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnumeric-1.12.3.tar.xz) = b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6
-SIZE (gnome3/gnumeric-1.12.3.tar.xz) = 15503384
+SHA256 (gnome3/gnumeric-1.12.9.tar.xz) = 4cd3ad5d9fc27a86ef62dbb6bf793b27fad9b6736bb8e988fa11dc6cb88b62e7
+SIZE (gnome3/gnumeric-1.12.9.tar.xz) = 17083264
diff --git a/math/gnumeric/files/patch-src_numbers.h b/math/gnumeric/files/patch-src_numbers.h
deleted file mode 100644
index 6448e88617ea..000000000000
--- a/math/gnumeric/files/patch-src_numbers.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/numbers.h.orig	Fri Dec 10 21:36:23 2004
-+++ src/numbers.h	Fri Dec 10 21:37:02 2004
-@@ -3,6 +3,7 @@
- 
- #include <math.h>
- #ifdef HAVE_IEEEFP_H
-+#include <sys/types.h>
- #include <ieeefp.h>
- #endif
- #ifdef HAVE_IEEE754_H
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 12e405377924..18347924f859 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -87,6 +87,9 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/rendered-value.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/search.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/selection.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/session.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sf-bessel.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sf-gamma.h
+include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sf-trig.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-autofill.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control-gui-priv.h
 include/libspreadsheet-%%SHORT_VER%%/spreadsheet/sheet-control-gui.h
@@ -207,16 +210,13 @@ lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml
 lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.la
 lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.so
 lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.xml
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
+%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la
+%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
+%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
+%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/ui.xml
 lib/gnumeric/%%VERSION%%/plugins/glpk/glpk.la
 lib/gnumeric/%%VERSION%%/plugins/glpk/glpk.so
 lib/gnumeric/%%VERSION%%/plugins/glpk/plugin.xml
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.la
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/gnomedb.so
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/plugin.xml
-%%GNOMEDB%%lib/gnumeric/%%VERSION%%/plugins/gnome-db/ui.xml
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
 lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
@@ -286,6 +286,12 @@ lib/libspreadsheet-%%VERSION%%.so
 lib/libspreadsheet.la
 lib/libspreadsheet.so
 libdata/pkgconfig/libspreadsheet-%%SHORT_VER%%.pc
+man/man1/gnumeric.1.gz
+man/man1/ssconvert.1.gz
+man/man1/ssdiff.1.gz
+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
@@ -973,6 +979,7 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm share/gnumeric/%%VERSION%%/autoformat-templates
 @dirrm share/gnumeric/%%VERSION%%
 @dirrm share/gnumeric
+@dirrmtry share/appdata
 @dirrm lib/goffice/%%GOFFICE%%/plugins/gnumeric
 @dirrm lib/gnumeric/%%VERSION%%/plugins/xbase
 @dirrm lib/gnumeric/%%VERSION%%/plugins/uihello
@@ -994,9 +1001,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrm lib/gnumeric/%%VERSION%%/plugins/lotus
 @dirrm lib/gnumeric/%%VERSION%%/plugins/html
 @dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-glossary
-%%GNOMEDB%%@dirrm lib/gnumeric/%%VERSION%%/plugins/gnome-db
 @dirrm lib/gnumeric/%%VERSION%%/plugins/glpk
-%%GNOMEDB%%@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
+%%GDA%%@dirrm lib/gnumeric/%%VERSION%%/plugins/gdaif
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-tsa
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-string
 @dirrm lib/gnumeric/%%VERSION%%/plugins/fn-stat
@@ -1031,6 +1037,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES