--- x11-toolkits/gtk30/Makefile	(revision 410683)
+++ x11-toolkits/gtk30/Makefile	(working copy)
@@ -24,11 +24,9 @@ PORTSCOUT=	ignore:1
 .else
 PORTSCOUT=	limit:1,even
 
-BUILD_DEPENDS+=	at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
 LIB_DEPENDS=	libepoxy.so:${PORTSDIR}/graphics/libepoxy
 RUN_DEPENDS+=	hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \
 		adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \
-		at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk
 
 USE_PERL5=	build
 USE_LDCONFIG=	yes
@@ -54,13 +52,17 @@ GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 		org.gtk.Settings.Debug.gschema.xml \
 		org.gtk.Settings.FileChooser.gschema.xml
 
-OPTIONS_DEFINE=	CUPS CLOUDPRINT COLORD DEBUG BROADWAY
-OPTIONS_DEFAULT=CUPS COLORD BROADWAY
+OPTIONS_DEFINE=	ATK_BRIDGE CUPS CLOUDPRINT COLORD DEBUG BROADWAY
+OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY
 OPTIONS_SUB=	yes
 
 BROADWAY_DESC=	Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
 BROADWAY_CONFIGURE_ENABLE=	broadway-backend
 
+ATK_BRIDGE_CONFIGURE_WITH=atk-bridge
+ATK_BRIDGE_LIB_DEPENDS=libatk-bridge-2.0.so:${PORTSDIR}/accessibility/at-spi2-atk
+ATK_BRIDGE_DESC=AT-SPI ATK bridge support (depends on devel/dbus)
+
 COLORD_DESC=	Color profile support
 COLORD_LIB_DEPENDS=	libcolord.so:${PORTSDIR}/graphics/colord
 COLORD_CONFIGURE_ENABLE=colord
--- x11-toolkits/gtk30/files/patch-atk-bridge-option	(nonexistent)
+++ x11-toolkits/gtk30/files/patch-atk-bridge-option	(working copy)
@@ -0,0 +1,80 @@ 
+# Revert bug 677491 comment 45
+
+diff --git configure configure.ac
+index d4c2262..37b6349 100644
+--- configure
++++ configure
+@@ -1039,6 +1039,7 @@ enable_glibtest
+ enable_modules
+ with_included_immodules
+ with_x
++with_atk_bridge
+ enable_cups
+ enable_papi
+ enable_cloudprint
+@@ -1790,6 +1791,7 @@ Optional Packages:
+   --with-included-immodules=MODULE1,MODULE2,...
+                           build the specified input methods into gtk
+   --with-x                use the X Window System
++  --without-atk-bridge    Do not use atk-bridge-2.0
+   --with-html-dir=PATH    path to installed docs
+   --with-xml-catalog=CATALOG
+                           path to xml catalog to use
+@@ -24609,8 +24611,20 @@ fi
+ # Check for Accessibility Toolkit flags
+ ########################################
+ 
+-if test x$enable_x11_backend = xyes; then
++
++# Check whether --with-atk-bridge was given.
++if test "${with_atk_bridge+set}" = set; then :
++  withval=$with_atk_bridge; :
++else
++  with_atk_bridge=$enable_x11_backend
++fi
++
++
++if test x$with_atk_bridge != xno; then
+    ATK_PACKAGES="atk atk-bridge-2.0"
++
++$as_echo "#define HAVE_ATK_BRIDGE 1" >>confdefs.h
++
+ else
+    ATK_PACKAGES="atk"
+ fi
+diff --git config.h.in config.h.in
+index d4c2262..37b6349 100644
+--- config.h.in
++++ config.h.in
+@@ -15,6 +15,9 @@
+ /* Define the location where the catalogs will be installed */
+ #undef GTK_LOCALEDIR
+ 
++/* Define if we're using atk-bridge-2.0 */
++#undef HAVE_ATK_BRIDGE
++
+ /* Define to 1 if you have the `bind_textdomain_codeset' function. */
+ #undef HAVE_BIND_TEXTDOMAIN_CODESET
+ 
+diff --git gtk/a11y/gtkaccessibility.c gtk/a11y/gtkaccessibility.c
+index 4f5028b..ff8450a 100644
+--- gtk/a11y/gtkaccessibility.c
++++ gtk/a11y/gtkaccessibility.c
+@@ -37,7 +37,7 @@
+ #include <gtk/gtktogglebutton.h>
+ #include <gtk/gtkaccessible.h>
+ 
+-#ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ #include <atk-bridge.h>
+ #endif
+ 
+@@ -987,7 +987,7 @@ _gtk_accessibility_init (void)
+   _gtk_accessibility_override_atk_util ();
+   do_window_event_initialization ();
+ 
+-#ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+   atk_bridge_adaptor_init (NULL, NULL);
+ #endif
+