The FreeBSD GNOME team proudly presents GNOME 3.18 for FreeBSD.

The offical GNOME 3.18 release notes can be found at
https://help.gnome.org/misc/release-notes/3.18/

This update doesn't contain the glib/gtk c++ bindings which will
be done in a another update due to the requirement on c++11 and the
amount of fallout this probably will give.

GDM is still at version 3.16 due to some issues.

Bump mate-themes to use the gtk 3.18 version of the themes.

Thanks to Antoine Brodin for running the exp-runs.

This release was made possible by the following people:
  Gustau Perez
  Ting-Wei_Lan

PR:	207006

18 files changed, 69 insertions, 71 deletions

diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 68c69bca8df1..b9f5d5149e3c 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	at-spi2-atk
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.1
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,13 +12,13 @@ COMMENT=	Assisted Technology Provider module for GTK+
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core
+BUILD_DEPENDS=	at-spi2-core>=2.17.90:${PORTSDIR}/accessibility/at-spi2-core
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-RUN_DEPENDS=	at-spi2-core>=2.8.0:${PORTSDIR}/accessibility/at-spi2-core
+RUN_DEPENDS=	at-spi2-core>=2.17.90:${PORTSDIR}/accessibility/at-spi2-core
 
 PORTSCOUT=	limitw:1,even
 
-USES=		cpe gmake libtool pathfix pkgconfig tar:xz
+USES=		cpe gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	atk glib20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
index 65a0f6fa0cab..40e184ca5e9f 100644
--- a/accessibility/at-spi2-atk/distinfo
+++ b/accessibility/at-spi2-atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-atk-2.16.0.tar.xz) = 78efc45ec36383bf785f8636e64a8d866defeb020e00a08f92978f1fc3772ff9
-SIZE (gnome3/at-spi2-atk-2.16.0.tar.xz) = 286668
+SHA256 (gnome3/at-spi2-atk-2.18.1.tar.xz) = c4b15f9386d34d464ddad5f6cc85669742c016df87141ceee93513245979c12d
+SIZE (gnome3/at-spi2-atk-2.18.1.tar.xz) = 291676
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index 55948fbdaee6..bf03ccd016f6 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	at-spi2-core
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.2
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake libtool pathfix pkgconfig tar:xz
+USES=		gettext gmake gnome libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intlhack introspection:build
 USE_XORG=	x11 xi xtst xext
 USE_LDCONFIG=	yes
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index 85f0433486ad..cece82b50f14 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-core-2.16.0.tar.xz) = 1c0b77fb8ce81abbf1d80c0afee9858b3f9229f673b7881995fe0fc16b1a74d0
-SIZE (gnome3/at-spi2-core-2.16.0.tar.xz) = 455264
+SHA256 (gnome3/at-spi2-core-2.18.2.tar.xz) = 4eea5ba07912ad955157761c4c9fdb6e3fab6ea91899a4db785eb47ae61f1ee5
+SIZE (gnome3/at-spi2-core-2.18.2.tar.xz) = 451516
diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
index 258de4970025..f0b50450ee59 100644
--- a/accessibility/at-spi2-core/pkg-plist
+++ b/accessibility/at-spi2-core/pkg-plist
@@ -1,26 +1,25 @@
 etc/at-spi2/accessibility.conf
 etc/xdg/autostart/at-spi-dbus-bus.desktop
-include/at-spi-2.0/atspi/atspi.h
 include/at-spi-2.0/atspi/atspi-accessible.h
 include/at-spi-2.0/atspi/atspi-action.h
 include/at-spi-2.0/atspi/atspi-application.h
 include/at-spi-2.0/atspi/atspi-collection.h
 include/at-spi-2.0/atspi/atspi-component.h
 include/at-spi-2.0/atspi/atspi-constants.h
-include/at-spi-2.0/atspi/atspi-device-listener.h
 include/at-spi-2.0/atspi/atspi-device-listener-private.h
+include/at-spi-2.0/atspi/atspi-device-listener.h
 include/at-spi-2.0/atspi/atspi-document.h
 include/at-spi-2.0/atspi/atspi-editabletext.h
 include/at-spi-2.0/atspi/atspi-enum-types.h
-include/at-spi-2.0/atspi/atspi-event-listener.h
 include/at-spi-2.0/atspi/atspi-event-listener-private.h
