Index: devel/liteide/Makefile
===================================================================
--- devel/liteide/Makefile	(revision 491706)
+++ devel/liteide/Makefile	(working copy)
@@ -2,8 +2,7 @@
 
 PORTNAME=	liteide
 DISTVERSIONPREFIX=	x
-DISTVERSION=	34.2
-PORTREVISION=	1
+DISTVERSION=	35.4
 CATEGORIES=	devel editors
 
 MAINTAINER=	dg@syrec.org
@@ -13,35 +12,19 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL
 
 BUILD_DEPENDS=	go:lang/go
-RUN_DEPENDS=	go:lang/go \
-		gocode:devel/go-gocode
+RUN_DEPENDS=	go:lang/go
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-
-qt4_CONFLICTS_INSTALL=	${PORTNAME}
-qt4_PKGNAMESUFFIX=	-qt4
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt4
-
-USES=		gl qmake
+USES=		gl qmake qt:5
 USE_GL=		gl
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
+USE_QT=		buildtools_build core gui network printsupport widgets xml
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	visualfc
-GH_TUPLE=	visualfc:gotools:77fd0f0:gotools/src/github.com/visualfc/gotools
+GH_TUPLE=	visualfc:gocode:4e0736b:gocode/src/github.com/visualfc/gocode \
+		visualfc:gotools:2afd807:gotools/src/github.com/visualfc/gotools
 
-.if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=		qt:4
-USE_QT=		corelib gui moc_build network rcc_build uic_build webkit xml
-PLIST_SUB+=	QT4="" NO_QT4="@comment "
-.else
-USES+=		qt:5
-USE_QT=		buildtools_build core gui network printsupport widgets xml
-PLIST_SUB+=	QT4="@comment " NO_QT4=""
-.endif
+SUB_FILES=	liteide
 
 WRKSRC_SUBDIR=	liteidex
 
@@ -55,11 +38,17 @@
 ICON_SIZES=	16 24 32 48 64 128
 
 post-build:
+	cd ${WRKSRC}/${GH_SUBDIR_gocode} && \
+		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
 	cd ${WRKSRC}/${GH_SUBDIR_gotools} && \
 		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR_gotools}/gotools ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/liteide
+	${MV} ${STAGEDIR}${PREFIX}/bin/liteide ${STAGEDIR}${PREFIX}/libexec/liteide
+	${INSTALL_SCRIPT} ${WRKDIR}/liteide ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR_gocode}/gocode ${STAGEDIR}${PREFIX}/libexec/liteide
+	${INSTALL_PROGRAM} ${WRKSRC}/${GH_SUBDIR_gotools}/gotools ${STAGEDIR}${PREFIX}/libexec/liteide
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/liteide.desktop ${STAGEDIR}${PREFIX}/share/applications
 	(cd ${WRKSRC}/deploy && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
Index: devel/liteide/distinfo
===================================================================
--- devel/liteide/distinfo	(revision 491706)
+++ devel/liteide/distinfo	(working copy)
@@ -1,5 +1,7 @@
-TIMESTAMP = 1537528122
-SHA256 (visualfc-liteide-x34.2_GH0.tar.gz) = 6c4dedb5a2351f9790ddf84998b05aa403bac2dfb2595a0efb5e89c9ecd578cd
-SIZE (visualfc-liteide-x34.2_GH0.tar.gz) = 2730804
-SHA256 (visualfc-gotools-77fd0f0_GH0.tar.gz) = a2f9ef81a77463330ed79744345ea45f559d9e7d73cd26fe339bf24eb3d11062
-SIZE (visualfc-gotools-77fd0f0_GH0.tar.gz) = 538090
+TIMESTAMP = 1548953688
+SHA256 (visualfc-liteide-x35.4_GH0.tar.gz) = 0233eed76228cad3e6d2c937a5c8da2daabe564ef87f7e94f8fec92a673640d2
+SIZE (visualfc-liteide-x35.4_GH0.tar.gz) = 2709163
+SHA256 (visualfc-gocode-4e0736b_GH0.tar.gz) = 916f38227629497f5d12950d2ad602e9f9e5616c7d7d458eddf1c1f57e8aaed8
+SIZE (visualfc-gocode-4e0736b_GH0.tar.gz) = 244193
+SHA256 (visualfc-gotools-2afd807_GH0.tar.gz) = 61529309338975b6ae72558d9c24b3d19c8ef2ba708af823d419e0f015a62704
+SIZE (visualfc-gotools-2afd807_GH0.tar.gz) = 633573
Index: devel/liteide/files/liteide.in
===================================================================
--- devel/liteide/files/liteide.in	(nonexistent)
+++ devel/liteide/files/liteide.in	(working copy)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec /usr/bin/env \
+    LITEIDE_PLUGIN_PATH=%%PREFIX%%/lib/liteide/plugins \
+    LITEIDE_RES_PATH=%%PREFIX%%/share/liteide \
+    LITEIDE_TOOL_PATH=%%PREFIX%%/libexec/liteide \
+    %%PREFIX%%/libexec/liteide/liteide

Property changes on: devel/liteide/files/liteide.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/liteide/pkg-plist
===================================================================
--- devel/liteide/pkg-plist	(revision 491706)
+++ devel/liteide/pkg-plist	(working copy)
@@ -1,5 +1,7 @@
-bin/gotools
 bin/liteide
+libexec/liteide/gocode
+libexec/liteide/gotools
+libexec/liteide/liteide
 lib/liteide/libliteapp.so
 lib/liteide/libliteapp.so.1
 lib/liteide/libliteapp.so.1.0
@@ -27,7 +29,6 @@
 lib/liteide/plugins/libmarkdown.so
 lib/liteide/plugins/libquickopen.so
 lib/liteide/plugins/librustedit.so
-%%QT4%%lib/liteide/plugins/libwebkithtmlwidget.so
 lib/liteide/plugins/libwelcome.so
 share/applications/liteide.desktop
 share/icons/hicolor/128x128/apps/liteide.png
@@ -91,6 +92,7 @@
 %%DATADIR%%/liteeditor/color/cobalt black.xml
 %%DATADIR%%/liteeditor/color/cobalt blue.xml
 %%DATADIR%%/liteeditor/color/colorhelp.md
+%%DATADIR%%/liteeditor/color/dark.xml
 %%DATADIR%%/liteeditor/color/darktango.xml
 %%DATADIR%%/liteeditor/color/darkvim.xml
 %%DATADIR%%/liteeditor/color/default-func.xml