3 files changed, 56 insertions, 62 deletions

diff --git a/devel/gradle/Makefile b/devel/gradle/Makefile
index 93a2b3633ed1..fca3ea9baa3d 100644
--- a/devel/gradle/Makefile
+++ b/devel/gradle/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gradle
-PORTVERSION=	1.12
+PORTVERSION=	2.1
 CATEGORIES=	devel java
 MASTER_SITES=	https://services.gradle.org/distributions/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
@@ -22,11 +22,11 @@ SUB_FILES=	gradle
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing scripts..."
-	@${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle
+	${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Installing data directory 'lib'..."
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR})
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.mk>
diff --git a/devel/gradle/distinfo b/devel/gradle/distinfo
index 14eda07d77cc..38eb2f81b892 100644
--- a/devel/gradle/distinfo
+++ b/devel/gradle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gradle-1.12-bin.zip) = 8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea
-SIZE (gradle-1.12-bin.zip) = 42080843
+SHA256 (gradle-2.1-bin.zip) = 3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878
+SIZE (gradle-2.1-bin.zip) = 41540840
diff --git a/devel/gradle/pkg-plist b/devel/gradle/pkg-plist
index 71fc47c06341..2efcfa56bb60 100644
--- a/devel/gradle/pkg-plist
+++ b/devel/gradle/pkg-plist
@@ -1,49 +1,35 @@
 bin/gradle
 %%DATADIR%%/lib/ant-1.9.3.jar
 %%DATADIR%%/lib/ant-launcher-1.9.3.jar
-%%DATADIR%%/lib/asm-4.0.jar
-%%DATADIR%%/lib/asm-all-5.0_BETA.jar
-%%DATADIR%%/lib/bintray-client-java-api-0.1.0.jar
-%%DATADIR%%/lib/bintray-client-java-impl-0.1.0.jar
-%%DATADIR%%/lib/commons-beanutils-1.8.0.jar
-%%DATADIR%%/lib/commons-codec-1.6.jar
+%%DATADIR%%/lib/asm-all-5.0.3.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-io-1.4.jar
 %%DATADIR%%/lib/commons-lang-2.6.jar
-%%DATADIR%%/lib/commons-logging-1.1.1.jar
 %%DATADIR%%/lib/dom4j-1.6.1.jar
-%%DATADIR%%/lib/ezmorph-1.0.6.jar
-%%DATADIR%%/lib/gradle-base-services-1.12.jar
-%%DATADIR%%/lib/gradle-base-services-groovy-1.12.jar
-%%DATADIR%%/lib/gradle-cli-1.12.jar
-%%DATADIR%%/lib/gradle-core-1.12.jar
-%%DATADIR%%/lib/gradle-docs-1.12.jar
-%%DATADIR%%/lib/gradle-launcher-1.12.jar
-%%DATADIR%%/lib/gradle-messaging-1.12.jar
-%%DATADIR%%/lib/gradle-native-1.12.jar
-%%DATADIR%%/lib/gradle-open-api-1.12.jar
-%%DATADIR%%/lib/gradle-resources-1.12.jar
-%%DATADIR%%/lib/gradle-tooling-api-1.12.jar
-%%DATADIR%%/lib/gradle-ui-1.12.jar
-%%DATADIR%%/lib/gradle-wrapper-1.12.jar
-%%DATADIR%%/lib/groovy-all-1.8.6.jar
-%%DATADIR%%/lib/guava-jdk5-14.0.1.jar
-%%DATADIR%%/lib/http-builder-0.6.jar
-%%DATADIR%%/lib/httpclient-4.2.2.jar
-%%DATADIR%%/lib/httpcore-4.2.2.jar
-%%DATADIR%%/lib/ivy-2.2.0.jar
+%%DATADIR%%/lib/gradle-base-services-2.1.jar
+%%DATADIR%%/lib/gradle-base-services-groovy-2.1.jar
+%%DATADIR%%/lib/gradle-cli-2.1.jar
+%%DATADIR%%/lib/gradle-core-2.1.jar
+%%DATADIR%%/lib/gradle-docs-2.1.jar
+%%DATADIR%%/lib/gradle-launcher-2.1.jar
+%%DATADIR%%/lib/gradle-messaging-2.1.jar
+%%DATADIR%%/lib/gradle-model-core-2.1.jar
+%%DATADIR%%/lib/gradle-model-groovy-2.1.jar
+%%DATADIR%%/lib/gradle-native-2.1.jar
+%%DATADIR%%/lib/gradle-open-api-2.1.jar
+%%DATADIR%%/lib/gradle-resources-2.1.jar
+%%DATADIR%%/lib/gradle-tooling-api-2.1.jar
+%%DATADIR%%/lib/gradle-ui-2.1.jar
+%%DATADIR%%/lib/gradle-wrapper-2.1.jar
+%%DATADIR%%/lib/groovy-all-2.3.6.jar
+%%DATADIR%%/lib/guava-jdk5-17.0.jar
 %%DATADIR%%/lib/jansi-1.2.1.jar
 %%DATADIR%%/lib/jarjar-1.3.jar
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/jaxen-1.1.jar
-%%DATADIR%%/lib/jcifs-1.3.17.jar
 %%DATADIR%%/lib/jcip-annotations-1.0.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.5.jar
 %%DATADIR%%/lib/jna-3.2.7.jar
