Index: head/graphics/py-traitsui/Makefile
===================================================================
--- head/graphics/py-traitsui/Makefile
+++ head/graphics/py-traitsui/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	traitsui
-PORTVERSION=	6.0.0
+PORTVERSION=	6.1.2
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,10 +17,46 @@
 LICENSE_FILE_EPL=	${WRKSRC}/image_LICENSE_Eclipse.txt
 # See ${WRKSRC}/image_LICENSE.txt for per file license information
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apptools>=4.3.0:devel/py-apptools@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}traits>0:devel/py-traits@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyface>=6.0.0:devel/py-pyface@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+# The requirements are defined in traitsui/__init__.py
 
-USES=		python:2.7
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}traits>0:devel/py-traits@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR}
+py27_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
+# Those requirements (except for pip + coverage) were extracted from etstool.py
+
+USES=		python
 USE_PYTHON=	autoplist distutils
+
 NO_ARCH=	yes
+
+# Support for the wxPython toolkit is also available, but only for Python 2.
+# Python 3 needs wxPython 4 which isn't ported, yet. So we use only Qt5 for a
+# while to make the port useful for Python 2 and 3.
+OPTIONS_DEFINE=	QT5
+OPTIONS_DEFAULT=QT5
+
+QT5_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
+QT5_USES=		pyqt:5
+QT5_USE=		PYQT=core_run,gui_run,printsupport_run,svg_run,widgets_run
+
+# These tests were extracted from etstool.py and adapted to the ports test framework
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m nose -v traitsui.tests
+
+# The test "test_wrap_text_narrow_short" fails at the moment and is going to be
+# fixed with the next release.
+# See also: https://github.com/enthought/traitsui/issues/643
+#
+# Note: The occurences of "qt4" aren't typos
+do-test-QT5-on:
+	@cd ${WRKSRC} && ${SETENV} ETS_TOOLKIT=qt4 QT_API=pyqt5 \
+		${PYTHON_CMD} -m nose -v -e 'test_wrap_text_narrow_short' traitsui.qt4.tests
 
 .include <bsd.port.mk>
Index: head/graphics/py-traitsui/distinfo
===================================================================
--- head/graphics/py-traitsui/distinfo
+++ head/graphics/py-traitsui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525439408
-SHA256 (traitsui-6.0.0.tar.gz) = a75f159f001b71213e17b373461d8df619cd2ae30222a3a78c5e61d4a87dfdea
-SIZE (traitsui-6.0.0.tar.gz) = 5063415
+TIMESTAMP = 1565984705
+SHA256 (traitsui-6.1.2.tar.gz) = 698dd44d6ff6a50502f6ef0ffe545c233f2772e5c37127667302b8c845be9551
+SIZE (traitsui-6.1.2.tar.gz) = 5125470