Ticket #40338: Portfile-gnumeric.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                gnumeric
-version             1.12.4
+version             1.12.7
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 license             GPL-2+
-maintainers         nomaintainer
-categories          gnome math
+maintainers         me.com:c.herbig openmaintainer
+categories          gnome math science
 platforms           darwin
 
-description         A powerful Gtk3 based spreadsheet with Excel, R and Python support.
-long_description    A powerful Gtk3 based spreadsheet that features full Excel function and file \
-                    compatibility, additional functions not found in Excel, statisticts operations \
-                    with support for R, and Python plugins. Has some ODF support.
+description         A powerful Gtk3 based spreadsheet with Excel, ODF, R and Python support.
+long_description    A powerful Gtk3 based spreadsheet that features full Excel function \
+                    and file compatibility and additional functions not found in Excel, \
+                    and statistics operations based on R. Functionality can be extended \
+                    with Python and plugins. Other file compatibility includes OASIS ODF, \
+                    Quattro Pro, Psion 5, Paradox DB, and more (see homepage). GDA \
+                    database support is available with the +database variant.
 
 homepage            http://projects.gnome.org/gnumeric/
 master_sites        gnome:sources/${name}/${branch}/
 use_xz              yes
 
-checksums           sha256  562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd \
-                    rmd160  e3540631bdc8827edfa7ecec6a62fd8bcf06399f
+checksums           sha256  5de9cca87efb2ea190bcddf57bd83a34e7f9580f5b7c92c6757707d1164748ef \
+                    rmd160  c59ab9c79bf152afe54705a82fdde3c247c49667
 
 depends_build       port:gnome-doc-utils \
                     port:intltool \
                     port:pkgconfig
 
-depends_lib         port:goffice
+depends_lib         port:goffice \
+                    port:psiconv \
+                    port:pxlib
 
 configure.args      --disable-schemas-compile \
-                    --without-gda \
-                    --without-paradox \
-                    --without-psiconv \
-                    --enable-introspection
+                    --enable-introspection \
+                    --without-gda
 
 
-variant python25 conflicts python26 python27 description {Use python 2.5 - obsolete} {
-# marked as obsolete on 7/28/2013. Consider removing variant after sufficient time.
-
-    pre-fetch {
-        ui_error "Gnumeric 1.12.x must have at least python26. Please consider upgrading."
-        return -code error
-    }
+variant database description {builds with support for GDA database} {
+    depends_lib-append        port:libgda5
+    configure.args-replace    --without-gda --with-gda
 }
 
-variant python26 conflicts python25 python27 description {Use python 2.6} {
+variant python26 conflicts python27 description {Use python 2.6} {
     configure.python          ${prefix}/bin/python2.6
     depends_lib-append        port:py26-gobject3
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.6
     configure.pkg_config_path ${python_framework}/lib/pkgconfig
 }
 
-variant python27 conflicts python25 python26 description {Use python 2.7} {
+variant python27 conflicts python26 description {Use python 2.7} {
     configure.python          ${prefix}/bin/python2.7
     depends_lib-append        port:py27-gobject3
     set python_framework      ${frameworks_dir}/Python.framework/Versions/2.7
     configure.pkg_config_path ${python_framework}/lib/pkgconfig
 }
 
-if {![variant_isset python25] && ![variant_isset python26]} {
+if {![variant_isset python26]} {
     default_variants +python27
 }
 
+if {[variant_isset python25]} {
+# variant +python25 was declared obsolete on 7/28/2013
+    ui_error "Gnumeric python needs python 2.6 or 2.7, please consider reinstalling."
+    return -code error
+}
 
 post-activate {
     catch {system "${prefix}/bin/scrollkeeper-update"}
@@ -74 +78 @@
 
 livecheck.type  gnome
 
+# yelp is currently not available in a +quartz environment due to dependency issues, 
+# see #39898 #40282 #40116
 notes \
 "Recommended supplementary ports:
     gnome-themes-standard  provides the default Gnome Adwaita theme