svn commit: r523912 - head/Mk/Scripts
Mathieu Arnold
mat at FreeBSD.org
Thu Jan 23 08:55:25 UTC 2020
Author: mat
Date: Thu Jan 23 08:55:25 2020
New Revision: 523912
URL: https://svnweb.freebsd.org/changeset/ports/523912
Log:
Unbreak make makepatch.
The glob in `find ./*` is handled by the shell and actually sorts the
files, so one needs to to ask find to sort the result, using `find -s`.
`find ./* -maxdepth 0` is not equivalent to `find . -maxdepth 0`, the
depth increases by one as `./x` is on level deeper than `.`.
Pointy hat: bdrewery
Modified:
head/Mk/Scripts/smart_makepatch.sh (contents, props changed)
Modified: head/Mk/Scripts/smart_makepatch.sh
==============================================================================
--- head/Mk/Scripts/smart_makepatch.sh Thu Jan 23 08:55:21 2020 (r523911)
+++ head/Mk/Scripts/smart_makepatch.sh Thu Jan 23 08:55:25 2020 (r523912)
@@ -69,7 +69,7 @@ std_patch_filename() {
patchdir_files_list() {
if [ -d "${PATCHDIR}" ]; then
(cd ${PATCHDIR} && \
- find . -type f -name "patch-*" -maxdepth 0 \
+ find -s . -type f -name "patch-*" -maxdepth 1 \
2>/dev/null | sed -e 's,^\./,,; /\.orig$/d'
)
fi;
@@ -216,7 +216,7 @@ stage_patches() {
local P
local name
local patch_list
- patch_list=$(cd ${REGENNED} && find . -name "patch-*" 2>/dev/null)
+ patch_list=$(cd ${REGENNED} && find -s . -name "patch-*" 2>/dev/null)
for P in ${patch_list}; do
P=${P#./}
name=$(get_patch_name ${P})
More information about the svn-ports-all
mailing list