Index: build.sh
===================================================================
RCS file: /cvsroot/src/build.sh,v
retrieving revision 1.394
diff -p -p -u -r1.394 build.sh
--- build.sh	10 May 2025 15:42:39 -0000	1.394
+++ build.sh	13 May 2025 00:22:31 -0000
@@ -2735,22 +2735,23 @@ setup_mkrepro()
 		return
 	fi
 
-	local dirs="${NETBSDSRCDIR-/usr/src}/"
-	if [ "${MKX11-no}" = yes ]
-	then
-		dirs="$dirs ${X11SRCDIR-/usr/xsrc}/"
-	fi
-
 	MKREPRO_TIMESTAMP=0
 	NETBSD_REVISIONID=
+	local base
 	local d
 	local t
 	local rid
 	local tag
 	local vcs
-	for d in ${dirs}
+	for base in src xsrc
 	do
-		local base=$( basename "$d" )
+		case $base in
+		src)	d=${NETBSDSRCDIR-/usr/src}/
+			;;
+		xsrc)	test "${MKX11-no}" = yes || continue
+			d=${X11SRCDIR-/usr/xsrc}/
+			;;
+		esac
 		if [ -d "${d}CVS" ]
 		then
 			local cvslatest="$(print_tooldir_program cvslatest)"