Index: head/devel/liteide/Makefile
===================================================================
--- head/devel/liteide/Makefile	(revision 510268)
+++ head/devel/liteide/Makefile	(revision 510269)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	liteide
 DISTVERSIONPREFIX=	x
-DISTVERSION=	36
+DISTVERSION=	36.1
 CATEGORIES=	devel editors
 
 MAINTAINER=	dg@syrec.org
 COMMENT=	Simple, open source, cross-platform Go IDE
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL
 
-USES=		gl go:no_targets,run qmake qt:5
+USES=		gl go:modules,no_targets,run 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:gocode:4e0736b:gocode/src/github.com/visualfc/gocode \
-		visualfc:gotools:6d12497:gotools/src/github.com/visualfc/gotools
+GH_TUPLE=	visualfc:gocode:5e8ed360a181:visualfc_gocode \
+		visualfc:gotools:64c955ca5eea:visualfc_gotools
 
 SUB_FILES=	liteide
 
 WRKSRC_SUBDIR=	liteidex
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DEBUG DOCS
 OPTIONS_SUB=	yes
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
 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
+	cd ${WRKSRC_visualfc_gocode} && \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS}
+	cd ${WRKSRC_visualfc_gotools} && \
+		${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install ${GO_BUILDFLAGS}
 
 post-install:
 	@${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
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/gocode ${STAGEDIR}${PREFIX}/libexec/liteide
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/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})
 	(cd ${WRKSRC}/os_deploy/freebsd && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
 	${RM} ${STAGEDIR}${PREFIX}/lib/liteide/*.a
 .for sz in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps
 	${INSTALL_DATA} ${WRKSRC}/src/liteapp/images/liteide${sz}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${sz}x${sz}/apps/liteide.png
 .endfor
 
 post-install-DOCS-on:
-	(cd ${WRKSRC:H} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
+	cd ${WRKSRC:H} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/liteide/distinfo
===================================================================
--- head/devel/liteide/distinfo	(revision 510268)
+++ head/devel/liteide/distinfo	(revision 510269)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1552674284
-SHA256 (visualfc-liteide-x36_GH0.tar.gz) = b6c05d8864512df54b7f306f1d031e621ed755fc210bd8607ad0f2b0da0fe6f8
-SIZE (visualfc-liteide-x36_GH0.tar.gz) = 2714821
-SHA256 (visualfc-gocode-4e0736b_GH0.tar.gz) = 916f38227629497f5d12950d2ad602e9f9e5616c7d7d458eddf1c1f57e8aaed8
-SIZE (visualfc-gocode-4e0736b_GH0.tar.gz) = 244193
-SHA256 (visualfc-gotools-6d12497_GH0.tar.gz) = 06ea0b927b02e4cb650e6045a9ff8c9548e96761bb06ba2204c3c2b03695f416
-SIZE (visualfc-gotools-6d12497_GH0.tar.gz) = 633693
+TIMESTAMP = 1567081087
+SHA256 (visualfc-liteide-x36.1_GH0.tar.gz) = de267cbcbbd4f7b303248704979a9075095153cb0a1ecccd1a4fac68c33b046a
+SIZE (visualfc-liteide-x36.1_GH0.tar.gz) = 2727796
+SHA256 (visualfc-gocode-5e8ed360a181_GH0.tar.gz) = 563437338405a9269f445ed6ef34697897e029f0822c8725abf9a27ea265a5ca
+SIZE (visualfc-gocode-5e8ed360a181_GH0.tar.gz) = 249127
+SHA256 (visualfc-gotools-64c955ca5eea_GH0.tar.gz) = b66200d836c859c7d1299589bc6fe4e13d6ff98138a8ba94b3595c2982e81250
+SIZE (visualfc-gotools-64c955ca5eea_GH0.tar.gz) = 644449