Ticket #40554: Portfile-gnumeric.diff

Portfile

@@ -6 +6 @@
 
 name                gnumeric
 version             1.12.7
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 license             GPL-2+
@@ -18 +19 @@
                     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 \
+                    Quattro Pro, Applix, Psion 5, Paradox DB, and more (see homepage). GDA \
                     database support is available with the +database variant.
 
 homepage            http://projects.gnome.org/gnumeric/
@@ -64 +65 @@
     default_variants +python27
 }
 
-variant quartz description {build with gtk-osx-application support} {
-    require_active_variants gtk3 quartz
-    require_active_variants gtk-osx-application gtk3
-
-    depends_lib-append  port:gtk-osx-application
-    
-    patchfiles-append   patch_quartz-src-wbc-gtk.c.diff \
-                        patch_quartz-src-GNOME_Gnumeric-gtk.xml.in.diff
+variant quartz {
+    require_active_variants gtk3 quartz x11
 }
 
 post-activate {
@@ -83 +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