CVS commit: pkgsrc/devel/gng

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Feb  8 15:51:47 UTC 2023

Modified Files:
        pkgsrc/devel/gng: Makefile distinfo
        pkgsrc/devel/gng/patches: patch-bin_gng

Log Message:
Update to 1.0.4. From the changelog:

- Add support for python3 by @yantonov in #21
- Don't export SHELLOPTS by @guyboltonking in #22


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gng/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gng/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/gng/patches/patch-bin_gng

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gng/Makefile
diff -u pkgsrc/devel/gng/Makefile:1.3 pkgsrc/devel/gng/Makefile:1.4
--- pkgsrc/devel/gng/Makefile:1.3       Tue Dec 27 18:28:34 2022
+++ pkgsrc/devel/gng/Makefile   Wed Feb  8 15:51:46 2023
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2022/12/27 18:28:34 abs Exp $
+# $NetBSD: Makefile,v 1.4 2023/02/08 15:51:46 schmonz Exp $
 
-DISTNAME=              gng-1.0.3
-PKGREVISION=           1
+DISTNAME=              gng-1.0.4
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=gdubw/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
-HOMEPAGE=              https://gng.dsun.org
+HOMEPAGE=              https://gng.dsun.org/
 COMMENT=               Run (or create) each project's own Gradle wrapper
 LICENSE=               apache-2.0
 
@@ -20,7 +19,7 @@ REPLACE_SH=           gradle/gradlew
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     do-configure
 SUBST_FILES.paths=     bin/gng
-SUBST_VARS.paths=      PREFIX
+SUBST_VARS.paths=      PREFIX PYTHONBIN
 
 INSTALLATION_DIRS=     bin share/${PKGBASE}/gradle/wrapper
 

Index: pkgsrc/devel/gng/distinfo
diff -u pkgsrc/devel/gng/distinfo:1.2 pkgsrc/devel/gng/distinfo:1.3
--- pkgsrc/devel/gng/distinfo:1.2       Tue Dec 27 18:28:34 2022
+++ pkgsrc/devel/gng/distinfo   Wed Feb  8 15:51:46 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2022/12/27 18:28:34 abs Exp $
+$NetBSD: distinfo,v 1.3 2023/02/08 15:51:46 schmonz Exp $
 
-BLAKE2s (gng-1.0.3.tar.gz) = fc1c172998c0da64f8817c88dba8f696c05da8a464abb5add6d47eae0e9c617b
-SHA512 (gng-1.0.3.tar.gz) = a40be62d8deae070a5c5d342c4d510a78712657414d4dec4016becd7fb23436e6b344faf3917f7c1aa478c06a87ebbdd6541afea2fe8c035f8044f6d15af4855
-Size (gng-1.0.3.tar.gz) = 71089 bytes
-SHA1 (patch-bin_gng) = 00bebe6b02c8721a8a9114d291017b3c605acf20
+BLAKE2s (gng-1.0.4.tar.gz) = 097e402dd4404f3de9a1b9357c91717ccf21fbd87a2c5f2c5c6777c0ff817b37
+SHA512 (gng-1.0.4.tar.gz) = 7e8d9d3672f4cad3c814a9a7c182ead4b6bc0041d4314b15515b2be1d5733aa4c27eb798664662199e42f0f45c51d9e3c2ba9af2ccd882b1984dffa1bbd6e631
+Size (gng-1.0.4.tar.gz) = 71324 bytes
+SHA1 (patch-bin_gng) = b1bd9d2541c1680c11e89ea3930e85acbe6c365f

Index: pkgsrc/devel/gng/patches/patch-bin_gng
diff -u pkgsrc/devel/gng/patches/patch-bin_gng:1.2 pkgsrc/devel/gng/patches/patch-bin_gng:1.3
--- pkgsrc/devel/gng/patches/patch-bin_gng:1.2  Tue Dec 27 18:28:34 2022
+++ pkgsrc/devel/gng/patches/patch-bin_gng      Wed Feb  8 15:51:46 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_gng,v 1.2 2022/12/27 18:28:34 abs Exp $
+$NetBSD: patch-bin_gng,v 1.3 2023/02/08 15:51:46 schmonz Exp $
 
-Use pkgsrc paths, and update for python 3.x
+Use pkgsrc paths.
 
---- bin/gng.orig       2021-03-29 06:32:44.000000000 +0000
+--- bin/gng.orig       2021-10-13 09:10:21.000000000 +0000
 +++ bin/gng
 @@ -1,24 +1,15 @@
  #!/usr/bin/env bash
@@ -43,12 +43,22 @@ Use pkgsrc paths, and update for python 
      cp -f "${srcDir}/gradle/gng.cfg" "${dir}/gradle/"
      cp -f "${srcDir}/gradle/gradlew" "${dir}/"
      cp -f "${srcDir}/gradle/gradlew.bat" "${dir}/"
-@@ -182,7 +173,7 @@ function bootstrap() {
-   if [[ "${_arg_version}" == "latest" ]]; then
-     info "Fetching the latest Gradle version from services.gradle.org"
-     _arg_version=$(curl -m 60 -sSL "https://services.gradle.org/versions/current"; |
--      python -c "import json,sys;obj=json.load(sys.stdin);print obj['version'];") || die "Failed to fetch the version info!"
-+      python -c "import json,sys;obj=json.load(sys.stdin);print(obj['version']);") || die "Failed to fetch the version info!"
-     info "The latest Gradle version is ${_arg_version}"
-   fi
-   __install_gw "${_arg_version}" "${_arg_distribution_type}" "${_arg_mirror:-}" "${_arg_destination_dir}"
+@@ -141,17 +132,7 @@ bootstrap_help() {
+ }
+ 
+ function parse_gradle_version() {
+-    if command -v python &> /dev/null
+-    then
+-        python -c "import json,sys; obj=json.load(sys.stdin); print obj['version'];"
+-        return
+-    fi
+-    if command -v python3 &> /dev/null
+-    then
+-        python3 -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);"
+-        return
+-    fi
+-    die "Cannot find python/python3 interpreter !"
++    @PYTHONBIN@ -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);"
+ }
+ 
+ function bootstrap() {