+include/at-spi-2.0/atspi/atspi-event-listener.h
 include/at-spi-2.0/atspi/atspi-gmain.c
 include/at-spi-2.0/atspi/atspi-gmain.h
 include/at-spi-2.0/atspi/atspi-hyperlink.h
 include/at-spi-2.0/atspi/atspi-hypertext.h
 include/at-spi-2.0/atspi/atspi-image.h
-include/at-spi-2.0/atspi/atspi-misc.h
 include/at-spi-2.0/atspi/atspi-matchrule.h
+include/at-spi-2.0/atspi/atspi-misc.h
 include/at-spi-2.0/atspi/atspi-object.h
 include/at-spi-2.0/atspi/atspi-private.h
 include/at-spi-2.0/atspi/atspi-registry.h
@@ -32,6 +31,7 @@ include/at-spi-2.0/atspi/atspi-table.h
 include/at-spi-2.0/atspi/atspi-text.h
 include/at-spi-2.0/atspi/atspi-types.h
 include/at-spi-2.0/atspi/atspi-value.h
+include/at-spi-2.0/atspi/atspi.h
 lib/girepository-1.0/Atspi-2.0.typelib
 lib/libatspi.so
 lib/libatspi.so.0
@@ -55,9 +55,8 @@ share/gtk-doc/html/libatspi/api-index-full.html
 share/gtk-doc/html/libatspi/ch01.html
 share/gtk-doc/html/libatspi/home.png
 share/gtk-doc/html/libatspi/index.html
-share/gtk-doc/html/libatspi/index.sgml
-share/gtk-doc/html/libatspi/left.png
 share/gtk-doc/html/libatspi/left-insensitive.png
+share/gtk-doc/html/libatspi/left.png
 share/gtk-doc/html/libatspi/libatspi-AtspiApplication.html
 share/gtk-doc/html/libatspi/libatspi-atspi-action.html
 share/gtk-doc/html/libatspi/libatspi-atspi-collection.html
@@ -72,18 +71,18 @@ share/gtk-doc/html/libatspi/libatspi-atspi-misc-private.html
 share/gtk-doc/html/libatspi/libatspi-atspi-misc.html
 share/gtk-doc/html/libatspi/libatspi-atspi-registry.html
 share/gtk-doc/html/libatspi/libatspi-atspi-selection.html
-share/gtk-doc/html/libatspi/libatspi-atspi-table.html
 share/gtk-doc/html/libatspi/libatspi-atspi-table-cell.html
+share/gtk-doc/html/libatspi/libatspi-atspi-table.html
 share/gtk-doc/html/libatspi/libatspi-atspi-text.html
 share/gtk-doc/html/libatspi/libatspi-atspi-types.html
 share/gtk-doc/html/libatspi/libatspi-atspi-value.html
 share/gtk-doc/html/libatspi/libatspi.devhelp2
 share/gtk-doc/html/libatspi/object-tree.html
-share/gtk-doc/html/libatspi/right.png
 share/gtk-doc/html/libatspi/right-insensitive.png
+share/gtk-doc/html/libatspi/right.png
 share/gtk-doc/html/libatspi/style.css
-share/gtk-doc/html/libatspi/up.png
 share/gtk-doc/html/libatspi/up-insensitive.png
+share/gtk-doc/html/libatspi/up.png
 share/locale/an/LC_MESSAGES/at-spi2-core.mo
 share/locale/as/LC_MESSAGES/at-spi2-core.mo
 share/locale/ast/LC_MESSAGES/at-spi2-core.mo
@@ -127,6 +126,7 @@ share/locale/mr/LC_MESSAGES/at-spi2-core.mo
 share/locale/ms/LC_MESSAGES/at-spi2-core.mo
 share/locale/nb/LC_MESSAGES/at-spi2-core.mo
 share/locale/nl/LC_MESSAGES/at-spi2-core.mo
+share/locale/oc/LC_MESSAGES/at-spi2-core.mo
 share/locale/or/LC_MESSAGES/at-spi2-core.mo
 share/locale/pa/LC_MESSAGES/at-spi2-core.mo
 share/locale/pl/LC_MESSAGES/at-spi2-core.mo
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index a69243af2544..379addd9758b 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	atk
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
@@ -18,7 +18,7 @@ PORTSCOUT=	limitw:1,even
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES+=		gettext gmake libtool pathfix pkgconfig
+USES+=		gettext gmake gnome libtool pathfix pkgconfig
 USE_GNOME=	glib20 introspection:build referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 01e2dcb773e6..d422ea63e12b 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/atk-2.16.0.tar.xz) = 095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562
