Fri Jan 13 22:18:11 2023 UTC ()
Update to 0.11.1. From the changelog:

# Bug Fixes

* `reshim` did not rewrite executable path (#1311)
* Add test for nushell integration and fix some bugs (#1415)
* Allow `path:` versions to use `~` (#1403)
* Ban use of 'test' (#1383)
* correct order of checks in conditional for adding a missing newline
  (#1418, closes #1417)
* Do not use `pwd`
* Do not use type not exported on older Python versions (#1409)
* force lwrcase plugin name fix capitalization mismatch errs (#1400)
* lint errors from `scripts/checkstyle.py` (#1385)
* mv dev dep from repo root to subdir to avoid clash (#1408)
* Remove unecessary backslashes (#1384)
* Remove usage of `$(pwd)` in favor of `$PWD`


(schmonz)
diff -r1.2 -r1.3 pkgsrc/devel/asdf/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/asdf/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/asdf/patches/patch-lib_commands_reshim.bash
cvs diff -r1.2 -r1.3 pkgsrc/devel/asdf/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/asdf/Makefile 2022/12/27 20:04:30 1.2
+++ pkgsrc/devel/asdf/Makefile 2023/01/13 22:18:11 1.3
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.2 2022/12/27 20:04:30 abs Exp $ 1# $NetBSD: Makefile,v 1.3 2023/01/13 22:18:11 schmonz Exp $
2 2
3DISTNAME= asdf-0.11.0 3DISTNAME= asdf-0.11.1
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=asdf-vm/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=asdf-vm/}
6GITHUB_TAG= v${PKGVERSION_NOREV} 6GITHUB_TAG= v${PKGVERSION_NOREV}
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= https://asdf-vm.com/ 9HOMEPAGE= https://asdf-vm.com/
10COMMENT= Manage each of your project runtimes with a single tool 10COMMENT= Manage each of your project runtimes with a single tool
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS+= git-base-[0-9]*:../../devel/git-base 13DEPENDS+= git-base-[0-9]*:../../devel/git-base
14 14
15USE_LANGUAGES= # none 15USE_LANGUAGES= # none
16USE_TOOLS+= bash:run 16USE_TOOLS+= bash:run
17NO_BUILD= yes 17NO_BUILD= yes
18REPLACE_BASH= bin/asdf 18REPLACE_BASH= bin/asdf
19 19
20AUTO_MKDIRS= yes 20AUTO_MKDIRS= yes
21 21
22SUBST_CLASSES+= prefix 22SUBST_CLASSES+= prefix
23SUBST_STAGE.prefix= do-configure 23SUBST_STAGE.prefix= do-configure
24SUBST_FILES.prefix= lib/utils.bash lib/commands/reshim.bash 24SUBST_FILES.prefix= lib/utils.bash lib/commands/reshim.bash
25SUBST_VARS.prefix= PREFIX 25SUBST_VARS.prefix= PREFIX BASH
26 26
27SUBST_CLASSES+= lib 27SUBST_CLASSES+= lib
28SUBST_STAGE.lib= do-configure 28SUBST_STAGE.lib= do-configure
29SUBST_FILES.lib= bin/asdf lib/commands/* 29SUBST_FILES.lib= bin/asdf lib/commands/*
30SUBST_SED.lib= -e 's|\$$(dirname "\$$(dirname "\$$0")")/lib|${PREFIX}/share/${PKGBASE}/lib|g' 30SUBST_SED.lib= -e 's|\$$(dirname "\$$(dirname "\$$0")")/lib|${PREFIX}/share/${PKGBASE}/lib|g'
31 31
32do-install: 32do-install:
33 ${INSTALL_SCRIPT} ${WRKSRC}/bin/asdf \ 33 ${INSTALL_SCRIPT} ${WRKSRC}/bin/asdf \
34 ${DESTDIR}${PREFIX}/bin/ 34 ${DESTDIR}${PREFIX}/bin/
35 ${INSTALL_DATA} ${WRKSRC}/help.txt \ 35 ${INSTALL_DATA} ${WRKSRC}/help.txt \
36 ${DESTDIR}${PREFIX}/share/${PKGBASE}/ 36 ${DESTDIR}${PREFIX}/share/${PKGBASE}/
37 ${INSTALL_DATA} ${WRKSRC}/version.txt \ 37 ${INSTALL_DATA} ${WRKSRC}/version.txt \
38 ${DESTDIR}${PREFIX}/share/${PKGBASE}/ 38 ${DESTDIR}${PREFIX}/share/${PKGBASE}/
cvs diff -r1.1 -r1.2 pkgsrc/devel/asdf/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/asdf/distinfo 2022/12/27 16:11:00 1.1
+++ pkgsrc/devel/asdf/distinfo 2023/01/13 22:18:11 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2022/12/27 16:11:00 schmonz Exp $ 1$NetBSD: distinfo,v 1.2 2023/01/13 22:18:11 schmonz Exp $
2 2
3BLAKE2s (asdf-0.11.0.tar.gz) = a811635ed0a8dbee262d932c38268aec9a546762a3d66535128fc275cfbd94a2 3BLAKE2s (asdf-0.11.1.tar.gz) = 5d676494b0b099d166b1d5ef1111a548697b8b207f38bebe5f81a4d979c07a31
4SHA512 (asdf-0.11.0.tar.gz) = 1709d96038266557272f5b42403208d5fc2c5da99a3bf273abaee0668c8b3c2a32a253110c59f4af9f71eb8a6261ed0cd4f0749880a94d876f3a9ac5f71e1bc1 4SHA512 (asdf-0.11.1.tar.gz) = d62c9552b85fa697dd6e958ddcb118e2f45361c28add6b079c3b63649fd2062605f76dd1f2b4831750209ab6663cb20e61311d5655fb50b6f1695b55e6636251
5Size (asdf-0.11.0.tar.gz) = 182784 bytes 5Size (asdf-0.11.1.tar.gz) = 187832 bytes
6SHA1 (patch-lib_commands_reshim.bash) = 0a9927c33fb5a58f08e5dbaf15d4c41b0f3d5ec4 6SHA1 (patch-lib_commands_reshim.bash) = 016cde2d9c68c47d46b01b9482091cc5b6ec11d4
7SHA1 (patch-lib_utils.bash) = f6e3c3839d21ce21520cf0e9e8b98ab5cb678225 7SHA1 (patch-lib_utils.bash) = f6e3c3839d21ce21520cf0e9e8b98ab5cb678225
cvs diff -r1.1 -r1.2 pkgsrc/devel/asdf/patches/patch-lib_commands_reshim.bash (expand / switch to unified diff)

--- pkgsrc/devel/asdf/patches/patch-lib_commands_reshim.bash 2022/12/27 16:11:01 1.1
+++ pkgsrc/devel/asdf/patches/patch-lib_commands_reshim.bash 2023/01/13 22:18:11 1.2
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: patch-lib_commands_reshim.bash,v 1.1 2022/12/27 16:11:01 schmonz Exp $ 1$NetBSD: patch-lib_commands_reshim.bash,v 1.2 2023/01/13 22:18:11 schmonz Exp $
2 2
3Use pkgsrc paths. 3Use pkgsrc paths.
4 4
5--- lib/commands/reshim.bash.orig 2022-12-14 20:53:20.000000000 +0000 5--- lib/commands/reshim.bash.orig 2023-01-13 14:45:18.000000000 +0000
6+++ lib/commands/reshim.bash 6+++ lib/commands/reshim.bash
7@@ -97,7 +97,7 @@ write_shim_script() { 7@@ -102,9 +102,9 @@ EOF
8 cat <<EOF >"$shim_path" 8 fi
9 #!/usr/bin/env bash 9
10 # asdf-plugin: ${plugin_name} ${version} 10 cat <<EOF >"$shim_path"
 11-#!/usr/bin/env bash
 12+#!@BASH@
 13 $(sort -u <"$temp_versions_path")
11-exec $(asdf_dir)/bin/asdf exec "${executable_name}" "\$@" # asdf_allow: ' asdf ' 14-exec $(asdf_dir)/bin/asdf exec "${executable_name}" "\$@" # asdf_allow: ' asdf '
12+exec @PREFIX@/bin/asdf exec "${executable_name}" "\$@" # asdf_allow: ' asdf ' 15+exec @PREFIX@/bin/asdf exec "${executable_name}" "\$@" # asdf_allow: ' asdf '
13 EOF 16 EOF
14 fi 
15  17
 18 rm "$temp_versions_path"