On Tue, Sep 17, 2019 at 02:37:48PM +0100, Stuart Henderson wrote:
> On 2019/09/16 22:13, Lawrence Teo wrote:
> > This updates Gradle to 5.6.2.
> >
> > https://docs.gradle.org/5.6.2/release-notes.html
> >
> > I have confirmed that security/ghidra builds with this Gradle update.
> >
> > To make future updates easier, this diff also adds myself as maintainer
> > since security/ghidra (which I currently maintain) is the only port that
> > uses Gradle right now.
> >
> > ok?
>
> OK.
>
> > +++ pkg/PLIST 15 Sep 2019 14:58:33 -0000
> > @@ -23,41 +23,41 @@ share/java/gradle/lib/commons-io-2.6.jar
> > share/java/gradle/lib/commons-lang-2.6.jar
> > share/java/gradle/lib/failureaccess-1.0.1.jar
> > share/java/gradle/lib/fastutil-8.2.1-min.jar
> > -share/java/gradle/lib/gradle-api-metadata-5.6.jar
> ..snip..
> > +share/java/gradle/lib/gradle-api-metadata-5.6.2.jar
>
> To make plist diffs a bit less noisy for future updates (which in turn
> makes it easier to notice what has changed), what do you think about
> using a variable to replace the gradle version number? You could do e.g.
>
> GRADLE_JAR= ${DISTNAME:S/gradle//}.jar
> SUBST_VARS+= GRADLE_JAR
>
> so for 5.6.2 GRADLE_JAR would be set to -5.6.2.jar (with the - and .jar
> literals to avoid a bogus match), and these plist entries would then
> look like [...]/lib/gradle-api-metadata${GRADLE_JAR}
> A
That sounds good to me. Here's the diff that makes that change.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/java/gradle/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 18 Sep 2019 02:16:40 -0000 1.4
+++ Makefile 18 Sep 2019 02:34:25 -0000
@@ -3,6 +3,7 @@
COMMENT = build automation tool
DISTNAME = gradle-5.6.2
+REVISION = 0
EXTRACT_SUFX = -bin.zip
CATEGORIES = java
@@ -21,6 +22,9 @@ MODJAVA_VER = 1.8+
NO_BUILD = Yes
NO_TEST = Yes
+
+GRADLE_JAR = ${DISTNAME:S/gradle//}.jar
+SUBST_VARS += GRADLE_JAR
RUN_DEPENDS = java/javaPathHelper
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/java/gradle/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- pkg/PLIST 18 Sep 2019 02:16:40 -0000 1.4
+++ pkg/PLIST 18 Sep 2019 02:34:25 -0000
@@ -23,41 +23,41 @@ share/java/gradle/lib/commons-io-2.6.jar
share/java/gradle/lib/commons-lang-2.6.jar
share/java/gradle/lib/failureaccess-1.0.1.jar
share/java/gradle/lib/fastutil-8.2.1-min.jar
-share/java/gradle/lib/gradle-api-metadata-5.6.2.jar
-share/java/gradle/lib/gradle-base-services-5.6.2.jar
-share/java/gradle/lib/gradle-base-services-groovy-5.6.2.jar
-share/java/gradle/lib/gradle-bootstrap-5.6.2.jar
-share/java/gradle/lib/gradle-build-cache-5.6.2.jar
-share/java/gradle/lib/gradle-build-cache-packaging-5.6.2.jar
-share/java/gradle/lib/gradle-build-option-5.6.2.jar
-share/java/gradle/lib/gradle-cli-5.6.2.jar
-share/java/gradle/lib/gradle-core-5.6.2.jar
-share/java/gradle/lib/gradle-core-api-5.6.2.jar
-share/java/gradle/lib/gradle-docs-5.6.2.jar
-share/java/gradle/lib/gradle-execution-5.6.2.jar
-share/java/gradle/lib/gradle-file-collections-5.6.2.jar
-share/java/gradle/lib/gradle-files-5.6.2.jar
-share/java/gradle/lib/gradle-hashing-5.6.2.jar
-share/java/gradle/lib/gradle-installation-beacon-5.6.2.jar
-share/java/gradle/lib/gradle-instant-execution-5.6.2.jar
-share/java/gradle/lib/gradle-jvm-services-5.6.2.jar
-share/java/gradle/lib/gradle-kotlin-dsl-5.6.2.jar
-share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.2.jar
-share/java/gradle/lib/gradle-launcher-5.6.2.jar
-share/java/gradle/lib/gradle-logging-5.6.2.jar
-share/java/gradle/lib/gradle-messaging-5.6.2.jar
-share/java/gradle/lib/gradle-model-core-5.6.2.jar
-share/java/gradle/lib/gradle-model-groovy-5.6.2.jar
-share/java/gradle/lib/gradle-native-5.6.2.jar
-share/java/gradle/lib/gradle-persistent-cache-5.6.2.jar
-share/java/gradle/lib/gradle-pineapple-5.6.2.jar
-share/java/gradle/lib/gradle-process-services-5.6.2.jar
-share/java/gradle/lib/gradle-resources-5.6.2.jar
-share/java/gradle/lib/gradle-runtime-api-info-5.6.2.jar
-share/java/gradle/lib/gradle-snapshots-5.6.2.jar
-share/java/gradle/lib/gradle-tooling-api-5.6.2.jar
-share/java/gradle/lib/gradle-worker-processes-5.6.2.jar
-share/java/gradle/lib/gradle-wrapper-5.6.2.jar
+share/java/gradle/lib/gradle-api-metadata${GRADLE_JAR}
+share/java/gradle/lib/gradle-base-services${GRADLE_JAR}
+share/java/gradle/lib/gradle-base-services-groovy${GRADLE_JAR}
+share/java/gradle/lib/gradle-bootstrap${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-cache${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-cache-packaging${GRADLE_JAR}
+share/java/gradle/lib/gradle-build-option${GRADLE_JAR}
+share/java/gradle/lib/gradle-cli${GRADLE_JAR}
+share/java/gradle/lib/gradle-core${GRADLE_JAR}
+share/java/gradle/lib/gradle-core-api${GRADLE_JAR}
+share/java/gradle/lib/gradle-docs${GRADLE_JAR}
+share/java/gradle/lib/gradle-execution${GRADLE_JAR}
+share/java/gradle/lib/gradle-file-collections${GRADLE_JAR}
+share/java/gradle/lib/gradle-files${GRADLE_JAR}
+share/java/gradle/lib/gradle-hashing${GRADLE_JAR}
+share/java/gradle/lib/gradle-installation-beacon${GRADLE_JAR}
+share/java/gradle/lib/gradle-instant-execution${GRADLE_JAR}
+share/java/gradle/lib/gradle-jvm-services${GRADLE_JAR}
+share/java/gradle/lib/gradle-kotlin-dsl${GRADLE_JAR}
+share/java/gradle/lib/gradle-kotlin-dsl-tooling-models${GRADLE_JAR}
+share/java/gradle/lib/gradle-launcher${GRADLE_JAR}
+share/java/gradle/lib/gradle-logging${GRADLE_JAR}
+share/java/gradle/lib/gradle-messaging${GRADLE_JAR}
+share/java/gradle/lib/gradle-model-core${GRADLE_JAR}
+share/java/gradle/lib/gradle-model-groovy${GRADLE_JAR}
+share/java/gradle/lib/gradle-native${GRADLE_JAR}
+share/java/gradle/lib/gradle-persistent-cache${GRADLE_JAR}
+share/java/gradle/lib/gradle-pineapple${GRADLE_JAR}
+share/java/gradle/lib/gradle-process-services${GRADLE_JAR}
+share/java/gradle/lib/gradle-resources${GRADLE_JAR}
+share/java/gradle/lib/gradle-runtime-api-info${GRADLE_JAR}
+share/java/gradle/lib/gradle-snapshots${GRADLE_JAR}
+share/java/gradle/lib/gradle-tooling-api${GRADLE_JAR}
+share/java/gradle/lib/gradle-worker-processes${GRADLE_JAR}
+share/java/gradle/lib/gradle-wrapper${GRADLE_JAR}
share/java/gradle/lib/groovy-all-1.3-2.5.4.jar
share/java/gradle/lib/guava-27.1-android.jar
share/java/gradle/lib/jansi-1.17.1.jar
@@ -65,7 +65,7 @@ share/java/gradle/lib/javax.inject-1.jar
share/java/gradle/lib/jcl-over-slf4j-1.7.25.jar
share/java/gradle/lib/jsr305-3.0.2.jar
share/java/gradle/lib/jul-to-slf4j-1.7.25.jar
-share/java/gradle/lib/kotlin-compiler-embeddable-1.3.41-patched-for-gradle-5.6.2.jar
+share/java/gradle/lib/kotlin-compiler-embeddable-1.3.41-patched-for-gradle${GRADLE_JAR}
share/java/gradle/lib/kotlin-reflect-1.3.41.jar
share/java/gradle/lib/kotlin-sam-with-receiver-compiler-plugin-1.3.41.jar
share/java/gradle/lib/kotlin-script-runtime-1.3.41.jar
@@ -120,56 +120,56 @@ share/java/gradle/lib/plugins/google-api
share/java/gradle/lib/plugins/google-http-client-1.25.0.jar
share/java/gradle/lib/plugins/google-http-client-jackson2-1.25.0.jar
share/java/gradle/lib/plugins/google-oauth-client-1.25.0.jar
-share/java/gradle/lib/plugins/gradle-announce-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-antlr-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-build-cache-http-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-build-comparison-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-build-init-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-build-profile-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-code-quality-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-composite-builds-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-dependency-management-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-diagnostics-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-ear-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-ide-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-ide-native-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-ide-play-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-ivy-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-jacoco-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-javascript-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-kotlin-dsl-provider-plugins-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-kotlin-dsl-tooling-builders-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-language-groovy-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-language-java-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-language-jvm-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-language-native-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-language-scala-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-maven-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-osgi-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-platform-base-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-platform-jvm-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-platform-native-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-platform-play-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-plugin-development-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-plugin-use-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-plugins-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-publish-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-reporting-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-resources-gcs-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-resources-http-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-resources-s3-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-resources-sftp-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-scala-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-signing-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-test-kit-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-testing-base-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-testing-junit-platform-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-testing-jvm-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-testing-native-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-tooling-api-builders-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-tooling-native-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-version-control-5.6.2.jar
-share/java/gradle/lib/plugins/gradle-workers-5.6.2.jar
+share/java/gradle/lib/plugins/gradle-announce${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-antlr${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-build-cache-http${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-build-comparison${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-build-init${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-build-profile${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-code-quality${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-composite-builds${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-dependency-management${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-diagnostics${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-ear${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-ide${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-ide-native${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-ide-play${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-ivy${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-jacoco${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-javascript${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-kotlin-dsl-provider-plugins${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-kotlin-dsl-tooling-builders${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-language-groovy${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-language-java${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-language-jvm${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-language-native${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-language-scala${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-maven${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-osgi${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-platform-base${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-platform-jvm${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-platform-native${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-platform-play${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-plugin-development${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-plugin-use${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-plugins${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-publish${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-reporting${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-resources-gcs${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-resources-http${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-resources-s3${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-resources-sftp${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-scala${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-signing${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-test-kit${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-testing-base${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-testing-junit-platform${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-testing-jvm${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-testing-native${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-tooling-api-builders${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-tooling-native${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-version-control${GRADLE_JAR}
+share/java/gradle/lib/plugins/gradle-workers${GRADLE_JAR}
share/java/gradle/lib/plugins/gson-2.8.5.jar
share/java/gradle/lib/plugins/hamcrest-core-1.3.jar
share/java/gradle/lib/plugins/httpclient-4.5.6.jar
