CVS commit: pkgsrc/devel/gng

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Aug 19 21:46:53 UTC 2024

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

Log Message:
gng: update to 1.0.5. Changes:

- Do not require gradlew execution permission
- Add MacPorts instructions
- Use github link for gdub, because gdub.rocks is unavailable
- Prefer python3 command


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gng/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gng/distinfo
cvs rdiff -u -r1.3 -r1.4 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.5 pkgsrc/devel/gng/Makefile:1.6
--- pkgsrc/devel/gng/Makefile:1.5       Mon Aug 14 05:24:09 2023
+++ pkgsrc/devel/gng/Makefile   Mon Aug 19 21:46:53 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2023/08/14 05:24:09 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2024/08/19 21:46:53 schmonz Exp $
 
-DISTNAME=              gng-1.0.4
-PKGREVISION=           1
+DISTNAME=              gng-1.0.5
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=gdubw/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}

Index: pkgsrc/devel/gng/distinfo
diff -u pkgsrc/devel/gng/distinfo:1.3 pkgsrc/devel/gng/distinfo:1.4
--- pkgsrc/devel/gng/distinfo:1.3       Wed Feb  8 15:51:46 2023
+++ pkgsrc/devel/gng/distinfo   Mon Aug 19 21:46:53 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2023/02/08 15:51:46 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2024/08/19 21:46:53 schmonz Exp $
 
-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
+BLAKE2s (gng-1.0.5.tar.gz) = b12226b7b4f407bf25955f0d20dbe473bcec951ca9b80360570f3b706630693f
+SHA512 (gng-1.0.5.tar.gz) = fe099a91c15f6a7d68e2ab2ac7814d2fa8bdc4f4416a30bff77efc176bfe27f50dbb962d181f8a537fad0d9cbe5507eb5a20246ce239ee0b94a8336e0d07fa1a
+Size (gng-1.0.5.tar.gz) = 71125 bytes
+SHA1 (patch-bin_gng) = 33c64314f495343abe838c1331abf0868a2645ee

Index: pkgsrc/devel/gng/patches/patch-bin_gng
diff -u pkgsrc/devel/gng/patches/patch-bin_gng:1.3 pkgsrc/devel/gng/patches/patch-bin_gng:1.4
--- pkgsrc/devel/gng/patches/patch-bin_gng:1.3  Wed Feb  8 15:51:46 2023
+++ pkgsrc/devel/gng/patches/patch-bin_gng      Mon Aug 19 21:46:53 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_gng,v 1.3 2023/02/08 15:51:46 schmonz Exp $
+$NetBSD: patch-bin_gng,v 1.4 2024/08/19 21:46:53 schmonz Exp $
 
 Use pkgsrc paths.
 
---- bin/gng.orig       2021-10-13 09:10:21.000000000 +0000
+--- bin/gng.orig       2024-08-16 08:40:27.000000000 +0000
 +++ bin/gng
 @@ -1,24 +1,15 @@
  #!/usr/bin/env bash
@@ -43,18 +43,23 @@ Use pkgsrc paths.
      cp -f "${srcDir}/gradle/gng.cfg" "${dir}/gradle/"
      cp -f "${srcDir}/gradle/gradlew" "${dir}/"
      cp -f "${srcDir}/gradle/gradlew.bat" "${dir}/"
-@@ -141,17 +132,7 @@ bootstrap_help() {
+@@ -141,22 +132,7 @@ bootstrap_help() {
  }
  
  function parse_gradle_version() {
--    if command -v python &> /dev/null
+-    if command -v python3 &> /dev/null
 -    then
--        python -c "import json,sys; obj=json.load(sys.stdin); print obj['version'];"
+-        python3 -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);"
 -        return
 -    fi
--    if command -v python3 &> /dev/null
+-    if command -v python &> /dev/null
 -    then
--        python3 -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);"
+-        python_major_version=$(python -c 'import sys; print(sys.version_info[0])')
+-        if [ "$python_major_version" = "2" ]; then
+-          python -c "import json,sys; obj=json.load(sys.stdin); print obj[unicode('version', 'utf-8')];"
+-        else
+-          python -c "import json,sys; obj=json.load(sys.stdin); print (obj['version']);"
+-        fi
 -        return
 -    fi
 -    die "Cannot find python/python3 interpreter !"