[BUG FIX] Adapt to the specification change of make(1) that disallows colon character...

 Changes to be committed:
	modified:   HISTORY
	modified:   lib/libconf.sh
	modified:   lib/libpkgsys.sh

diff --git a/HISTORY b/HISTORY
index d0ffa1b..f465174 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -2,6 +2,7 @@
 [BUG FIX] Packages for which the flavor mechanism is newly introduced sometimes had their old packages remain as conflict.
 [BUG FIX] As of OS version 13, the specification change of grep(1) caused "empty (sub)expression" errors resulting in wrong processing at many points.
 [BUG FIX] The signal trapping mechanism showed a wrong behavior when the termination happened before option parsing.
+[BUG FIX] Adapt to the specification change of make(1) that disallows colon characters in the current directory path.
 4.1.1 (20 April 2022)
 [IMPROVED] Adapt to the specification change of pkg-create(8) that the default extension of the package files become "pkg".
 [IMPROVED] Adapt to the behavior change grep(1) as of 12.0-RELEASE that the case distinction is ineffective in some locale, which as a result prevented the execution by users in such locales.

diff --git a/lib/libconf.sh b/lib/libconf.sh
index 06369c1..644aa9e 100644 (file)
--- a/lib/libconf.sh
+++ b/lib/libconf.sh
@@ -10,7 +10,7 @@
 conf_setup_ports_envs ()
 {
        local tmp_work
-       tmp_work=${TMPDIR}/conf_setup_ports_envs:work
+       tmp_work=${TMPDIR}/conf_setup_ports_envs__work
        rm -rf "$tmp_work"
        mkdir "$tmp_work"
        PORTSDIR=${PORTSDIR:-`[ -e /etc/make.conf ] && make -C "$tmp_work" -f /etc/make.conf -V PORTSDIR 2> /dev/null`} || :

diff --git a/lib/libpkgsys.sh b/lib/libpkgsys.sh
index 8474c8a..1445ffb 100644 (file)
--- a/lib/libpkgsys.sh
+++ b/lib/libpkgsys.sh
@@ -58,7 +58,7 @@ pkgsys_sysvar ()
 {
        local var tmp_work
        var=$1
-       tmp_work=${TMPDIR}/pkgsys_sysvar:work
+       tmp_work=${TMPDIR}/pkgsys_sysvar__work
        rm -rf "$tmp_work"
        mkdir "$tmp_work"
        fs_fix_unionfs_image_if_hidden "${PORTSDIR}/Mk/bsd.port.mk"