Attachment 166160 Details for Bug 203969 – new patch

[patch] new patch

devel_gradle_2.10.patch (text/plain), 13.47 KB, created by Gasol Wu on 2016-01-26 19:47:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gasol Wu

Created: 2016-01-26 19:47:51 UTC

Size: 13.47 KB

patch

obsolete

>diff -ruN /var/cache/portshaker/ports//devel/gradle/Makefile ./Makefile
>--- /var/cache/portshaker/ports//devel/gradle/Makefile	2015-06-30 19:50:52.000000000 +0800
>+++ ./Makefile	2016-01-25 10:45:47.969180000 +0800
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/gradle/Makefile 390955 2015-06-30 11:50:52Z girgen $
> 
> PORTNAME=	gradle
>-PORTVERSION=	2.4
>+PORTVERSION=	2.10
> CATEGORIES=	devel java
> MASTER_SITES=	https://services.gradle.org/distributions/
> DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
>@@ -21,12 +21,7 @@
> SUB_FILES=	gradle
> 
> do-install:
>-	@${ECHO_MSG} -n ">> Installing scripts..."
> 	${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})
>-	@${ECHO_MSG} " [ DONE ]"
> 
> .include <bsd.port.mk>
>diff -ruN /var/cache/portshaker/ports//devel/gradle/distinfo ./distinfo
>--- /var/cache/portshaker/ports//devel/gradle/distinfo	2015-06-30 19:50:52.000000000 +0800
>+++ ./distinfo	2016-01-25 10:45:47.973390000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (gradle-2.4-bin.zip) = c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f
>-SIZE (gradle-2.4-bin.zip) = 45383133
>+SHA256 (gradle-2.10-bin.zip) = 66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13
>+SIZE (gradle-2.10-bin.zip) = 46372477
>diff -ruN /var/cache/portshaker/ports//devel/gradle/files/gradle.in ./files/gradle.in
>--- /var/cache/portshaker/ports//devel/gradle/files/gradle.in	2014-05-25 04:54:16.000000000 +0800
>+++ ./files/gradle.in	2016-01-25 10:45:47.978137000 +0800
>@@ -1,3 +1,3 @@
> #!/usr/bin/env bash
> 
>-exec "%%JAVA%%" $JAVA_OPTS -classpath "%%DATADIR%%/lib/gradle-launcher-%%PORTVERSION%%.jar" org.gradle.launcher.GradleMain "$@"
>+exec "%%JAVA%%" -Dorg.gradle.native=false $JAVA_OPTS -classpath "%%DATADIR%%/lib/gradle-launcher-%%PORTVERSION%%.jar" org.gradle.launcher.GradleMain "$@"
>diff -ruN /var/cache/portshaker/ports//devel/gradle/pkg-plist ./pkg-plist
>--- /var/cache/portshaker/ports//devel/gradle/pkg-plist	2015-06-30 19:50:52.000000000 +0800
>+++ ./pkg-plist	2016-01-25 10:45:47.985482000 +0800
>@@ -1,27 +1,27 @@
> bin/gradle
>-%%DATADIR%%/lib/ant-1.9.4.jar
>-%%DATADIR%%/lib/ant-launcher-1.9.4.jar
>+%%DATADIR%%/lib/ant-1.9.3.jar
>+%%DATADIR%%/lib/ant-launcher-1.9.3.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-io-2.2.jar
> %%DATADIR%%/lib/commons-lang-2.6.jar
> %%DATADIR%%/lib/dom4j-1.6.1.jar
>-%%DATADIR%%/lib/gradle-base-services-2.4.jar
>-%%DATADIR%%/lib/gradle-base-services-groovy-2.4.jar
>-%%DATADIR%%/lib/gradle-cli-2.4.jar
>-%%DATADIR%%/lib/gradle-core-2.4.jar
>-%%DATADIR%%/lib/gradle-docs-2.4.jar
>-%%DATADIR%%/lib/gradle-launcher-2.4.jar
>-%%DATADIR%%/lib/gradle-messaging-2.4.jar
>-%%DATADIR%%/lib/gradle-model-core-2.4.jar
>-%%DATADIR%%/lib/gradle-model-groovy-2.4.jar
>-%%DATADIR%%/lib/gradle-native-2.4.jar
>-%%DATADIR%%/lib/gradle-open-api-2.4.jar
>-%%DATADIR%%/lib/gradle-resources-2.4.jar
>-%%DATADIR%%/lib/gradle-tooling-api-2.4.jar
>-%%DATADIR%%/lib/gradle-ui-2.4.jar
>-%%DATADIR%%/lib/gradle-wrapper-2.4.jar
>-%%DATADIR%%/lib/groovy-all-2.3.10.jar
>+%%DATADIR%%/lib/gradle-base-services-2.10.jar
>+%%DATADIR%%/lib/gradle-base-services-groovy-2.10.jar
>+%%DATADIR%%/lib/gradle-cli-2.10.jar
>+%%DATADIR%%/lib/gradle-core-2.10.jar
>+%%DATADIR%%/lib/gradle-docs-2.10.jar
>+%%DATADIR%%/lib/gradle-launcher-2.10.jar
>+%%DATADIR%%/lib/gradle-messaging-2.10.jar
>+%%DATADIR%%/lib/gradle-model-core-2.10.jar
>+%%DATADIR%%/lib/gradle-model-groovy-2.10.jar
>+%%DATADIR%%/lib/gradle-native-2.10.jar
>+%%DATADIR%%/lib/gradle-open-api-2.10.jar
>+%%DATADIR%%/lib/gradle-resources-2.10.jar
>+%%DATADIR%%/lib/gradle-tooling-api-2.10.jar
>+%%DATADIR%%/lib/gradle-ui-2.10.jar
>+%%DATADIR%%/lib/gradle-wrapper-2.10.jar
>+%%DATADIR%%/lib/groovy-all-2.4.4.jar
> %%DATADIR%%/lib/guava-jdk5-17.0.jar
> %%DATADIR%%/lib/jansi-1.2.1.jar
> %%DATADIR%%/lib/jarjar-1.3.jar
>@@ -44,56 +44,61 @@
> %%DATADIR%%/lib/native-platform-windows-amd64-0.10.jar
> %%DATADIR%%/lib/native-platform-windows-i386-0.10.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
>+%%DATADIR%%/lib/plugins/aether-impl-1.13.1.jar
>+%%DATADIR%%/lib/plugins/aether-spi-1.13.1.jar
>+%%DATADIR%%/lib/plugins/aether-util-1.13.1.jar
> %%DATADIR%%/lib/plugins/aws-java-sdk-core-1.9.19.jar
> %%DATADIR%%/lib/plugins/aws-java-sdk-kms-1.9.19.jar
> %%DATADIR%%/lib/plugins/aws-java-sdk-s3-1.9.19.jar
> %%DATADIR%%/lib/plugins/bcpg-jdk15on-1.51.jar
> %%DATADIR%%/lib/plugins/bcprov-jdk15on-1.51.jar
>-%%DATADIR%%/lib/plugins/bndlib-2.1.0.jar
>+%%DATADIR%%/lib/plugins/bndlib-2.4.0.jar
> %%DATADIR%%/lib/plugins/bsh-2.0b4.jar
>-%%DATADIR%%/lib/plugins/classworlds-1.1-alpha-2.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-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-antlr-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-build-comparison-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-build-init-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-code-quality-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-dependency-management-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-diagnostics-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-ear-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-ide-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-ide-native-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-ivy-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-jacoco-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-javascript-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-jetty-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-language-groovy-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-language-java-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-language-jvm-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-language-native-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-language-scala-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-maven-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-osgi-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-base-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-jvm-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-native-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-platform-play-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-plugin-development-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-plugin-use-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-plugins-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-publish-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-reporting-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-http-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-s3-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-resources-sftp-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-scala-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-signing-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-sonar-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-testing-native-2.4.jar
>-%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-2.4.jar
>+%%DATADIR%%/lib/plugins/gradle-announce-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-antlr-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-build-comparison-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-build-init-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-code-quality-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-dependency-management-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-diagnostics-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-ear-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-ide-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-ide-native-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-ivy-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-jacoco-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-javascript-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-jetty-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-language-groovy-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-language-java-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-language-jvm-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-language-native-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-language-scala-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-maven-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-osgi-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-base-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-jvm-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-native-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-platform-play-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-plugin-development-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-plugin-use-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-plugins-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-publish-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-reporting-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-http-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-s3-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-resources-sftp-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-scala-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-signing-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-sonar-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-test-kit-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-testing-native-2.10.jar
>+%%DATADIR%%/lib/plugins/gradle-tooling-api-builders-2.10.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
>@@ -102,31 +107,6 @@
> %%DATADIR%%/lib/plugins/jackson-annotations-2.3.2.jar
> %%DATADIR%%/lib/plugins/jackson-core-2.3.2.jar
> %%DATADIR%%/lib/plugins/jackson-databind-2.3.2.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
>-%%DATADIR%%/lib/plugins/jarjar-aether-spi-1.13.1.jar
>-%%DATADIR%%/lib/plugins/jarjar-aether-util-1.13.1.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-aether-provider-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-artifact-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-compat-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-core-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-model-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-model-builder-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-plugin-api-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-repository-metadata-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-settings-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-maven-settings-builder-3.0.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-cipher-1.7.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-classworlds-2.4.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-component-annotations-1.5.5.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-container-default-1.5.5.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-interpolation-1.14.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-sec-dispatcher-1.3.jar
>-%%DATADIR%%/lib/plugins/jarjar-plexus-utils-2.0.6.jar
>-%%DATADIR%%/lib/plugins/jarjar-wagon-http-2.4.jar
>-%%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
>@@ -135,23 +115,29 @@
> %%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/joda-time-2.7.jar
>-%%DATADIR%%/lib/plugins/jsch-0.1.51.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/junit-4.12.jar
>-%%DATADIR%%/lib/plugins/maven-artifact-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-artifact-manager-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-error-diagnostics-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-model-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-project-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-repository-metadata-2.2.1.jar
>-%%DATADIR%%/lib/plugins/maven-settings-2.2.1.jar
>+%%DATADIR%%/lib/plugins/maven-aether-provider-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-artifact-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-compat-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-core-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-model-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-model-builder-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-plugin-api-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-repository-metadata-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-settings-3.0.4.jar
>+%%DATADIR%%/lib/plugins/maven-settings-builder-3.0.4.jar
> %%DATADIR%%/lib/plugins/nekohtml-1.9.14.jar
>-%%DATADIR%%/lib/plugins/plexus-component-annotations-1.5.2.jar
>-%%DATADIR%%/lib/plugins/plexus-container-default-1.0-alpha-9-stable-1.jar
>-%%DATADIR%%/lib/plugins/plexus-interpolation-1.11.jar
>-%%DATADIR%%/lib/plugins/plexus-utils-1.5.15.jar
>+%%DATADIR%%/lib/plugins/plexus-cipher-1.7.jar
>+%%DATADIR%%/lib/plugins/plexus-classworlds-2.4.jar
>+%%DATADIR%%/lib/plugins/plexus-component-annotations-1.5.5.jar
>+%%DATADIR%%/lib/plugins/plexus-container-default-1.5.5.jar
>+%%DATADIR%%/lib/plugins/plexus-interpolation-1.14.jar
>+%%DATADIR%%/lib/plugins/plexus-sec-dispatcher-1.3.jar
>+%%DATADIR%%/lib/plugins/plexus-utils-2.0.6.jar
> %%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
>@@ -162,9 +148,10 @@
> %%DATADIR%%/lib/plugins/sonar/logback-classic-1.0.13.jar
> %%DATADIR%%/lib/plugins/sonar/logback-core-1.0.13.jar
> %%DATADIR%%/lib/plugins/testng-6.3.1.jar
>-%%DATADIR%%/lib/plugins/wagon-file-1.0-beta-6.jar
>-%%DATADIR%%/lib/plugins/wagon-http-lightweight-1.0-beta-6.jar
>-%%DATADIR%%/lib/plugins/wagon-provider-api-1.0-beta-6.jar
>+%%DATADIR%%/lib/plugins/wagon-file-2.4.jar
>+%%DATADIR%%/lib/plugins/wagon-http-2.4.jar
>+%%DATADIR%%/lib/plugins/wagon-http-shared4-2.4.jar
>+%%DATADIR%%/lib/plugins/wagon-provider-api-2.4.jar
> %%DATADIR%%/lib/plugins/xbean-reflect-3.4.jar
> %%DATADIR%%/lib/plugins/xercesImpl-2.9.1.jar
> %%DATADIR%%/lib/plugins/xml-apis-1.3.04.jar

Flags:

gasol.wu: maintainer-approval+

Actions: View | Diff

Attachments on bug 203969: 162370 | 162372 | 166160 | 167506 | 167507 | 168792