summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2006-12-23 14:18:44 +0000
committerrillig <rillig@pkgsrc.org>2006-12-23 14:18:44 +0000
commit38a55a9167f80cbb80b5f84ed216348e5c958eaa (patch)
tree04b22d3fc4b40ac73335feafeead1ac028a7999f
parent951266b100658f1e788c9e984fff2dee0173e76e (diff)
downloadpkgsrc-38a55a9167f80cbb80b5f84ed216348e5c958eaa.tar.gz
Added code to properly parse the output of many more config.status files
than before. I hadn't though that there are so many variations among them. Committed during the freeze to have that support for all the stable bulk builds as well, and since it will not influence the way packages are built at all.
-rw-r--r--mk/bsd.pkg.debug.mk13
1 files changed, 11 insertions, 2 deletions
diff --git a/mk/bsd.pkg.debug.mk b/mk/bsd.pkg.debug.mk
index 197b7e81b9a..b19b3f48a48 100644
--- a/mk/bsd.pkg.debug.mk
+++ b/mk/bsd.pkg.debug.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.debug.mk,v 1.10 2006/11/05 16:24:43 rillig Exp $
+# $NetBSD: bsd.pkg.debug.mk,v 1.11 2006/12/23 14:18:44 rillig Exp $
#
# The `debug' target outputs the values of some commonly used variables
@@ -61,7 +61,16 @@ _show-dbginfo-config.status:
for cs in ${CONFIGURE_DIRS:=/config.status}; do \
if ${TEST} ! -f "$${cs}"; then continue; fi; \
${PRINTF} "%s:\\n" "$${cs}"; \
- ${SED} -n 's:^s,@\([^@]*\)\@,\(.*\),;t t$$: \1=\2:p' "$${cs}" \
+ ${SED} -n -e 's,|#_!!_#|,,g' \
+ -e '/s,^\\(\[ #\]\*\\)/d' \
+ -e 's:^s,@\([^@]*\)@,\(.*\),;t t$$: \1=\2:p' \
+ -e 's:^s&@\([^@]*\)@&\(.*\)&;t t$$: \1=\2:p' \
+ -e 's:^s,@\([^@]*\)@,\(.*\),g$$: \1=\2:p' \
+ -e 's:^s%@\([^@]*\)@%\(.*\)%g$$: \1=\2:p' \
+ -e 's:^s&@\([^@]*\)@&\(.*\)&g$$: \1=\2:p' \
+ -e 's:^\(s[^[:alnum:]].*\): &:p' \
+ -e '/:\[FHLC\]/q' \
+ "$${cs}" \
| ${SORT}; \
done; fi
.else