Index: devel/jetbrains-goland/Makefile
===================================================================
--- devel/jetbrains-goland/Makefile	(revision 567834)
+++ devel/jetbrains-goland/Makefile	(working copy)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	goland
-PORTVERSION=	2020.3.2
+PORTVERSION=	2020.3.3
 CATEGORIES=	devel java
 MASTER_SITES=	https://download-cf.jetbrains.com/go/
 PKGNAMEPREFIX=	jetbrains-
@@ -28,7 +28,7 @@
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_FILES=	goland goland.desktop pkg-message
+SUB_FILES=	${PORTNAME} ${PORTNAME}.desktop pkg-message
 
 WRKSRC=		${WRKDIR}/GoLand-${PORTVERSION}
 
@@ -40,22 +40,26 @@
 DELVE_RUN_DEPENDS=	delve>0:devel/delve
 
 do-install:
+# Initial JDK 15+ support
+	@${REINPLACE_CMD} '/UseConcMarkSweepGC/d' ${WRKSRC}/bin/${PORTNAME}.vmoptions
+	@${REINPLACE_CMD} '/UseConcMarkSweepGC/d' ${WRKSRC}/bin/${PORTNAME}64.vmoptions
 # Linux/Windows/OS X only so remove them
-	@${RM} -r ${WRKSRC}/bin/fsnotifier \
+	@${RM} -r \
+		${WRKSRC}/bin/fsnotifier \
 		${WRKSRC}/bin/fsnotifier-arm \
 		${WRKSRC}/bin/fsnotifier64 \
+		${WRKSRC}/jbr \
+		${WRKSRC}/jre64 \
 		${WRKSRC}/lib/pty4j-native \
 		${WRKSRC}/plugins/go/lib/dlv \
 		${WRKSRC}/plugins/performanceTesting/bin
-# Remove bundled linux JetBrains Runtime and OpenJDK
-	@${RM} -r ${WRKSRC}/jbr ${WRKSRC}/jre64
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
-		"! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
+		"! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
 	@(cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR} "-name *\.sh")
-	${INSTALL_SCRIPT} ${WRKDIR}/goland ${STAGEDIR}${PREFIX}/bin/goland
-	${INSTALL_MAN} ${FILESDIR}/goland.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKDIR}/goland.desktop ${STAGEDIR}${PREFIX}/share/applications/
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 # Use fsnotifier replacement provided by java/intellij-fsnotifier
 	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/intellij/bin/fsnotifier" >> ${STAGEDIR}${DATADIR}/bin/idea.properties
 # Use pty4j replacement provided by java/intellij-pty4j
Index: devel/jetbrains-goland/distinfo
===================================================================
--- devel/jetbrains-goland/distinfo	(revision 567834)
+++ devel/jetbrains-goland/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612110616
-SHA256 (jetbrains/goland-2020.3.2.tar.gz) = 5f1bacaadac20259b58215fb3a5f58fe97ba1051279a7f9060693d1e1ea18b03
-SIZE (jetbrains/goland-2020.3.2.tar.gz) = 484904300
+TIMESTAMP = 1615152004
+SHA256 (jetbrains/goland-2020.3.3.tar.gz) = 276b07c8b8a49a62c002d9565fb33a8e6800e40edfdb809d70870e6074db86f8
+SIZE (jetbrains/goland-2020.3.3.tar.gz) = 484958892