CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Jul  1 09:13:13 UTC 2020

Modified Files:
        pkgsrc/mk/buildlink3: bsd.buildlink3.mk
        pkgsrc/mk/misc: show.mk
        pkgsrc/regress/infra-unittests: show-all.sh

Log Message:
show-all: fix typo in variable name

The width only applies to a single group, not to several or even all
groups.


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/misc/show.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/regress/infra-unittests/show-all.sh

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

Modified files:

Index: pkgsrc/mk/buildlink3/bsd.buildlink3.mk
diff -u pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.245 pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.246
--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk:1.245        Wed Jul  1 07:39:52 2020
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk      Wed Jul  1 09:13:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.245 2020/07/01 07:39:52 rillig Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.246 2020/07/01 09:13:13 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -204,7 +204,7 @@ _BLNK_PACKAGES+=    ${_pkg_}
 .endfor
 
 _VARGROUPS+=           bl3
-_VARGROUPS_WIDTH.bl3=  39
+_VARGROUP_WIDTH.bl3=   39
 _DEF_VARS.bl3+=                _BLNK_PACKAGES _BLNK_DEPENDS
 _LISTED_VARS.bl3+=     _BLNK_PACKAGES _BLNK_DEPENDS
 .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDADD LDFLAGS LIBS

Index: pkgsrc/mk/misc/show.mk
diff -u pkgsrc/mk/misc/show.mk:1.21 pkgsrc/mk/misc/show.mk:1.22
--- pkgsrc/mk/misc/show.mk:1.21 Wed Jul  1 07:39:52 2020
+++ pkgsrc/mk/misc/show.mk      Wed Jul  1 09:13:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: show.mk,v 1.21 2020/07/01 07:39:52 rillig Exp $
+# $NetBSD: show.mk,v 1.22 2020/07/01 09:13:12 rillig Exp $
 #
 # This file contains some targets that print information gathered from
 # variables. They do not modify any variables.
@@ -154,7 +154,7 @@ _LABEL._DEF_VARS=   def
 
 show-all: .PHONY
 .for g in ${"${.TARGETS:Mshow-all*}":?${_VARGROUPS:O:u}:}
-.  for w in ${_VARGROUPS_WIDTH.${g}:U23}
+.  for w in ${_VARGROUP_WIDTH.${g}:U23}
 
 show-all: show-all-${g}
 

Index: pkgsrc/regress/infra-unittests/show-all.sh
diff -u pkgsrc/regress/infra-unittests/show-all.sh:1.2 pkgsrc/regress/infra-unittests/show-all.sh:1.3
--- pkgsrc/regress/infra-unittests/show-all.sh:1.2      Wed Jul  1 09:10:11 2020
+++ pkgsrc/regress/infra-unittests/show-all.sh  Wed Jul  1 09:13:12 2020
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $NetBSD: show-all.sh,v 1.2 2020/07/01 09:10:11 rillig Exp $
+# $NetBSD: show-all.sh,v 1.3 2020/07/01 09:13:12 rillig Exp $
 #
 # Tests for the show-all target from mk/misc/show.mk.
 #
@@ -168,7 +168,7 @@ VAR_ENV=            value1 value2
 VAR_ARGS=              value1 value2
 
 _VARGROUPS+=           var
-_VARGROUPS_WIDTH.var=  15
+_VARGROUP_WIDTH.var=   15
 _PKG_VARS.var=         VAR_PLAIN VAR_PLAIN_LONG_NAME
 _PKG_VARS.var+=                VAR_ENV VAR_ENV_LONG_NAME
 _PKG_VARS.var+=                VAR_ARGS VAR_ARGS_LONG_NAME
@@ -185,14 +185,16 @@ EOF
 
        create_file 'expected' <<'EOF'
 var:
-  pkg   VAR_PLAIN=      "$$var $${var} $$other $$$$"
+  pkg   VAR_PLAIN=      value
   pkg   VAR_PLAIN_LONG_NAME # undefined
   pkg   VAR_ENV=        \
-                        "$$var $${var} $$other $$$$" \
+                        value1 \
+                        value2 \
                         # end of VAR_ENV (sorted)
   pkg   VAR_ENV_LONG_NAME # undefined
   pkg   VAR_ARGS=       \
-                        "$$var $${var} $$other $$$$" \
+                        value1 \
+                        value2 \
                         # end of VAR_ARGS
   pkg   VAR_ARGS_LONG_NAME # undefined