Re: CVS commit: src/usr.bin/make

[Tobias Nygren <tnn%NetBSD.org@localhost>]

On Mon, 29 Dec 2008 10:12:30 +0000 (UTC)
David Laight <dsl%netbsd.org@localhost> wrote:

> Date:         Mon Dec 29 10:12:30 UTC 2008
> 
> Modified Files:
>       src/usr.bin/make: for.c var.c
> 
> Log Message:
[...]
> This may well fix recent pkgsrc breakage.

Thanks, it seems to work for the most part. But there's still a
problem with pkgsrc/fetch/fetch.mk. (See below for a workaround diff.)
The "=" in substitutions still seems to cause grief, as in:

A=foo=bar
.for a in ${A}
B.${a:S/=//} = test
.endfor
all:
        echo ${A} ${B.foobar}

-Tobias
Index: fetch.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/fetch/fetch.mk,v
retrieving revision 1.37
diff -u -r1.37 fetch.mk
--- fetch.mk    8 Oct 2008 15:39:07 -0000       1.37
+++ fetch.mk    29 Dec 2008 11:00:16 -0000
@@ -48,18 +48,18 @@
 DYNAMIC_SITES_SCRIPT?= ${FILESDIR}/getsite.sh
 DYNAMIC_SITES_CMD?=    ${SETENV} PATH=${PATH:Q} ${SH}
${DYNAMIC_SITES_SCRIPT} .if exists(${DYNAMIC_SITES_SCRIPT})
-.  for fetchfile in ${_ALLFILES}
-SITES.${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITES_CMD} ${fetchfile:T}`
+.  for fetchfile in ${_ALLFILES:T:S/=/--/}
+SITES.${fetchfile}?= `${DYNAMIC_SITES_CMD} ${fetchfile}`
 .  endfor
 .endif
 .if !empty(_DISTFILES)
-.  for fetchfile in ${_DISTFILES}
-SITES.${fetchfile:T:S/=/--/}?= ${MASTER_SITES}
+.  for fetchfile in ${_DISTFILES:T:S/=/--/}
+SITES.${fetchfile}?= ${MASTER_SITES}
 .  endfor
 .endif
 .if !empty(_PATCHFILES)
-.  for fetchfile in ${_PATCHFILES}
-SITES.${fetchfile:T:S/=/--/}?= ${PATCH_SITES}
+.  for fetchfile in ${_PATCHFILES:T:S/=/--/}
+SITES.${fetchfile}?= ${PATCH_SITES}
 .  endfor
 .endif