git: 07668760c4d1 - main - Mk: fix fetching patches

The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=07668760c4d1dab66789a2bf3f557d0938570f08

commit 07668760c4d1dab66789a2bf3f557d0938570f08
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2026-09-16 13:43:55 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2026-09-16 13:53:22 +0000

    Mk: fix fetching patches
---
 Mk/Scripts/do-fetch.sh | 14 +++++++-------
 Mk/bsd.port.mk         |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Mk/Scripts/do-fetch.sh b/Mk/Scripts/do-fetch.sh
index 810587a355bb..e2bec577dfe2 100644
--- a/Mk/Scripts/do-fetch.sh
+++ b/Mk/Scripts/do-fetch.sh
@@ -8,11 +8,11 @@ set -o pipefail
 . "${dp_SCRIPTSDIR}/functions.sh"
 
 validate_env dp_DEVELOPER dp_DISABLE_SIZE dp_DISTDIR dp_DISTINFO_FILE \
-	dp_DIST_SUBDIR dp_DISTFILES_FILE dp_ECHO_MSG dp_FETCH_AFTER_ARGS \
-	dp_FETCH_BEFORE_ARGS dp_FETCH_CMD dp_FETCH_ENV dp_FORCE_FETCH_ALL \
-	dp_FORCE_FETCH_LIST dp_MASTER_SITE_BACKUP dp_MASTER_SITES_FILE \
-	dp_MASTER_SITE_OVERRIDE dp_MASTER_SORT_AWK dp_NO_CHECKSUM \
-	dp_RANDOMIZE_SITES dp_SITE_FLAVOR dp_TARGET
+	dp_DIST_SUBDIR dp_ECHO_MSG dp_FETCH_AFTER_ARGS dp_FETCH_BEFORE_ARGS \
+	dp_FETCH_CMD dp_FETCH_ENV dp_FILES_FILE dp_FORCE_FETCH_ALL \
+	dp_FORCE_FETCH_LIST dp_MASTER_SITE_BACKUP dp_MASTER_SITE_OVERRIDE \
+	dp_MASTER_SORT_AWK dp_NO_CHECKSUM dp_RANDOMIZE_SITES dp_SITE_FLAVOR \
+	dp_SITES_FILE dp_TARGET
 
 [ -n "${DEBUG_MK_SCRIPTS}" -o -n "${DEBUG_MK_SCRIPTS_DO_FETCH}" ] && set -x
 
@@ -31,7 +31,7 @@ case ${dp_TARGET} in
 		;;
 esac
 
-. $dp_MASTER_SITES_FILE
+. $dp_SITES_FILE
 
 # Read the list of files to fetch from stdin, one per line, instead of
 # from the command line to workatound ARG_MAX limits.
@@ -189,5 +189,5 @@ while IFS= read -r _file; do
 			echo "echo \"${file}\" not fetched; }"
 			;;
 	esac
-done < $dp_DISTFILES_FILE
+done < $dp_FILES_FILE
 
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b0edcb14b53b..0c8dc40cae4f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3133,8 +3133,8 @@ ${_target}:
 .          endfor
 	@${SETENV} \
 			${_DO_FETCH_ENV} \
-			dp_MASTER_SITES_FILE=${_MASTER_SITES_FILE} \
-			dp_DISTFILES_FILE=${_DISTFILES_FILE} \
+			dp_SITES_FILE=${_MASTER_SITES_FILE} \
+			dp_FILES_FILE=${_DISTFILES_FILE} \
 			dp_SITE_FLAVOR=MASTER \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh
 .        endif
@@ -3148,8 +3148,8 @@ ${_target}:
 .          endfor
 	@${SETENV} \
 			${_DO_FETCH_ENV} \
-			dp_PATCH_SITES_FILE=${_PATCH_SITES_FILE} \
-			dp_PATCHFILES_FILE=${_PATCHFILES_FILE} \
+			dp_SITES_FILE=${_PATCH_SITES_FILE} \
+			dp_FILES_FILE=${_PATCHFILES_FILE} \
 			dp_SITE_FLAVOR=PATCH \
 			${SH} ${SCRIPTSDIR}/do-fetch.sh
 .        endif