Index: head/devel/gradle/Makefile
===================================================================
--- head/devel/gradle/Makefile
+++ head/devel/gradle/Makefile
@@ -2,27 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	gradle
-PORTVERSION=	3.2.1
+PORTVERSION=	4.0
 CATEGORIES=	devel java
-MASTER_SITES=	https://services.gradle.org/distributions/ \
-		http://services.gradle.org/distributions/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
+MASTER_SITES=	https://downloads.gradle.org/distributions/
+EXTRACT_SUFX=	-bin.zip
 
 MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Project automation tool
 
 LICENSE=	APACHE20
 
-# Gradle depends on native-platform which has a native component that
-# requires libstdc++.so.6, because it was compiled with g++.
-# See https://github.com/adammurdoch/native-platform/issues/8
-LIB_DEPENDS=	libstdc++.so.6:misc/compat9x
-
 NO_ARCH=	yes
 USES=		zip
 USE_JAVA=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-bin$$//}
 SUB_LIST=	PORTVERSION=${PORTVERSION} \
 		JAVA=${JAVA}
 SUB_FILES=	gradle
Index: head/devel/gradle/distinfo
===================================================================
--- head/devel/gradle/distinfo
+++ head/devel/gradle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480376878
-SHA256 (gradle-3.2.1-bin.zip) = 9843a3654d3e57dce54db06d05f18b664b95c22bf90c6becccb61fc63ce60689
-SIZE (gradle-3.2.1-bin.zip) = 69149629
+TIMESTAMP = 1499872390
+SHA256 (gradle-4.0-bin.zip) = 56bd2dde29ba2a93903c557da1745cafd72cdd8b6b0b83c05a40ed7896b79dfe
+SIZE (gradle-4.0-bin.zip) = 67523890
Index: head/devel/gradle/pkg-plist
===================================================================
--- head/devel/gradle/pkg-plist
+++ head/devel/gradle/pkg-plist
@@ -1,55 +1,61 @@
 bin/gradle
+%%DATADIR%%/lib/annotations-13.0.jar
 %%DATADIR%%/lib/ant-1.9.6.jar
 %%DATADIR%%/lib/ant-launcher-1.9.6.jar
 %%DATADIR%%/lib/asm-all-5.1.jar
 %%DATADIR%%/lib/commons-collections-3.2.2.jar
 %%DATADIR%%/lib/commons-io-2.2.jar
 %%DATADIR%%/lib/commons-lang-2.6.jar
-%%DATADIR%%/lib/dom4j-1.6.1.jar
-%%DATADIR%%/lib/gradle-base-services-3.2.1.jar
-%%DATADIR%%/lib/gradle-base-services-groovy-3.2.1.jar
-%%DATADIR%%/lib/gradle-cli-3.2.1.jar
-%%DATADIR%%/lib/gradle-core-3.2.1.jar
-%%DATADIR%%/lib/gradle-docs-3.2.1.jar
-%%DATADIR%%/lib/gradle-installation-beacon-3.2.1.jar
-%%DATADIR%%/lib/gradle-jvm-services-3.2.1.jar
-%%DATADIR%%/lib/gradle-launcher-3.2.1.jar
-%%DATADIR%%/lib/gradle-logging-3.2.1.jar
-%%DATADIR%%/lib/gradle-messaging-3.2.1.jar
-%%DATADIR%%/lib/gradle-model-core-3.2.1.jar
-%%DATADIR%%/lib/gradle-model-groovy-3.2.1.jar
-%%DATADIR%%/lib/gradle-native-3.2.1.jar
-%%DATADIR%%/lib/gradle-open-api-3.2.1.jar
-%%DATADIR%%/lib/gradle-process-services-3.2.1.jar
-%%DATADIR%%/lib/gradle-resources-3.2.1.jar
-%%DATADIR%%/lib/gradle-script-kotlin-0.4.0.jar
-%%DATADIR%%/lib/gradle-tooling-api-3.2.1.jar
-%%DATADIR%%/lib/gradle-ui-3.2.1.jar
-%%DATADIR%%/lib/gradle-wrapper-3.2.1.jar
-%%DATADIR%%/lib/groovy-all-2.4.7.jar
+%%DATADIR%%/lib/gradle-base-services-4.0.jar
+%%DATADIR%%/lib/gradle-base-services-groovy-4.0.jar
+%%DATADIR%%/lib/gradle-cli-4.0.jar
+%%DATADIR%%/lib/gradle-core-4.0.jar
+%%DATADIR%%/lib/gradle-docs-4.0.jar
+%%DATADIR%%/lib/gradle-installation-beacon-4.0.jar
+%%DATADIR%%/lib/gradle-jvm-services-4.0.jar
+%%DATADIR%%/lib/gradle-launcher-4.0.jar
+%%DATADIR%%/lib/gradle-logging-4.0.jar
+%%DATADIR%%/lib/gradle-messaging-4.0.jar
+%%DATADIR%%/lib/gradle-model-core-4.0.jar
+%%DATADIR%%/lib/gradle-model-groovy-4.0.jar
+%%DATADIR%%/lib/gradle-native-4.0.jar
+%%DATADIR%%/lib/gradle-process-services-4.0.jar
+%%DATADIR%%/lib/gradle-resources-4.0.jar
+%%DATADIR%%/lib/gradle-runtime-api-info-4.0.jar
+%%DATADIR%%/lib/gradle-script-kotlin-0.9.0.jar
+%%DATADIR%%/lib/gradle-script-kotlin-compiler-plugin-0.9.0.jar
+%%DATADIR%%/lib/gradle-script-kotlin-tooling-builders-0.9.0.jar
+%%DATADIR%%/lib/gradle-script-kotlin-tooling-models-0.9.0.jar
+%%DATADIR%%/lib/gradle-tooling-api-4.0.jar
+%%DATADIR%%/lib/gradle-wrapper-4.0.jar
+%%DATADIR%%/lib/groovy-all-2.4.11.jar
 %%DATADIR%%/lib/guava-jdk5-17.0.jar
 %%DATADIR%%/lib/jansi-1.14.jar
 %%DATADIR%%/lib/javax.inject-1.jar
