 @@ -1,14 +1,14 @@
-# $NetBSD: show.mk,v 1.18 2019/09/08 09:01:04 rillig Exp $
+# $NetBSD: show.mk,v 1.19 2020/03/20 16:39:03 rillig Exp $
+#
 # This file contains some targets that print information gathered from
 # variables. They do not modify any variables.
+#
 # show-tools:
 #	Emits a /bin/sh shell script that defines all known tools
 #	to the values they have in the pkgsrc infrastructure.
+#
 show-tools: .PHONY
 .for t in ${_USE_TOOLS}
 .  if defined(_TOOLS_VARNAME.${t})
 	@${ECHO} ${_TOOLS_VARNAME.${t}:Q}=${${_TOOLS_VARNAME.${t}}:Q:Q}
 @@ -155,67 +155,70 @@ _LABEL._DEF_VARS=	def
 show-all: .PHONY
 .for g in ${_VARGROUPS:O:u}
 show-all: show-all-${g}
 # In the following code, the variables are evaluated as late as possible.
 # This is especially important for variables that use the :sh modifier,
 # like SUBST_FILES.pkglocaledir from mk/configure/replace-localedir.mk.
+#
 # When finally showing the variables, it is unavoidable that variables
 # using the :sh modifier may show warnings, for example because ${WRKDIR}
 # doesn't exist.
 _SHOW_ALL.d4=	$$$$		# see regress/show-all
 _SHOW_ALL.d8=	$$$$$$$$	# see regress/show-all
 show-all-${g}: .PHONY
 	@${RUN} printf '%s:\n' ${g:Q}
 .  for c in ${_SHOW_ALL_CATEGORIES}
 .    for v in ${${c}.${g}}
 .      if ${_SORTED_VARS.${g}:U:@pattern@ ${v:M${pattern}} @:M*}
 # multi-valued variables, values are sorted
 	${RUN}								\
 	if ${!defined(${v}) :? true : false}; then			\
 	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
 	elif value=${${v}:U:M*:Q} && test "x$$value" = "x"; then	\
 	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
 	  printf '  %s\t%-23s \\\n' ${_LABEL.${c}} ${v:Q}=;		\
-	  printf '\t\t\t\t%s \\\n' ${${v}:O:@x@${x:Q}@};		\
+	  printf '\t\t\t\t%s \\\n' ${${v}:O:C,\\$$,${_SHOW_ALL.d8},g:@x@${x:Q}@}; \
 	  printf '\t\t\t\t# end of %s (sorted)\n' ${v:Q};		\
 	fi
 .      elif ${_LISTED_VARS.${g}:U:@pattern@ ${v:M${pattern}} @:M*}
 # multi-valued variables, preserving original order
 	${RUN}								\
 	if ${!defined(${v}) :? true : false}; then			\
 	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
 	elif value=${${v}:U:M*:Q} && test "x$$value" = "x"; then	\
 	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
 	  printf '  %s\t%-23s \\\n' ${_LABEL.${c}} ${v:Q}=;		\
-	  printf '\t\t\t\t%s \\\n' ${${v}:@x@${x:Q}@};			\
+	  printf '\t\t\t\t%s \\\n' ${${v}:C,\\$$,${_SHOW_ALL.d8},g:@x@${x:Q}@}; \
 	  printf '\t\t\t\t# end of %s\n' ${v:Q};			\
 	fi
 .      else
 # single-valued variables
 	${RUN}								\
 	if ${!defined(${v}) :? true : false}; then			\
 	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
