Index: editors/texstudio/Makefile
===================================================================
--- editors/texstudio/Makefile
+++ editors/texstudio/Makefile
@@ -1,52 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=	texstudio
-PORTVERSION=	2.11.0
-PORTREVISION=	8
+DISTVERSION=	2.12.8
 CATEGORIES=	editors
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/TeXstudio%20${PORTVERSION}
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	abiliojr@gmail.com
 COMMENT=	Integrated writing environment for LaTeX documents
 
-LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
-		libpoppler.so:graphics/poppler
+LICENSE=	GPLv2
 
 BROKEN_aarch64=		fails to compile: error: no member named mc_eip in __mcontext
 BROKEN_armv6=		fails to compile: error: no member named mc_eip in __mcontext
 
-USES=		desktop-file-utils dos2unix ghostscript:run \
-		pkgconfig qmake
-DOS2UNIX_FILES=	${PORTNAME}.pro
+LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
+		libpoppler.so:graphics/poppler
+
+FLAVORS=	qt5 qt4
+FLAVOR?=	${FLAVORS:[1]}
 
-_USE_QT4=	corelib gui network script svg xml \
+.if ${FLAVOR} == qt4
+USE_QT4=	corelib gui network script svg xml \
 		iconengines_run designer_build moc_build rcc_build uic_build
-_USE_QT5=	core gui network script svg widgets xml \
+qt4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
+		libquazip.so:archivers/quazip@qt4
+QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
+		QUAZIP_LIB="-lquazip"
+.else
+USE_QT5=	core gui network script svg widgets xml \
 		printsupport concurrent uitools buildtools_build
+qt5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5 \
+		libquazip5.so:archivers/quazip@qt5
+QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
+		QUAZIP_LIB="-lquazip5"
+QTVER_SUFFIX=	5
+.endif
+
+USES=		desktop-file-utils dos2unix ghostscript:run \
+		pkgconfig qmake
 
 USE_XORG=	x11
 USE_GL=		gl
 USE_TEX=	latex dvipsk
+USE_GITHUB=	yes
+GH_ACCOUNT=	${PORTNAME}-org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
-
-OPTIONS_SINGLE=		TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
-OPTIONS_DEFAULT=	QT5
-
-QMAKE_ARGS=	USE_SYSTEM_HUNSPELL=true USE_SYSTEM_QUAZIP=true
+DOS2UNIX_FILES=	${PORTNAME}.pro
 
-TOOLKIT_DESC=	Qt toolkit
-QT4_USE=	${_USE_QT4:S/^/QT4=/}
-QT4_LIB_DEPENDS=libpoppler-qt4.so:graphics/poppler-qt4 \
-		libquazip.so:archivers/quazip@qt4
-QT4_QMAKE_ON=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
-		QUAZIP_LIB="-lquazip"
-QT5_USE=	${_USE_QT5:S/^/QT5=/}
-QT5_LIB_DEPENDS=libpoppler-qt5.so:graphics/poppler-qt5 \
-		libquazip5.so:archivers/quazip@qt5
-QT5_QMAKE_ON=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
-		QUAZIP_LIB="-lquazip5"
+QMAKE_ARGS+=	USE_SYSTEM_HUNSPELL=true USE_SYSTEM_QUAZIP=true
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \
Index: editors/texstudio/distinfo
===================================================================
--- editors/texstudio/distinfo
+++ editors/texstudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468240968
-SHA256 (texstudio-2.11.0.tar.gz) = 170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307
-SIZE (texstudio-2.11.0.tar.gz) = 26263749
+TIMESTAMP = 1523190835
+SHA256 (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062
+SIZE (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 26555418
Index: editors/texstudio/pkg-plist
===================================================================
--- editors/texstudio/pkg-plist
+++ editors/texstudio/pkg-plist
@@ -118,10 +118,12 @@
 %%DATADIR%%/texstudio32x32.png
 %%DATADIR%%/texstudio48x48.png
 %%DATADIR%%/texstudio64x64.png
+%%DATADIR%%/texstudio_ar.qm
 %%DATADIR%%/texstudio_cs.qm
 %%DATADIR%%/texstudio_de.qm
 %%DATADIR%%/texstudio_el.qm
 %%DATADIR%%/texstudio_es.qm
+%%DATADIR%%/texstudio_fa.qm
 %%DATADIR%%/texstudio_fr.qm
 %%DATADIR%%/texstudio_hu.qm
 %%DATADIR%%/texstudio_it.qm
@@ -130,6 +132,7 @@
 %%DATADIR%%/texstudio_pl.qm
 %%DATADIR%%/texstudio_pt_BR.qm
 %%DATADIR%%/texstudio_ru_RU.qm
+%%DATADIR%%/texstudio_tr_TR.qm
 %%DATADIR%%/texstudio_uk.qm
 %%DATADIR%%/texstudio_vi.qm
 %%DATADIR%%/texstudio_zh_CN.qm