3 files changed, 31 insertions, 35 deletions

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