Ticket #52281: gcr-Portfile.diff

gnome/gcr/Portfile

@@ -1 +1 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 153722 2016-10-09 05:07:38Z devans@macports.org $
+# $Id: $
 
 PortSystem          1.0
-PortGroup           active_variants 1.1
 PortGroup           gobject_introspection 1.0
 
 name                gcr
 version             3.20.0
-revision            1
+revision            2
 license             LGPL-2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 description         GCR is a library for displaying certificates, and crypto UI, accessing \
@@ -31 +30 @@
 depends_build       port:pkgconfig \
                     port:intltool \
                     port:gtk-doc \
-                    port:gnome-common \
                     port:autoconf \
                     port:automake \
                     port:libtool
@@ -41 +39 @@
                     port:gtk3 \
                     port:p11-kit \
                     port:libgcrypt \
+                    port:gnupg \
                     port:vala
 
 gobject_introspection yes
 
 patchfiles          patch-egg-egg-asn1x.h.diff \
                     patch-egg-egg-armor.c.diff \
-                    patch-ui-gcr.pc.in.diff
+                    patch-ui-gcr.pc.in.diff \
+                    patch-configure.ac.diff \
+                    patch_gcr_gcr-prompt.c.diff \
+                    patch_ui_gcr-prompt-dialog.h.diff \
+                    patch_ui_gcr-prompt-dialog.c.diff \
+                    patch_ui_gcr-prompter-tool.c.diff \
+                    patch_ui_frob-prompt.c.diff \
+                    patch_ui_frob-system-prompt.c.diff \
 
-# gcr uses X11 specific code in UI (#41839)
-# https://bugzilla.gnome.org/show_bug.cgi?id=734366
-# https://bugzilla.gnome.org/show_bug.cgi?id=688678
 
-require_active_variants port:gtk3 x11
+variant x11 {
+    depends_build-append   port:gnome-common
+    patchfiles-delete      patch-configure.ac.diff
+}
+
+default_variants    +x11
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility