mk/misc: adjust layout of the show-all output to pkgsrc format

In Makefiles, the variable values are aligned vertically. This format is
now also used in the show-all target, which makes it easier readable.

Some more variables have been marked as multi-value, and single-valued
variables ending in space are clearly marked. Without the latter, the
regression test would have a line with significant trailing whitespace.

2 files changed, 34 insertions, 34 deletions

diff --git a/regress/show-all/Makefile b/regress/show-all/Makefile
index 21ddcb0583f..a7217ece55d 100644
--- a/regress/show-all/Makefile
+++ b/regress/show-all/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/11/10 10:40:56 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/11 19:07:12 rillig Exp $
 
 DISTNAME=	show-all-1.0
 CATEGORIES=	regress
@@ -10,16 +10,15 @@ COMMENT=	Demonstrates the show-all target
 LICENSE=	2-clause-bsd
 
 REGRESS.empty=		# empty
+REGRESS.space=		${:U } # a single space
 REGRESS.value=		All * kinds of `strange' \escape $$characters
 
 REGRESS_ENV.empty=	# empty
-REGRESS_ENV.space=	# initially empty
-REGRESS_ENV.space+=	# now it contains a single space
+REGRESS_ENV.space=	${:U } # a single space
 REGRESS_ENV.value=	VAR1=value1 VAR2=`command execution via backticks` *=all
 
 REGRESS_ARGS.empty=	# empty
-REGRESS_ARGS.space=	# initially empty
-REGRESS_ARGS.space+=	# now it contains a single space
+REGRESS_ARGS.space=	${:U } # a single space
 REGRESS_ARGS.value=	VAR1=value1 VAR2=`command execution via backticks` *=all
 
 # Variable names may also contain special characters that must be escaped.
@@ -27,9 +26,9 @@ REGRESS_ARGS.value=	VAR1=value1 VAR2=`command execution via backticks` *=all
 **=			asterisk
 
 _VARGROUPS+=		regress
-_PKG_VARS.regress+=	REGRESS.undefined REGRESS.empty REGRESS.value
 _PKG_VARS.regress+=	REGRESS_ENV.undefined REGRESS_ENV.empty REGRESS_ENV.space REGRESS_ENV.value
 _PKG_VARS.regress+=	REGRESS_ARGS.undefined REGRESS_ARGS.empty REGRESS_ARGS.space REGRESS_ARGS.value
+_PKG_VARS.regress+=	REGRESS.undefined REGRESS.empty REGRESS.space REGRESS.value
 _PKG_VARS.regress+=	* **
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/regress/show-all/spec b/regress/show-all/spec
index 944250e5bfb..4161468a50f 100644
--- a/regress/show-all/spec
+++ b/regress/show-all/spec
@@ -1,4 +1,4 @@
-# $NetBSD: spec,v 1.1 2018/11/10 10:40:56 rillig Exp $
+# $NetBSD: spec,v 1.2 2018/11/11 19:07:12 rillig Exp $
 
 tmpdir=${TMPDIR:-/tmp}/pkgsrc-show-all
 rm -rf "$tmpdir"
@@ -23,33 +23,34 @@ check_result() {
 
 	cat <<'EOF' > "$tmpdir/expected"
 regress:
-  pkg	REGRESS.undefined (undefined)
-  pkg	REGRESS.empty = # empty
-  pkg	REGRESS.value = All * kinds of `strange' \escape $characters
-  pkg	REGRESS_ENV.undefined (undefined)
-  pkg	REGRESS_ENV.empty = # empty
-  pkg	REGRESS_ENV.space = # empty
-  pkg	REGRESS_ENV.value (sorted) = \
-  		*=all \
-  		VAR1=value1 \
-  		VAR2=`command \
-  		backticks` \
-  		execution \
-  		via \
-  		# end of REGRESS_ENV.value
-  pkg	REGRESS_ARGS.undefined (undefined)
-  pkg	REGRESS_ARGS.empty = # empty
-  pkg	REGRESS_ARGS.space = # empty
-  pkg	REGRESS_ARGS.value = \
-  		VAR1=value1 \
-  		VAR2=`command \
-  		execution \
-  		via \
-  		backticks` \
-  		*=all \
-  		# end of REGRESS_ARGS.value
-  pkg	* = show-all-regress
-  pkg	** = asterisk
+  pkg	REGRESS_ENV.undefined   # undefined
+  pkg	REGRESS_ENV.empty=      # empty
+  pkg	REGRESS_ENV.space=      # empty
+  pkg	REGRESS_ENV.value=      \
+				*=all \
+				VAR1=value1 \
+				VAR2=`command \
+				backticks` \
+				execution \
+				via \
+				# end of REGRESS_ENV.value (sorted)
+  pkg	REGRESS_ARGS.undefined  # undefined
+  pkg	REGRESS_ARGS.empty=     # empty
+  pkg	REGRESS_ARGS.space=     # empty
+  pkg	REGRESS_ARGS.value=     \
+				VAR1=value1 \
+				VAR2=`command \
+				execution \
+				via \
+				backticks` \
+				*=all \
+				# end of REGRESS_ARGS.value
+  pkg	REGRESS.undefined       # undefined
+  pkg	REGRESS.empty=          # empty
+  pkg	REGRESS.space=           # ends with space
+  pkg	REGRESS.value=          All * kinds of `strange' \escape $characters
+  pkg	*=                      show-all-regress
+  pkg	**=                     asterisk
 
 EOF