-	elif value=${${v}:U:Q} && test "x$$value" = "x"; then		\
+	elif value=${${v}:U:C,\\$$,${_SHOW_ALL.d4},gW:Q} && test "x$$value" = "x"; then \
 	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
 	  case "$$value" in (*[\	\ ]) eol="# ends with space";; (*) eol=""; esac; \
 	  printf '  %s\t%-23s %s\n' ${_LABEL.${c}} ${v:Q}= "$$value$$eol"; \
 	fi
 .      endif
 .    endfor
 .  endfor
 	${RUN} printf '\n'
 .endfor
 .PHONY: show-depends-options

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2020/03/20 15:45:12 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/20 16:39:03 rillig Exp $
 DISTNAME=	show-all-1.0
 CATEGORIES=	regress
 MASTER_SITES=	# none
 DISTFILES=	# none
 MAINTAINER=	pkgsrc-users@NetBSD.org
 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
 @@ -23,23 +23,23 @@ REGRESS_ARGS.value=	VAR1=value1 VAR2=`co
 # Variable names may also contain special characters that must be escaped.
 *=			bmake built-in
 **=			asterisk
 _VARGROUPS+=		regress
 _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+=	* **
 _SORTED_VARS.regress=	*_ENV.*
 _LISTED_VARS.regress=	*_ARGS.*
-SHELLVAR_PLAIN=		"$$var $${var} $$other"
+SHELLVAR_PLAIN=		"$$var $${var} $$other $$$$"
-SHELLVAR_ENV=		"$$var $${var} $$other"
+SHELLVAR_ENV=		"$$var $${var} $$other $$$$"
-SHELLVAR_ARGS=		"$$var $${var} $$other"
+SHELLVAR_ARGS=		"$$var $${var} $$other $$$$"
 _VARGROUPS+=		shellvar
 _PKG_VARS.shellvar=	SHELLVAR_PLAIN SHELLVAR_ENV SHELLVAR_ARGS
 _SORTED_VARS.shellvar=	*_ENV
 _LISTED_VARS.shellvar=	*_ARGS
 .include "../../mk/bsd.pkg.mk"

 @@ -1,14 +1,14 @@
-# $NetBSD: spec,v 1.3 2020/03/20 15:45:12 rillig Exp $
+# $NetBSD: spec,v 1.4 2020/03/20 16:39:03 rillig Exp $
 tmpdir=${TMPDIR:-/tmp}/pkgsrc-show-all
 rm -rf "$tmpdir"
 mkdir -p "$tmpdir"
 require_file() {
 	if diff -u "$3" "$1" > /dev/null; then
+		:
 	else
 		regress_fail "Expected files to be equal."
 		diff -u "$3" "$1" || true
 	fi
+}
 @@ -39,52 +39,52 @@ regress:
   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	REGRESS.value=          All * kinds of `strange' \escape $$characters
   pkg	*=                      show-all-regress
   pkg	**=                     asterisk
 EOF
 	# The "*" variable is built-in into bmake and expands to the current
 	# make target, which in this case is "show-all-regress".
 	# The "**" variable ensures that show-all doesn't accidentally expand
 	# filenames.
 	# It's a bit strange that bmake doesn't handle the backticks command
 	# as a single word. Luckily, this is a rare case.
+	#
 	# On the other hand, if it did, bmake would also have to handle
 	# variable expansion and all the other syntactic difficulties from
 	# parsing shell commands, and that would be just too much.
 	require_file "$tmpdir/show-all-regress.out" --equals "$tmpdir/expected"
-	# TODO: What the heck is going on here?
+	# Up to 2020-03-20, the output of the ENV and ARGS variables differed
-	# The output of the ENV and ARGS cases should be the same as in PLAIN.
+	# a lot from the PLAIN variable.
+	#
 	cat <<'EOF' > "$tmpdir/expected"
 shellvar:
-  pkg	SHELLVAR_PLAIN=         "$var ${var} $other"
+  pkg	SHELLVAR_PLAIN=         "$$var $${var} $$other $$$$"
   pkg	SHELLVAR_ENV=           \
-				".MAKE.LEVEL.ENVar  ther" \
+				"$$var $${var} $$other $$$$" \
 				# end of SHELLVAR_ENV (sorted)
   pkg	SHELLVAR_ARGS=          \
-				".MAKE.LEVEL.ENVar  ther" \
+				"$$var $${var} $$other $$$$" \
 				# end of SHELLVAR_ARGS
 EOF
 	require_file "$tmpdir/show-all-shellvar.out" --equals "$tmpdir/expected"
+}