src: Pull up following revision(s) (requested by nakayama in tic...

[Repository Conversion <srcmastr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/24747b304077
branches:  netbsd-8
changeset: 318105:24747b304077
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Apr 12 14:48:39 2018 +0000
description:
Pull up following revision(s) (requested by nakayama in ticket #747):

        distrib/sets/sets.subr: revision 1.184

Handle compatdir first whether making obsolete lists or not, to
make obsolete lists including compat directory (eg. ./usr/lib/i386)
properly.

diffstat:

 distrib/sets/sets.subr |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r 0bed7919b02c -r 24747b304077 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Thu Apr 12 14:16:42 2018 +0000
+++ b/distrib/sets/sets.subr    Thu Apr 12 14:48:39 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
+#      $NetBSD: sets.subr,v 1.179.4.1 2018/04/12 14:48:39 martin Exp $
 #
 
 #
@@ -179,7 +179,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
+#      # $NetBSD: sets.subr,v 1.179.4.1 2018/04/12 14:48:39 martin Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -364,6 +364,13 @@
                                if (kw == "obsolete")
                                        haveobs = 1
                        }
+                       if (iscompatdir) {
+                               for (d in cpaths) {
+                                       if (cpaths[d] == $1 "/")
+                                               next
+                               }
+                               cpaths[ncpaths++] = $1 "/"
+                       }
                        if (obsolete && ! haveobs)
                                next
                        if (!show)
@@ -387,11 +394,6 @@
                                emitcompat[$1] = 1;
                                next
                        }
-                       for (d in cpaths) {
-                               if (cpaths[d] == $1 "/")
-                                       next
-                       }
-                       cpaths[ncpaths++] = $1 "/"
                        for (d in compatarchdirs) {
                                tmp = $0
                                xfile = $1 "/" compatarchdirs[d]