Index: devel/sonar-scanner-cli/Makefile
===================================================================
--- devel/sonar-scanner-cli/Makefile	(revision 503504)
+++ devel/sonar-scanner-cli/Makefile	(working copy)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	sonar-scanner-cli
-PORTVERSION=	2.8
+PORTVERSION=	3.3.0.1492
 PORTREVISION=	1
 CATEGORIES=	devel java
-MASTER_SITES=	https://sonarsource.bintray.com/Distribution/${PORTNAME}/
-DISTNAME=	sonar-scanner-${PORTVERSION}
+MASTER_SITES=	https://binaries.sonarsource.com/Distribution/${PORTNAME}/
+DISTNAME=	sonar-scanner-cli-${PORTVERSION}
 
 MAINTAINER=	freebsd@dussan.org
 COMMENT=	Launcher for analyzing projects with SonarQube
@@ -20,30 +20,24 @@
 CPE_VENDOR=	sonarsource
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8
 
-SR=		sonar-runner
-SQ_CLI=		sonar-scanner
-SQ_ARCH=	x86-${ARCH:S/i386/32/:S/amd64/64/}
-SQ=		${PREFIX}/sonarqube/bin/freebsd-${SQ_ARCH}
+SS_HOME=	${PREFIX}/${PORTNAME}
+SS_CLI=		sonar-scanner
+SS_ARCH=	x86-${ARCH:S/i386/32/:S/amd64/64/}
+SS=		${PREFIX}/sonarqube/bin/freebsd-${SS_ARCH}
 
 SUB_FILES=	pkg-message
-PLIST_SUB=	SR_HOME=${PREFIX}/${PORTNAME}
+PLIST_SUB=      SS_HOME=${SS_HOME}
+WRKSRC=		${WRKDIR}/${SS_CLI}-${PORTVERSION}
 
-OPTIONS_DEFINE=	SQ
-SQ_DESC=	SonarQube server support
-SQ_RUN_DEPENDS=	${SQ}/sonar.sh.sample:devel/sonarqube
-
 do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PORTNAME})
-	@${MV} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/conf/${SQ_CLI}.properties \
-	 ${STAGEDIR}${PREFIX}/${PORTNAME}/conf/${SQ_CLI}.properties.sample
+	@${MKDIR} ${STAGEDIR}${SS_HOME}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SS_HOME})
+	@${MV} -f ${STAGEDIR}${SS_HOME}/conf/${SS_CLI}.properties \
+	 ${STAGEDIR}${SS_HOME}/conf/${SS_CLI}.properties.sample
 
 post-install:
-	@${LN} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${SR} \
-	 ${STAGEDIR}${PREFIX}/bin/${SR}
-	@${LN} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${SQ_CLI} \
-	 ${STAGEDIR}${PREFIX}/bin/${SQ_CLI}
+	@(cd ${STAGEDIR} && ${LN} -sf ${SS_HOME}/bin/${SS_CLI} ${PREFIX}/bin/${SS_CLI})
 
 .include <bsd.port.mk>
Index: devel/sonar-scanner-cli/README.md
===================================================================
--- devel/sonar-scanner-cli/README.md	(revision 503504)
+++ devel/sonar-scanner-cli/README.md	(working copy)
@@ -2,7 +2,7 @@
 
 The Sonar Scanner CLI is the default launcher to analyze projects for SonarQube. The Sonar Runner allows you to perform source code analyzes without using tools such as Ant or Maven. The SonarQube platform is an open source quality management platform, dedicated to continuously analyzing and measuring the technical quality of source code, from project portfolio down to the method level. With the Sonar Runner, and also a tool like Jenkins, everyone can analyze all kinds of languages, not just Java. The SonarQube Scanner is recommended as the default launcher to analyze a project with SonarQube. The SonarQube Scanner allows you to perform source code analyzes without using tools such as Ant or Maven. The SonarQube platform is an open source quality management platform, dedicated to continuously analyzing and measuring the technical quality of source code, from project portfolio down to the method level. With the SonarQube Scanner, and also a tool like Jenkins, everyone can analyze all kinds of languages, not just Java.
 
-___VERSION:___ 2.8
+___VERSION:___ 3.3.0.1492
 ___MAINTAINER:___ <freebsd@dussan.org>
 ___LICENSE:___ [GNU Lesser General Public License, Version 3](http://www.gnu.org/licenses/lgpl-3.0.html)
 ___WWW:___ [http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner](http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner)
Index: devel/sonar-scanner-cli/distinfo
===================================================================
--- devel/sonar-scanner-cli/distinfo	(revision 503504)
+++ devel/sonar-scanner-cli/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484414843
-SHA256 (sonar-scanner-2.8.zip) = 0295365a7e5d4499ec6b46cb6c70f3fa127159b58b73930f675acd0897a6b350
-SIZE (sonar-scanner-2.8.zip) = 496533
+TIMESTAMP = 1558428600
+SHA256 (sonar-scanner-cli-3.3.0.1492.zip) = 0fabd3fa2e10bbfc5cdf64765ff35e88e7937e48aad51d84401b9f36dbde3678
+SIZE (sonar-scanner-cli-3.3.0.1492.zip) = 564320
Index: devel/sonar-scanner-cli/files/pkg-message.in
===================================================================
--- devel/sonar-scanner-cli/files/pkg-message.in	(revision 503504)
+++ devel/sonar-scanner-cli/files/pkg-message.in	(working copy)
@@ -2,7 +2,7 @@
 
   Before start the SonarQube Scanner (default settings):
   - create a new SONAR_RUNNER_HOME environment variable set to
-    "/usr/local/sonar-scanner-cli"
+    "/usr/local/share/sonar-scanner-cli"
 
   More information:
   http://docs.sonarqube.org/display/SCAN/Analyzing+with+SonarQube+Scanner
Index: devel/sonar-scanner-cli/pkg-plist
===================================================================
--- devel/sonar-scanner-cli/pkg-plist	(revision 503504)
+++ devel/sonar-scanner-cli/pkg-plist	(working copy)
@@ -1,13 +1,7 @@
-bin/sonar-runner
-bin/sonar-scanner
-@(,,755) %%SR_HOME%%/bin/sonar-runner
-@(,,755) %%SR_HOME%%/bin/sonar-scanner
-@(,,755) %%SR_HOME%%/bin/sonar-scanner-debug
-%%SR_HOME%%/bin/sonar-runner.bat
-%%SR_HOME%%/bin/sonar-scanner-debug.bat
-%%SR_HOME%%/bin/sonar-scanner.bat
-%%SR_HOME%%/lib/sonar-scanner-cli-2.8.jar
-@sample %%SR_HOME%%/conf/sonar-scanner.properties.sample
-@dir(,,755) %%SR_HOME%%/bin
-@dir(,,755) %%SR_HOME%%/conf
-@dir(,,755) %%SR_HOME%%/lib
+@(,,755) %%SS_HOME%%/bin/sonar-scanner
+@(,,755) %%SS_HOME%%/bin/sonar-scanner-debug
+@sample %%SS_HOME%%/conf/sonar-scanner.properties.sample
+%%SS_HOME%%/lib/sonar-scanner-cli-3.3.0.1492.jar
+@dir(,,755) %%SS_HOME%%/bin/
+@dir(,,755) %%SS_HOME%%/conf/
+@dir(,,755) %%SS_HOME%%/lib/