Index: devel/eric6/Makefile
===================================================================
--- devel/eric6/Makefile
+++ devel/eric6/Makefile
@@ -1,7 +1,6 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 # $FreeBSD: head/devel/eric6/Makefile 455210 2017-11-30 15:50:30Z mat $
 
-PORTREVISION=	1
 CATEGORIES=	devel python
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -17,20 +16,9 @@
 
 USES=		desktop-file-utils
 INSTALL_CMD=	install.py -c -f eric6config.freebsd -i ${STAGEDIR} --pyqt=${PYQTVER}
-PLIST_FILES=
 SUB_FILES=	eric6.desktop
-OPTIONS_DEFINE=	DOCS EXAMPLES
-OPTIONS_DEFAULT=PYQT4
-OPTIONS_SINGLE=	PYQT
-OPTIONS_SINGLE_PYQT=	PYQT4 PYQT5
-PYQT_DESC=	PyQt Version
-PYQT4_DESC=	Python bindings for Qt4
-PYQT4_VARS=	PYQTVER=4
-PYQT5_DESC=	Python bindings for Qt5
-PYQT5_VARS=	PYQTVER=5
-PYQT5_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR}
-EXTRA_PATCHES=
-MASTERPORT=
+PYQTVER=	${FLAVOR:C/qt([45])_py[0-9]+/\1/}
+MASTERPORT=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
Index: devel/eric6/Makefile.inc
===================================================================
--- devel/eric6/Makefile.inc
+++ devel/eric6/Makefile.inc
@@ -3,34 +3,47 @@
 #
 # This is a set of Makefile macros which allow to build the core and
 # localized language packages for devel/eric6:
-# french/eric6, german/eric6, russian/eric6
+# chinese/eric6, french/eric6, german/eric6, russian/eric6, portugese/eric6,
+# devel/cs-eric6, devel/es-eric6, devel/it-eric6, devel/tr-eric6
 
 PORTNAME=	eric6
-PORTVERSION=	17.10
+PORTVERSION=	17.11.1
+PKGNAMESUFFIX=	-${FLAVOR:S/_/-/}
 MASTER_SITES=	SF/eric-ide/${PORTNAME}/stable/${PORTVERSION}
-DISTNAME?=	${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER?=	dbn@FreeBSD.org
+MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	Full featured Python and Ruby editor and IDE based on Qt
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS?=	${LOCALBASE}/bin/eric6:devel/eric6
-
-I18N_LANG?=	ru
-INSTALL_CMD?=	install-i18n.py -p ${STAGEDIR}
 MAKE_ENV+=	"HOME=${WRKDIR}"
 
-USES+=		python:2.7
+CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PKGNAMEPREFIX}${PORTNAME}-/:C/$/-[0-9]*/}
+USES+=		python:${FLAVOR:C/.*_py([0-9])/\1./}
 NO_BUILD=	yes
-PLIST_FILES?=	%%DATADIR%%/i18n/${PORTNAME}_${I18N_LANG}.qm
-EXTRA_PATCHES?=	${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
 
-.if ! defined(MASTERPORT)
+.if !defined(MASTERPORT)
+DISTNAME=	${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION}
+
+RUN_DEPENDS=	${LOCALBASE}/bin/eric6:devel/eric6@${FLAVOR}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/eric6/files/extra-patch-install-i18n.py
+I18N_LANG?=	ru
+INSTALL_CMD=	install-i18n.py -p ${STAGEDIR}
 NO_ARCH=	yes
+PLIST_FILES=	${DATADIR}/i18n/${PORTNAME}_${I18N_LANG}.qm
 .endif
 
+.include <bsd.port.options.mk>
+
+PY_FLAVORS=	py${PYTHON_DEFAULT:S/.//} py${PYTHON2_DEFAULT:S/.//} py${PYTHON3_DEFAULT:S/.//}
+.for flavor in ${PY_FLAVORS}
+.  if empty(FLAVORS:Mqt4_${flavor})
+FLAVORS:=	${FLAVORS} qt4_${flavor} qt5_${flavor}
+.  endif
+.endfor
+
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} <= 2.7
@@ -39,6 +52,10 @@
 PLIST_SUB+=	PYTHON2="@comment "
 .endif
 
+.if defined(MASTERPORT) && ${PYQTVER} == 5
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt5/QtWebKitWidgets.so:www/py-qt5-webkitwidgets@${PY_FLAVOR}
+.endif
+
 do-install:
 	@(cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_CMD})
Index: devel/eric6/distinfo
===================================================================
--- devel/eric6/distinfo
+++ devel/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509047590
-SHA256 (eric6-17.10.tar.gz) = 2fdcde6d6a9c2b23b0ce488ef7e80c74b85900d24b4ced1760b761f543af35ce
-SIZE (eric6-17.10.tar.gz) = 18938811
+TIMESTAMP = 1512941764
+SHA256 (eric6-17.11.1.tar.gz) = 2a7eb6392ce5782ac514c96574587d40240b75e2a9fd970d859db842faeaa89c
+SIZE (eric6-17.11.1.tar.gz) = 18986262