Re: UPDATE: java/gradle 5.6.2

2019-09-17 Thread Lawrence Teo 
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 -
> > @@ -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
--- Makefile18 Sep 2019 02:16:40 -  1.4
+++ Makefile18 Sep 2019 02:34:25 -
@@ -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 -  1.4
+++ pkg/PLIST   18 Sep 2019 02:34:25 -
@@ -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}

Re: UPDATE: java/gradle 5.6.2

2019-09-17 Thread Remi Pointel 

On 9/17/19 4:13 AM, 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?


Hello,

ok rpointel@.

Cheers,

Remi.

Re: UPDATE: java/gradle 5.6.2

2019-09-17 Thread Stuart Henderson 
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 -
> @@ -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

UPDATE: java/gradle 5.6.2

2019-09-16 Thread Lawrence Teo 
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?


Index: Makefile
===
RCS file: /cvs/ports/java/gradle/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile19 Aug 2019 02:29:34 -  1.3
+++ Makefile15 Sep 2019 14:51:19 -
@@ -2,12 +2,14 @@
 
 COMMENT =  build automation tool
 
-DISTNAME = gradle-5.6
+DISTNAME = gradle-5.6.2
 EXTRACT_SUFX = -bin.zip
 
 CATEGORIES =   java
 
 HOMEPAGE = https://gradle.org/
+
+MAINTAINER =   Lawrence Teo 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
Index: distinfo
===
RCS file: /cvs/ports/java/gradle/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo19 Aug 2019 02:29:34 -  1.3
+++ distinfo15 Sep 2019 14:54:54 -
@@ -1,2 +1,2 @@
-SHA256 (gradle-5.6-bin.zip) = FcAu9d02MewCrFLoclcD4Chdmn7sv05ZOaqekkYE0B0=
-SIZE (gradle-5.6-bin.zip) = 93883485
+SHA256 (gradle-5.6.2-bin.zip) = MvzmYohI95mwrTIFro22fQ2CjBD/5it0inwNn0pdnuA=
+SIZE (gradle-5.6.2-bin.zip) = 93890597
Index: pkg/PLIST
===
RCS file: /cvs/ports/java/gradle/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   19 Aug 2019 02:29:34 -  1.3
+++ pkg/PLIST   15 Sep 2019 14:58:33 -
@@ -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
-share/java/gradle/lib/gradle-base-services-5.6.jar
-share/java/gradle/lib/gradle-base-services-groovy-5.6.jar
-share/java/gradle/lib/gradle-bootstrap-5.6.jar
-share/java/gradle/lib/gradle-build-cache-5.6.jar
-share/java/gradle/lib/gradle-build-cache-packaging-5.6.jar
-share/java/gradle/lib/gradle-build-option-5.6.jar
-share/java/gradle/lib/gradle-cli-5.6.jar
-share/java/gradle/lib/gradle-core-5.6.jar
-share/java/gradle/lib/gradle-core-api-5.6.jar
-share/java/gradle/lib/gradle-docs-5.6.jar
-share/java/gradle/lib/gradle-execution-5.6.jar
-share/java/gradle/lib/gradle-file-collections-5.6.jar
-share/java/gradle/lib/gradle-files-5.6.jar
-share/java/gradle/lib/gradle-hashing-5.6.jar
-share/java/gradle/lib/gradle-installation-beacon-5.6.jar
-share/java/gradle/lib/gradle-instant-execution-5.6.jar
-share/java/gradle/lib/gradle-jvm-services-5.6.jar
-share/java/gradle/lib/gradle-kotlin-dsl-5.6.jar
-share/java/gradle/lib/gradle-kotlin-dsl-tooling-models-5.6.jar
-share/java/gradle/lib/gradle-launcher-5.6.jar
-share/java/gradle/lib/gradle-logging-5.6.jar
-share/java/gradle/lib/gradle-messaging-5.6.jar
-share/java/gradle/lib/gradle-model-core-5.6.jar
-share/java/gradle/lib/gradle-model-groovy-5.6.jar
-share/java/gradle/lib/gradle-native-5.6.jar
-share/java/gradle/lib/gradle-persistent-cache-5.6.jar
-share/java/gradle/lib/gradle-pineapple-5.6.jar
-share/java/gradle/lib/gradle-process-services-5.6.jar
-share/java/gradle/lib/gradle-resources-5.6.jar
-share/java/gradle/lib/gradle-runtime-api-info-5.6.jar
-share/java/gradle/lib/gradle-snapshots-5.6.jar
-share/java/gradle/lib/gradle-tooling-api-5.6.jar
-share/java/gradle/lib/gradle-worker-processes-5.6.jar
-share/java/gradle/lib/gradle-wrapper-5.6.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