[src/trunk]: src/distrib/sets Compatible upgrade to set list behavior -- any ...

[jwise <jwise%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eada1858c3f3
branches:  trunk
changeset: 481124:eada1858c3f3
user:      jwise <jwise%NetBSD.org@localhost>
date:      Sun Jan 23 20:31:17 2000 +0000

description:
Compatible upgrade to set list behavior -- any (whitespace separated) fields
after the first in each line of a set list are ignored.  This introduces
no change in current set list behavior, but will need to be revisited if
we wish to distribute files with spaces in their names -- in this case we can
move to tab separated fields or some other behavior.

Current set lists work exactly as before, but in the future set lists may
have additional fields for use in a system packaging script.

I will post a detailed work plan for the system package system which uses
this to tech-pkg and tech-install in the next day or so.

diffstat:

 distrib/sets/makeflist    |  12 ++++++------
 distrib/sets/makeobsolete |   8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r d14a2c73057c -r eada1858c3f3 distrib/sets/makeflist
--- a/distrib/sets/makeflist    Sun Jan 23 20:24:23 2000 +0000
+++ b/distrib/sets/makeflist    Sun Jan 23 20:31:17 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.19 1999/11/27 13:10:45 mrg Exp $
+# $NetBSD: makeflist,v 1.20 2000/01/23 20:31:17 jwise Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -76,19 +76,19 @@
 fi
 
 for setname in $lists; do
-       cat $setd/lists/$setname/mi
+       awk -- '{print $1}' $setd/lists/$setname/mi
        if [ "$machine" != "$cpu" -a -f $setd/lists/$setname/ad.${arch} ]; then
-               cat $setd/lists/$setname/ad.${arch}
+               awk -- '{print $1}' $setd/lists/$setname/ad.${arch}
        fi
        if [ -f $setd/lists/$setname/md.${machine} ]; then
-               cat $setd/lists/$setname/md.${machine}
+               awk -- '{print $1}' $setd/lists/$setname/md.${machine}
        fi
        if [ "$shlib" != "" ]; then
                if [ -f $setd/lists/$setname/shl.mi ]; then
-                       cat $setd/lists/$setname/shl.mi
+                       awk -- '{print $1}' $setd/lists/$setname/shl.mi
                fi
                if [ -f $setd/lists/$setname/shl.${shlib} ]; then
-                       cat $setd/lists/$setname/shl.${shlib}
+                       awk -- '{print $1}' $setd/lists/$setname/shl.${shlib}
                fi
        fi
 
diff -r d14a2c73057c -r eada1858c3f3 distrib/sets/makeobsolete
--- a/distrib/sets/makeobsolete Sun Jan 23 20:24:23 2000 +0000
+++ b/distrib/sets/makeobsolete Sun Jan 23 20:31:17 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.1 1999/06/05 20:17:42 bouyer Exp $
+# $NetBSD: makeobsolete,v 1.2 2000/01/23 20:31:17 jwise Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -72,14 +72,14 @@
        file=$target/${setname}_obsolete
        (
        if [ -f $setd/lists/$setname/obsolete.mi ]; then
-               cat $setd/lists/$setname/obsolete.mi
+               awk -- '{print $1}' $setd/lists/$setname/obsolete.mi
        fi
        if [ "$machine" != "$cpu" -a \
            -f $setd/lists/$setname/obsolete.${arch} ]; then
-               cat $setd/lists/$setname/obsolete.${arch}
+               awk -- '{print $1}' $setd/lists/$setname/obsolete.${arch}
        fi
        if [ -f $setd/lists/$setname/obsolete.${machine} ]; then
-               cat $setd/lists/$setname/obsolete.${machine}
+               awk -- '{print $1}' $setd/lists/$setname/obsolete.${machine}
        fi) | egrep -v '^#' | sort -u > $file
        if [ ! -s $file ] ; then
                rm $file