-SIZE (gnome2/atk-2.16.0.tar.xz) = 699816
+SHA256 (gnome2/atk-2.18.0.tar.xz) = ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b
+SIZE (gnome2/atk-2.18.0.tar.xz) = 687932
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index ee1757d63149..96dff5c97ad6 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -35,7 +35,7 @@ include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
-lib/libatk-1.0.so.0.21609.1
+lib/libatk-1.0.so.0.21809.1
 libdata/pkgconfig/atk.pc
 share/gir-1.0/Atk-1.0.gir
 share/locale/af/LC_MESSAGES/atk10.mo
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 9c675c8fd1a9..3fbca3d34cc4 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caribou
-PORTVERSION=	0.4.18.1
+PORTVERSION=	0.4.19
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libxklavier.so:${PORTSDIR}/x11/libxklavier
 RUN_DEPENDS=	py2?-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
 
-USES=		gettext gmake libtool pathfix pkgconfig python:2 \
+USES=		gettext gmake gnome libtool pathfix pkgconfig python:2 \
 		shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
diff --git a/accessibility/caribou/distinfo b/accessibility/caribou/distinfo
index bfea152ef6c6..17b36c7910b0 100644
--- a/accessibility/caribou/distinfo
+++ b/accessibility/caribou/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/caribou-0.4.18.1.tar.xz) = aefadf125a647fc68696f4134e99ee43dca121da5de8e1edf6eab5664a9f3150
-SIZE (gnome3/caribou-0.4.18.1.tar.xz) = 410548
+SHA256 (gnome3/caribou-0.4.19.tar.xz) = 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44
+SIZE (gnome3/caribou-0.4.19.tar.xz) = 412328
diff --git a/accessibility/caribou/pkg-plist b/accessibility/caribou/pkg-plist
index 2084b12da469..9d3f5718c7e8 100644
--- a/accessibility/caribou/pkg-plist
+++ b/accessibility/caribou/pkg-plist
@@ -53,6 +53,7 @@ share/antler/style.css
 %%DATADIR%%/layouts/fullscale/us.xml
 %%DATADIR%%/layouts/scan/us.xml
 %%DATADIR%%/layouts/touch/ara.xml
+%%DATADIR%%/layouts/touch/de.xml
 %%DATADIR%%/layouts/touch/fr.xml
 %%DATADIR%%/layouts/touch/il.xml
 %%DATADIR%%/layouts/touch/us.xml
@@ -90,6 +91,7 @@ share/locale/hu/LC_MESSAGES/caribou.mo
 share/locale/id/LC_MESSAGES/caribou.mo
 share/locale/it/LC_MESSAGES/caribou.mo
 share/locale/ja/LC_MESSAGES/caribou.mo
+share/locale/kk/LC_MESSAGES/caribou.mo
 share/locale/km/LC_MESSAGES/caribou.mo
 share/locale/kn/LC_MESSAGES/caribou.mo
 share/locale/ko/LC_MESSAGES/caribou.mo
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile
index eecba9a3e1b3..a06f0fcff297 100644
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	orca
-PORTVERSION=	3.16.3
-PORTREVISION=	1
+PORTVERSION=	3.18.2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -27,7 +26,7 @@ RUN_DEPENDS=	py3?-dbus>=0:${PORTSDIR}/devel/py3-dbus \
 CONFLICTS=	py*-json-py-[0-9]*
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
+USES=		gettext gmake gnome pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	gtk30 py3gobject3 intlhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/accessibility/orca/distinfo b/accessibility/orca/distinfo
index 005d21b94647..2cdab197530f 100644
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/orca-3.16.3.tar.xz) = 540deeaa1a973cc7ccc8a463f8fcf51db51f7ccfb130bc2019ac53bf67943dc7
-SIZE (gnome3/orca-3.16.3.tar.xz) = 2124800
+SHA256 (gnome3/orca-3.18.2.tar.xz) = 986244af7a0891b758eb8e772bc61d72483808e7e9c790360f9f389045d7262a
+SIZE (gnome3/orca-3.18.2.tar.xz) = 2213548
diff --git a/accessibility/orca/pkg-plist b/accessibility/orca/pkg-plist
index b2c52219f072..74c41c6e0254 100644
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@@ -17,6 +17,8 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/brlmon.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/brltablenames.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/__pycache__/caret_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/chat.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/__pycache__/chnames.cpython-%%PYVER%%.pyc
@@ -138,6 +140,7 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/braille_rolenames.py
 %%PYTHON_SITELIBDIR%%/orca/brlmon.py
 %%PYTHON_SITELIBDIR%%/orca/brltablenames.py
