 @@ -1,14 +1,14 @@
-# $NetBSD: show.mk,v 1.15 2018/11/10 10:40:55 rillig Exp $
+# $NetBSD: show.mk,v 1.16 2018/11/11 19:07:12 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}
 @@ -139,78 +139,81 @@ 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-${g}: .PHONY
 	@echo "${g}:"
 .  for c in ${_SHOW_ALL_CATEGORIES}
 .    for v in ${${c}.${g}}
 .      if (${v:M*_ENV}			\
-	|| ${v:M*_ENV.*})
+	|| ${v:M*_ENV.*}		\
 	|| ${v} == PLIST_SUBST		\
 	|| ${v:MSUBST_VARS.*})
 # multi-valued variables, values are sorted
 	${RUN}								\
 	if ${!defined(${v}) :? true : false}; then			\
-	  printf '  %s\t%s (undefined)\n' ${_LABEL.${c}} ${v:Q};	\
+	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
 	elif value=${${v}:U:M*:Q} && test "x$$value" = "x"; then	\
-	  printf '  %s\t%s = # empty\n' ${_LABEL.${c}} ${v:Q};		\
+	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
-	  printf '  %s\t%s (sorted) = \\\n' ${_LABEL.${c}} ${v:Q};	\
+	  printf '  %s\t%-23s \\\n' ${_LABEL.${c}} ${v:Q}=;		\
-	  printf '  \t\t%s \\\n' ${${v}:O:@x@${x:Q}@};			\
+	  printf '\t\t\t\t%s \\\n' ${${v}:O:@x@${x:Q}@};		\
-	  printf '  \t\t# end of %s\n' ${v:Q};				\
+	  printf '\t\t\t\t# end of %s (sorted)\n' ${v:Q};		\
 	fi
 .      elif (${v:M*_ARGS}		\
 	|| ${v:M*_ARGS.*}		\
 	|| ${v:M*_CMD}			\
 	|| ${v:M*_CMD_DEFAULT}		\
 	|| ${v:M*_SKIP}			\
 	|| ${v:M*INSTALL_SRC}		\
 	|| ${v:MMASTER_SITE*}		\
 	|| ${v:MSUBST_FILES.*}		\
 	|| ${v:MSUBST_SED.*}		\
 	|| ${v:MSUBST_FILTER_CMD.*}	\
 	|| ${v:M*_SUBST})
 # multi-valued variables, preserving original order
 	${RUN}								\
 	if ${!defined(${v}) :? true : false}; then			\
-	  printf '  %s\t%s (undefined)\n' ${_LABEL.${c}} ${v:Q};	\
+	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
 	elif value=${${v}:U:M*:Q} && test "x$$value" = "x"; then	\
-	  printf '  %s\t%s = # empty\n' ${_LABEL.${c}} ${v:Q};		\
+	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
-	  printf '  %s\t%s = \\\n' ${_LABEL.${c}} ${v:Q};		\
+	  printf '  %s\t%-23s \\\n' ${_LABEL.${c}} ${v:Q}=;		\
-	  printf '  \t\t%s \\\n' ${${v}:@x@${x:Q}@};			\
+	  printf '\t\t\t\t%s \\\n' ${${v}:@x@${x:Q}@};			\
-	  printf '  \t\t# end of %s\n' ${v: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%s (undefined)\n' ${_LABEL.${c}} ${v:Q};	\
+	  printf '  %s\t%-23s # undefined\n' ${_LABEL.${c}} ${v:Q};	\
 	elif value=${${v}:U:Q} && test "x$$value" = "x"; then		\
-	  printf '  %s\t%s = # empty\n' ${_LABEL.${c}} ${v:Q};		\
+	  printf '  %s\t%-23s # empty\n' ${_LABEL.${c}} ${v:Q}=;	\
 	else								\
-	  printf '  %s\t%s = %s\n' ${_LABEL.${c}} ${v:Q} "$$value";	\
+	  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
 show-depends-options:
 	${RUN}                                                          \
 	${_DEPENDS_WALK_CMD} ${PKGPATH} |                               \
 	while read dir; do                                              \
 		${ECHO} "===> Options for $${dir}" &&                   \
 		cd ${.CURDIR}/../../$$dir &&                            \
 		${RECURSIVE_MAKE} ${MAKEFLAGS} show-options;            \
 	done

 @@ -1,35 +1,34 @@
-# $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
 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
 REGRESS_ENV.empty=	# empty
-REGRESS_ENV.space=	# initially empty
+REGRESS_ENV.space=	${:U } # a single space
 REGRESS_ENV.space+=	# now it contains 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=	${:U } # a single space
 REGRESS_ARGS.space+=	# now it contains 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.
 *=			bmake built-in
 **=			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"

 @@ -1,65 +1,66 @@
-# $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"
 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
+}
 do_test() {
 	$TEST_MAKE show-all-regress > "$tmpdir/show-all-regress.out"
+}
 check_result() {
 	exit_status 0
 	cat <<'EOF' > "$tmpdir/expected"
 regress:
-  pkg	REGRESS.undefined (undefined)
+  pkg	REGRESS_ENV.undefined   # undefined
-  pkg	REGRESS.empty = # empty
+  pkg	REGRESS_ENV.empty=      # empty
-  pkg	REGRESS.value = All * kinds of `strange' \escape $characters
+  pkg	REGRESS_ENV.space=      # empty
-  pkg	REGRESS_ENV.undefined (undefined)
+  pkg	REGRESS_ENV.value=      \
-  pkg	REGRESS_ENV.empty = # empty
+				*=all \
-  pkg	REGRESS_ENV.space = # empty
+				VAR1=value1 \
-  pkg	REGRESS_ENV.value (sorted) = \
+				VAR2=`command \
-  		*=all \
+				backticks` \
-  		VAR1=value1 \
+				execution \
-  		VAR2=`command \
+				via \
-  		backticks` \
+				# end of REGRESS_ENV.value (sorted)
-  		execution \
+  pkg	REGRESS_ARGS.undefined  # undefined
-  		via \
+  pkg	REGRESS_ARGS.empty=     # empty
-  		# end of REGRESS_ENV.value
+  pkg	REGRESS_ARGS.space=     # empty
-  pkg	REGRESS_ARGS.undefined (undefined)
+  pkg	REGRESS_ARGS.value=     \
-  pkg	REGRESS_ARGS.empty = # empty
+				VAR1=value1 \
-  pkg	REGRESS_ARGS.space = # empty
+				VAR2=`command \
-  pkg	REGRESS_ARGS.value = \
+				execution \
-  		VAR1=value1 \
+				via \
-  		VAR2=`command \
+				backticks` \
-  		execution \
+				*=all \
-  		via \
+				# end of REGRESS_ARGS.value
-  		backticks` \
+  pkg	REGRESS.undefined       # undefined
-  		*=all \
+  pkg	REGRESS.empty=          # empty
-  		# end of REGRESS_ARGS.value
+  pkg	REGRESS.space=           # ends with space
-  pkg	* = show-all-regress
+  pkg	REGRESS.value=          All * kinds of `strange' \escape $characters
-  pkg	** = asterisk
+  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