pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Added code to properly parse the output of many mor...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/32809296ff4c
branches:  trunk
changeset: 522814:32809296ff4c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Dec 23 14:18:44 2006 +0000

description:
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.

diffstat:

 mk/bsd.pkg.debug.mk |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r e06685ef3ac5 -r 32809296ff4c mk/bsd.pkg.debug.mk
--- a/mk/bsd.pkg.debug.mk       Sat Dec 23 13:59:57 2006 +0000
+++ b/mk/bsd.pkg.debug.mk       Sat Dec 23 14:18:44 2006 +0000
@@ -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 @@
        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



Home | Main Index | Thread Index | Old Index