+%%PYTHON_SITELIBDIR%%/orca/caret_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/chat.py
 %%PYTHON_SITELIBDIR%%/orca/chnames.py
 %%PYTHON_SITELIBDIR%%/orca/cmdnames.py
@@ -224,19 +227,13 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/formatting.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/speech_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/Thunderbird/spellcheck.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/__init__.py
@@ -468,6 +465,8 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/spellcheck.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/braille_generator.py
@@ -475,6 +474,7 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/spellcheck.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/soffice/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/apps/xfwm4/__pycache__/__init__.cpython-%%PYVER%%.pyc
@@ -496,33 +496,12 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/formatting.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/keymaps.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/__pycache__/tutorial_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/bookmarks.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/braille_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/formatting.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/keymaps.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/script_utilities.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/structural_navigation.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/Gecko/tutorial_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/J2SE-access-bridge/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
@@ -556,13 +535,10 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.pyc
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/__pycache__/structural_navigation.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/braille_generator.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/script_utilities.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/speech_generator.py
-%%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/WebKitGtk/structural_navigation.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYVER%%.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/__pycache__/VCL.cpython-%%PYVER%%.%%PYOEXTENSION%%
@@ -586,6 +562,27 @@ etc/xdg/autostart/orca-autostart.desktop
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/toolkits/gtk/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__init__.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/bookmarks.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/braille_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/script_utilities.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/speech_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/__pycache__/tutorial_generator.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/bookmarks.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/braille_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/script.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/script_utilities.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/speech_generator.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/web/tutorial_generator.py
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings_manager.py
 %%PYTHON_SITELIBDIR%%/orca/speech.py
diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index 707199e01721..c7e56989287c 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	atspi
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.0
 CATEGORIES=	accessibility x11-toolkits python
 MASTER_SITES=	GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 CONFLICTS=	at-spi-1.[0-9]*
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig python:2 tar:xz
+USES=		gettext gmake gnome pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	intlhack pygobject3
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo
index b92cbf735f62..8f0a81a03dbb 100644
--- a/accessibility/py-atspi/distinfo
+++ b/accessibility/py-atspi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/pyatspi-2.16.0.tar.xz) = a67a857ca5eaf16fc059d9be47d0850edd93bffdd777c1b7612ecc95f6e3b4a0
-SIZE (gnome3/pyatspi-2.16.0.tar.xz) = 301204
+SHA256 (gnome3/pyatspi-2.18.0.tar.xz) = f86f03ad05d0502cd60fe8b98f746f74ce3bc208e9f3798f6a2130b3c5f4ab46
+SIZE (gnome3/pyatspi-2.18.0.tar.xz) = 297992
diff --git a/accessibility/py3-atspi/Makefile b/accessibility/py3-atspi/Makefile
index d9d390311e37..8e8d4ab5b6e1 100644
--- a/accessibility/py3-atspi/Makefile
+++ b/accessibility/py3-atspi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	atspi
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.0
 CATEGORIES=	accessibility x11-toolkits python
 MASTER_SITES=	GNOME/sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at
 CONFLICTS=	at-spi-1.[0-9]*
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake pathfix pkgconfig python:3 tar:xz
+USES=		gettext gmake gnome pathfix pkgconfig python:3 tar:xz
 USE_GNOME=	intlhack py3gobject3
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/py3-atspi/distinfo b/accessibility/py3-atspi/distinfo
index b92cbf735f62..8f0a81a03dbb 100644
--- a/accessibility/py3-atspi/distinfo
+++ b/accessibility/py3-atspi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/pyatspi-2.16.0.tar.xz) = a67a857ca5eaf16fc059d9be47d0850edd93bffdd777c1b7612ecc95f6e3b4a0
-SIZE (gnome3/pyatspi-2.16.0.tar.xz) = 301204
+SHA256 (gnome3/pyatspi-2.18.0.tar.xz) = f86f03ad05d0502cd60fe8b98f746f74ce3bc208e9f3798f6a2130b3c5f4ab46
+SIZE (gnome3/pyatspi-2.18.0.tar.xz) = 297992