CVS commit: pkgsrc/regress/make-quoting

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Nov 30 19:06:33 UTC 2018

Modified Files:
        pkgsrc/regress/make-quoting: Makefile
        pkgsrc/regress/make-quoting/files: for.mk for.out

Log Message:
regress/make-quoting: adjust to bmake change from 2015


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/regress/make-quoting/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/regress/make-quoting/files/for.mk \
    pkgsrc/regress/make-quoting/files/for.out

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

Modified files:

Index: pkgsrc/regress/make-quoting/Makefile
diff -u pkgsrc/regress/make-quoting/Makefile:1.8 pkgsrc/regress/make-quoting/Makefile:1.9
--- pkgsrc/regress/make-quoting/Makefile:1.8    Tue Mar  4 11:02:25 2008
+++ pkgsrc/regress/make-quoting/Makefile        Fri Nov 30 19:06:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2008/03/04 11:02:25 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2018/11/30 19:06:32 rillig Exp $
 #
 
-DISTNAME=      regress-make-1.0
+DISTNAME=      regress-make-18.11
 CATEGORIES=    regress
 DISTFILES=     # empty
 
@@ -51,7 +51,7 @@ do-regress:
        @${_PKG_SILENT}${_PKG_DEBUG}                                    \
        ${ECHO_MSG} "Running testcase "${t:Q};                          \
        ${MAKE} ${MAKEFLAGS} -s -f ${FILESDIR:Q}/${t:Q}.mk              \
-       | diff - ${FILESDIR:Q}/${t:Q}.out
+       | diff -u ${FILESDIR:Q}/${t:Q}.out -
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/regress/make-quoting/files/for.mk
diff -u pkgsrc/regress/make-quoting/files/for.mk:1.1.1.1 pkgsrc/regress/make-quoting/files/for.mk:1.2
--- pkgsrc/regress/make-quoting/files/for.mk:1.1.1.1    Sun May 15 21:10:16 2005
+++ pkgsrc/regress/make-quoting/files/for.mk    Fri Nov 30 19:06:33 2018
@@ -1,7 +1,10 @@
-# $NetBSD: for.mk,v 1.1.1.1 2005/05/15 21:10:16 rillig Exp $
+# $NetBSD: for.mk,v 1.2 2018/11/30 19:06:33 rillig Exp $
 #
-# .for loops don't interpret variables in sh(1) mode, but split them at
-# whitespace.
+# Up to 2015, .for loops didn't interpret variables in sh(1) mode, but
+# split them at whitespace.
+#
+# Since 2015-05-20, the .for loops behave like the rest of Make,
+# splitting at the quoting.
 
 LIST_1=                1 2 "3     3"  '4 ' 5'5'5"5"5
 
Index: pkgsrc/regress/make-quoting/files/for.out
diff -u pkgsrc/regress/make-quoting/files/for.out:1.1.1.1 pkgsrc/regress/make-quoting/files/for.out:1.2
--- pkgsrc/regress/make-quoting/files/for.out:1.1.1.1   Sun May 15 21:10:16 2005
+++ pkgsrc/regress/make-quoting/files/for.out   Fri Nov 30 19:06:33 2018
@@ -1,7 +1,5 @@
 1
 2
-"3
-3"
-'4
-'
+"3     3"
+'4 '
 5'5'5"5"5