CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Feb  9 22:39:21 UTC 2020

Modified Files:
        pkgsrc/mk: bsd.pkg.mk
        pkgsrc/regress/path: spec

Log Message:
mk/bsd.pkg.mk: support spaces in PATH directories

Fixes PR pkg/53959.


To generate a diff of this commit:
cvs rdiff -u -r1.2034 -r1.2035 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/regress/path/spec

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

Modified files:

Index: pkgsrc/mk/bsd.pkg.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2034 pkgsrc/mk/bsd.pkg.mk:1.2035
--- pkgsrc/mk/bsd.pkg.mk:1.2034 Tue Jan 21 10:56:54 2020
+++ pkgsrc/mk/bsd.pkg.mk        Sun Feb  9 22:39:20 2020
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2034 2020/01/21 10:56:54 kamil Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2035 2020/02/09 22:39:20 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -442,8 +442,10 @@ _PATH_ORIG:=               ${PATH}
 MAKEFLAGS+=            _PATH_ORIG=${_PATH_ORIG:Q}
 .endif
 
-_PATH_COMPONENTS=      ${PREPEND_PATH:[-1..1]} ${_PATH_ORIG:C,:, ,}
-PATH=  ${_PATH_COMPONENTS:ts:}
+_PATH_COMPONENTS= \
+       ${PREPEND_PATH:[-1..1]} \
+       ${_PATH_ORIG:S, ,__space_in_path__,gW:S,:, ,g}
+PATH=  ${_PATH_COMPONENTS:ts::S,__space_in_path__, ,g}
 
 ################################################################
 # Many ways to disable a package.

Index: pkgsrc/regress/path/spec
diff -u pkgsrc/regress/path/spec:1.1 pkgsrc/regress/path/spec:1.2
--- pkgsrc/regress/path/spec:1.1        Sun Feb  9 22:28:58 2020
+++ pkgsrc/regress/path/spec    Sun Feb  9 22:39:21 2020
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: spec,v 1.1 2020/02/09 22:28:58 rillig Exp $
+# $NetBSD: spec,v 1.2 2020/02/09 22:39:21 rillig Exp $
 #
 # Ensures that the PATH variable can contain spaces, and that commands in
 # such directories can be found and executed.
@@ -19,8 +19,6 @@ do_test() {
 check_result() {
        exit_status 0
 
-       # FIXME: the spaces must be preserved.
-       output_require ":/Path:with:spaces:"
-       # FIXME: the spaces must be preserved.
-       output_require "/Path:with:spaces$"
+       output_require ":/Path with spaces:"
+       output_require "/Path with spaces$"
 }