Index: head/devel/jetbrains-clion/Makefile
===================================================================
--- head/devel/jetbrains-clion/Makefile	(revision 568669)
+++ head/devel/jetbrains-clion/Makefile	(revision 568670)
@@ -1,61 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	clion
-PORTVERSION=	2020.3.2
+PORTVERSION=	2020.3.3
 CATEGORIES=	devel java
 MASTER_SITES=	https://download-cf.jetbrains.com/cpp/
 PKGNAMEPREFIX=	jetbrains-
 DISTNAME=	CLion-${PORTVERSION}
 DIST_SUBDIR=	jetbrains
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	JetBrains CLion IDE
 
 LICENSE=	IntelliJ-CLion
 LICENSE_NAME=	Subscription license agreement for business and organizations
 LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
 		intellij-pty4j>=0.11.4:java/intellij-pty4j \
 		lsof:sysutils/lsof
 
 USES=		python:run shebangfix
 
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 
 SHEBANG_FILES=	bin/printenv.py bin/restart.py
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_FILES=	clion clion.desktop pkg-message
+SUB_FILES=	${PORTNAME} ${PORTNAME}.desktop pkg-message
 
 WRKSRC=		${WRKDIR}/clion-${PORTVERSION}
 
 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 \
-		${WRKSRC}/bin/fsnotifier-arm \
-		${WRKSRC}/bin/fsnotifier64 \
+	@${RM} -r \
 		${WRKSRC}/bin/clang \
 		${WRKSRC}/bin/cmake \
+		${WRKSRC}/bin/fsnotifier \
+		${WRKSRC}/bin/fsnotifier-arm \
+		${WRKSRC}/bin/fsnotifier64 \
 		${WRKSRC}/bin/gdb/linux \
 		${WRKSRC}/bin/lldb/linux \
+		${WRKSRC}/jbr \
+		${WRKSRC}/jre64 \
 		${WRKSRC}/lib/pty4j-native \
 		${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}/clion ${STAGEDIR}${PREFIX}/bin/clion
-	${INSTALL_MAN} ${FILESDIR}/clion.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKDIR}/clion.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
 	${LN} -sf ../../../intellij/lib/libpty ${STAGEDIR}${DATADIR}/lib/pty4j-native
 
 .include <bsd.port.mk>
Index: head/devel/jetbrains-clion/distinfo
===================================================================
--- head/devel/jetbrains-clion/distinfo	(revision 568669)
+++ head/devel/jetbrains-clion/distinfo	(revision 568670)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612110592
-SHA256 (jetbrains/CLion-2020.3.2.tar.gz) = 5d49bd88b6457271464687453ff65880a4a38974575bb76f969036c692072280
-SIZE (jetbrains/CLion-2020.3.2.tar.gz) = 624043209
+TIMESTAMP = 1615973535
+SHA256 (jetbrains/CLion-2020.3.3.tar.gz) = 2470365df5c682aec24e6ce88a87100232d0f26607522dda79572414fb944083
+SIZE (jetbrains/CLion-2020.3.3.tar.gz) = 624552270