CVS commit: pkgsrc/mk/plist

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Jan  7 08:23:23 UTC 2025

Modified Files:
        pkgsrc/mk/plist: print-plist.mk

Log Message:
print-PLIST: Handle spaces in pathnames.

And, for that matter, anything except newlines (U+000a, LINE FEED).

PR pkg/58961: 'make print-PLIST' emits 'No such file or directory'
when directories contain spaces


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mk/plist/print-plist.mk

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

Modified files:

Index: pkgsrc/mk/plist/print-plist.mk
diff -u pkgsrc/mk/plist/print-plist.mk:1.38 pkgsrc/mk/plist/print-plist.mk:1.39
--- pkgsrc/mk/plist/print-plist.mk:1.38 Tue Jun  4 13:10:45 2024
+++ pkgsrc/mk/plist/print-plist.mk      Tue Jan  7 08:23:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.38 2024/06/04 13:10:45 cheusov Exp $
+# $NetBSD: print-plist.mk,v 1.39 2025/01/07 08:23:23 riastradh Exp $
 #
 # Automatic PLIST generation
 #  - files & symlinks first
@@ -138,6 +138,7 @@ print-PLIST:
                /^man\// { sub("\\.gz$$", ""); }                        \
                { print $$0; }'
        ${RUN}\
+       saveIFS=$$IFS; IFS=$$(printf '\n.'); IFS=$${IFS%.};             \
        for i in `${_PRINT_PLIST_DIRS_CMD}                              \
                        | ${AWK} '                                      \
                                ${EARLY_PRINT_PLIST_AWK}                \
@@ -154,8 +155,9 @@ print-PLIST:
                                /^${PKGINFODIR:S|/|\\/|g}$$/ { next; }  \
                                { print $$0; }'` ;                      \
        do                                                              \
-               if [ `${LS} -la ${DESTDIR}${PREFIX}/$$i | ${WC} -l` = 3 ]; then \
-                       ${ECHO} @pkgdir $$i | ${AWK} '                  \
+               IFS=$$saveIFS;                                          \
+               if [ `${LS} -la ${DESTDIR}${PREFIX}/"$$i" | ${WC} -l` = 3 ]; then       \
+                       ${ECHO} @pkgdir "$$i" | ${AWK} '                \
                        ${PRINT_PLIST_AWK}                              \
                        { print $$0; }' ;                               \
                fi ;                                                    \