-%%DATADIR%%/lib/jaxen-1.1.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.10.jar
 %%DATADIR%%/lib/jul-to-slf4j-1.7.10.jar
-%%DATADIR%%/lib/kotlin-compiler-embeddable-1.1.0-dev-2053.jar
-%%DATADIR%%/lib/kotlin-reflect-1.1.0-dev-2053.jar
-%%DATADIR%%/lib/kotlin-runtime-1.1.0-dev-2053.jar
-%%DATADIR%%/lib/kotlin-stdlib-1.1.0-dev-2053.jar
+%%DATADIR%%/lib/kotlin-compiler-embeddable-1.1.0.jar
+%%DATADIR%%/lib/kotlin-reflect-1.1.0.jar
+%%DATADIR%%/lib/kotlin-stdlib-1.1.0.jar
 %%DATADIR%%/lib/kryo-2.20.jar
 %%DATADIR%%/lib/log4j-over-slf4j-1.7.10.jar
 %%DATADIR%%/lib/minlog-1.2.jar
-%%DATADIR%%/lib/native-platform-0.11.jar
-%%DATADIR%%/lib/native-platform-freebsd-amd64-0.11.jar
-%%DATADIR%%/lib/native-platform-freebsd-i386-0.11.jar
-%%DATADIR%%/lib/native-platform-linux-amd64-0.11.jar
-%%DATADIR%%/lib/native-platform-linux-i386-0.11.jar
-%%DATADIR%%/lib/native-platform-osx-amd64-0.11.jar
-%%DATADIR%%/lib/native-platform-osx-i386-0.11.jar
-%%DATADIR%%/lib/native-platform-windows-amd64-0.11.jar
-%%DATADIR%%/lib/native-platform-windows-i386-0.11.jar
+%%DATADIR%%/lib/native-platform-0.14.jar
+%%DATADIR%%/lib/native-platform-freebsd-amd64-libcpp-0.14.jar
+%%DATADIR%%/lib/native-platform-freebsd-amd64-libstdcpp-0.14.jar
+%%DATADIR%%/lib/native-platform-freebsd-i386-libcpp-0.14.jar
+%%DATADIR%%/lib/native-platform-freebsd-i386-libstdcpp-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-amd64-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-amd64-ncurses5-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-amd64-ncurses6-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-i386-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-i386-ncurses5-0.14.jar
+%%DATADIR%%/lib/native-platform-linux-i386-ncurses6-0.14.jar
+%%DATADIR%%/lib/native-platform-osx-amd64-0.14.jar
+%%DATADIR%%/lib/native-platform-osx-i386-0.14.jar
+%%DATADIR%%/lib/native-platform-windows-amd64-0.14.jar
+%%DATADIR%%/lib/native-platform-windows-i386-0.14.jar
 %%DATADIR%%/lib/objenesis-1.2.jar
 %%DATADIR%%/lib/plugins/aether-api-1.13.1.jar
 %%DATADIR%%/lib/plugins/aether-connector-wagon-1.13.1.jar