-%%DATADIR%%/lib/jna-posix-1.0.3.jar
-%%DATADIR%%/lib/joda-time-2.3.jar
-%%DATADIR%%/lib/jsch-0.1.51.jar
-%%DATADIR%%/lib/json-lib-2.3-jdk15.jar
 %%DATADIR%%/lib/jul-to-slf4j-1.7.5.jar
 %%DATADIR%%/lib/kryo-2.20.jar
 %%DATADIR%%/lib/log4j-over-slf4j-1.7.5.jar
@@ -67,34 +53,41 @@ bin/gradle
 %%DATADIR%%/lib/plugins/bndlib-2.1.0.jar
 %%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-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-antlr-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-build-comparison-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-build-init-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-code-quality-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-core-impl-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-cpp-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-diagnostics-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-ear-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-ide-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-ivy-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-jacoco-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-javascript-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-jetty-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-language-base-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-language-jvm-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-maven-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-osgi-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-plugins-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-publish-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-reporting-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-scala-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-signing-1.12.jar
-%%DATADIR%%/lib/plugins/gradle-sonar-1.12.jar
+%%DATADIR%%/lib/plugins/gradle-announce-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-antlr-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-build-comparison-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-build-init-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-code-quality-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-core-impl-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-cpp-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-diagnostics-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-ear-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-ide-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-ivy-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-jacoco-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-javascript-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-jetty-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-language-base-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-language-jvm-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-maven-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-osgi-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-development-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-plugin-use-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-plugins-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-publish-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-reporting-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-resources-http-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-scala-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-signing-2.1.jar
+%%DATADIR%%/lib/plugins/gradle-sonar-2.1.jar
 %%DATADIR%%/lib/plugins/gson-2.2.4.jar
 %%DATADIR%%/lib/plugins/hamcrest-core-1.3.jar
+%%DATADIR%%/lib/plugins/httpclient-4.2.2.jar
+%%DATADIR%%/lib/plugins/httpcore-4.2.2.jar
+%%DATADIR%%/lib/plugins/ivy-2.2.0.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-api-1.13.1.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-connector-wagon-1.13.1.jar
 %%DATADIR%%/lib/plugins/jarjar-aether-impl-1.13.1.jar
@@ -121,12 +114,14 @@ bin/gradle
 %%DATADIR%%/lib/plugins/jarjar-wagon-http-shared4-2.4.jar
 %%DATADIR%%/lib/plugins/jarjar-wagon-provider-api-2.4.jar
 %%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.25.jar
 %%DATADIR%%/lib/plugins/jetty-annotations-6.1.25.jar
 %%DATADIR%%/lib/plugins/jetty-naming-6.1.25.jar
 %%DATADIR%%/lib/plugins/jetty-plus-6.1.25.jar
 %%DATADIR%%/lib/plugins/jetty-util-6.1.25.jar
+%%DATADIR%%/lib/plugins/jsch-0.1.51.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/junit-4.11.jar
@@ -147,4 +142,3 @@ bin/gradle
 %%DATADIR%%/lib/plugins/xml-apis-1.3.04.jar
 %%DATADIR%%/lib/reflectasm-1.07-shaded.jar
 %%DATADIR%%/lib/slf4j-api-1.7.5.jar
-%%DATADIR%%/lib/xml-resolver-1.2.jar