Index: accessibility/caribou/Makefile
===================================================================
--- accessibility/caribou/Makefile	(revision 410067)
+++ accessibility/caribou/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	caribou
-PORTVERSION=	0.4.19
+PORTVERSION=	0.4.20
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,12 +16,12 @@
 LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter \
 		libgee-0.8.so:${PORTSDIR}/devel/libgee \
 		libxklavier.so:${PORTSDIR}/x11/libxklavier
-RUN_DEPENDS=	py2?-atspi>=2.1.91:${PORTSDIR}/accessibility/py-atspi
+RUN_DEPENDS=	py3?-atspi>=2.1.91:${PORTSDIR}/accessibility/py3-atspi
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig python:2 \
+USES=		gettext gmake gnome libtool pathfix pkgconfig python:3.4+ \
 		shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 \
-		libxslt:build pygobject3
+		libxslt:build py3gobject3
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
 USE_XORG=	x11 xtst
 GNU_CONFIGURE=	yes
@@ -33,4 +33,15 @@
 GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
 		org.gnome.antler.gschema.xml
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3500
+PYOEXTENSION=   pyo
+.else
+PYOEXTENSION=   opt-1.pyc
+.endif
+
+PLIST_SUB+=	PYVER=${PYTHON_VER:S/.//} \
+		PYOEXTENSION=${PYOEXTENSION}
+
+.include <bsd.port.post.mk>
Index: accessibility/caribou/distinfo
===================================================================
--- accessibility/caribou/distinfo	(revision 410067)
+++ accessibility/caribou/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/caribou-0.4.19.tar.xz) = 2f0bd0c14c5f94cf5ac3a7627018919addf7a054ac84aaa8e62356957c175a44
-SIZE (gnome3/caribou-0.4.19.tar.xz) = 412328
+SHA256 (gnome3/caribou-0.4.20.tar.xz) = 3a6664d5698c2b62a6c1c115743630d339ac237a7324bb354f2e5d55b4bb50d9
+SIZE (gnome3/caribou-0.4.20.tar.xz) = 415148
Index: accessibility/caribou/pkg-plist
===================================================================
--- accessibility/caribou/pkg-plist	(revision 410067)
+++ accessibility/caribou/pkg-plist	(working copy)
@@ -10,48 +10,51 @@
 lib/libcaribou.so.0
 lib/libcaribou.so.0.0.0
 %%PYTHON_SITELIBDIR%%/caribou/__init__.py
-%%PYTHON_SITELIBDIR%%/caribou/__init__.pyc
-%%PYTHON_SITELIBDIR%%/caribou/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/__pycache__/i18n.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/__pycache__/i18n.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/caribou/antler/__init__.py
-%%PYTHON_SITELIBDIR%%/caribou/antler/__init__.pyc
-%%PYTHON_SITELIBDIR%%/caribou/antler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/antler_settings.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/antler_settings.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/keyboard_view.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/keyboard_view.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/main.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/main.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/window.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/antler/__pycache__/window.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.py
-%%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.pyc
-%%PYTHON_SITELIBDIR%%/caribou/antler/antler_settings.pyo
 %%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.py
-%%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.pyc
-%%PYTHON_SITELIBDIR%%/caribou/antler/keyboard_view.pyo
 %%PYTHON_SITELIBDIR%%/caribou/antler/main.py
-%%PYTHON_SITELIBDIR%%/caribou/antler/main.pyc
-%%PYTHON_SITELIBDIR%%/caribou/antler/main.pyo
 %%PYTHON_SITELIBDIR%%/caribou/antler/window.py
-%%PYTHON_SITELIBDIR%%/caribou/antler/window.pyc
-%%PYTHON_SITELIBDIR%%/caribou/antler/window.pyo
 %%PYTHON_SITELIBDIR%%/caribou/i18n.py
-%%PYTHON_SITELIBDIR%%/caribou/i18n.pyc
-%%PYTHON_SITELIBDIR%%/caribou/i18n.pyo
 %%PYTHON_SITELIBDIR%%/caribou/settings/__init__.py
-%%PYTHON_SITELIBDIR%%/caribou/settings/__init__.pyc
-%%PYTHON_SITELIBDIR%%/caribou/settings/__init__.pyo
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/__init__.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/__init__.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/caribou_settings.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/caribou_settings.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/preferences_window.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/preferences_window.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/setting_types.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/setting_types.cpython-%%PYVER%%.%%PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/settings_manager.cpython-%%PYVER%%.pyc
+%%PYTHON_SITELIBDIR%%/caribou/settings/__pycache__/settings_manager.cpython-%%PYVER%%.%%PYOEXTENSION%%
 %%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.py
-%%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.pyc
-%%PYTHON_SITELIBDIR%%/caribou/settings/caribou_settings.pyo
 %%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.py
-%%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.pyc
-%%PYTHON_SITELIBDIR%%/caribou/settings/preferences_window.pyo
 %%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.py
-%%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.pyc
-%%PYTHON_SITELIBDIR%%/caribou/settings/setting_types.pyo
 %%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.py
-%%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyc
-%%PYTHON_SITELIBDIR%%/caribou/settings/settings_manager.pyo
 libdata/pkgconfig/caribou-1.0.pc
 libexec/antler-keyboard
 libexec/caribou
 share/antler/dark-key-border.svg
 share/antler/style.css
+%%DATADIR%%/layouts/fullscale/de.xml
 %%DATADIR%%/layouts/fullscale/us.xml
 %%DATADIR%%/layouts/scan/us.xml
+%%DATADIR%%/layouts/tablet/de.xml
+%%DATADIR%%/layouts/tablet/us.xml
 %%DATADIR%%/layouts/touch/ara.xml
 %%DATADIR%%/layouts/touch/de.xml
 %%DATADIR%%/layouts/touch/fr.xml
@@ -105,6 +108,7 @@
 share/locale/ne/LC_MESSAGES/caribou.mo
 share/locale/nl/LC_MESSAGES/caribou.mo
 share/locale/nn/LC_MESSAGES/caribou.mo
+share/locale/oc/LC_MESSAGES/caribou.mo
 share/locale/or/LC_MESSAGES/caribou.mo
 share/locale/pa/LC_MESSAGES/caribou.mo
 share/locale/pl/LC_MESSAGES/caribou.mo