@@ -65,51 +71,49 @@
 %%DATADIR%%/lib/plugins/bsh-2.0b4.jar
 %%DATADIR%%/lib/plugins/commons-cli-1.2.jar
 %%DATADIR%%/lib/plugins/commons-codec-1.6.jar
-%%DATADIR%%/lib/plugins/core-3.1.1.jar
-%%DATADIR%%/lib/plugins/geronimo-annotation_1.0_spec-1.0.jar
-%%DATADIR%%/lib/plugins/gradle-announce-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-antlr-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-build-comparison-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-build-init-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-code-quality-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-composite-builds-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-dependency-management-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-diagnostics-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ear-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ide-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ide-native-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ide-play-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-ivy-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-jacoco-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-javascript-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-jetty-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-groovy-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-java-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-jvm-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-native-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-language-scala-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-maven-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-osgi-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-platform-base-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-platform-jvm-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-platform-native-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-platform-play-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-development-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugin-use-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-plugins-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-publish-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-reporting-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-resources-http-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-resources-s3-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-resources-sftp-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-scala-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-signing-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-task-cache-http-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-test-kit-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-testing-base-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-testing-jvm-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-testing-native-3.2.1.jar
-%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-3.2.1.jar
+%%DATADIR%%/lib/plugins/gradle-announce-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-antlr-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-build-cache-http-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-build-comparison-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-build-init-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-code-quality-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-composite-builds-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-dependency-management-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-diagnostics-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-ear-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-ide-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-ide-native-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-ide-play-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-ivy-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-jacoco-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-javascript-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-language-groovy-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-language-java-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-language-jvm-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-language-native-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-language-scala-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-maven-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-osgi-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-platform-base-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-platform-jvm-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-platform-native-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-platform-play-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-development-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-use-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-plugins-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-publish-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-reporting-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-resources-http-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-resources-s3-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-resources-sftp-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-scala-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-signing-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-test-kit-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-testing-base-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-testing-jvm-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-testing-native-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-4.0.jar
+%%DATADIR%%/lib/plugins/gradle-workers-4.0.jar
 %%DATADIR%%/lib/plugins/gson-2.7.jar
 %%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
 %%DATADIR%%/lib/plugins/httpclient-4.4.1.jar
@@ -121,15 +125,8 @@
 %%DATADIR%%/lib/plugins/jatl-0.2.2.jar
 %%DATADIR%%/lib/plugins/jcifs-1.3.17.jar
 %%DATADIR%%/lib/plugins/jcommander-1.12.jar
-%%DATADIR%%/lib/plugins/jetty-6.1.26.jar
-%%DATADIR%%/lib/plugins/jetty-annotations-6.1.26.jar
-%%DATADIR%%/lib/plugins/jetty-naming-6.1.26.jar
-%%DATADIR%%/lib/plugins/jetty-plus-6.1.26.jar
-%%DATADIR%%/lib/plugins/jetty-util-6.1.26.jar
 %%DATADIR%%/lib/plugins/joda-time-2.8.2.jar
-%%DATADIR%%/lib/plugins/jsch-0.1.53.jar
-%%DATADIR%%/lib/plugins/jsp-2.1-6.1.14.jar
-%%DATADIR%%/lib/plugins/jsp-api-2.1-6.1.14.jar
+%%DATADIR%%/lib/plugins/jsch-0.1.54.jar
 %%DATADIR%%/lib/plugins/junit-4.12.jar
 %%DATADIR%%/lib/plugins/maven-aether-provider-3.0.4.jar
 %%DATADIR%%/lib/plugins/maven-artifact-3.0.4.jar
@@ -152,7 +149,6 @@
 %%DATADIR%%/lib/plugins/pmaven-common-0.8-20100325.jar
 %%DATADIR%%/lib/plugins/pmaven-groovy-0.8-20100325.jar
 %%DATADIR%%/lib/plugins/rhino-1.7R3.jar
-%%DATADIR%%/lib/plugins/servlet-api-2.5-20081211.jar
 %%DATADIR%%/lib/plugins/simple-4.1.21.jar
 %%DATADIR%%/lib/plugins/snakeyaml-1.6.jar
 %%DATADIR%%/lib/plugins/testng-6.3.1.jar