Adapt support for XFree86 3.3.6/4.x lists to match behaviour of

"makeflist".

distrib/sets/makeobsolete

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.9 2002/04/08 15:39:32 tron Exp $
+# $NetBSD: makeobsolete,v 1.10 2002/04/09 06:07:17 tron Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -13,20 +13,7 @@ machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
 arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
 setd=`pwd`
 nlists="base comp etc games man misc text"
-xlists=
-for xlist in xbase xcomp xcontrib xfont xserver xmisc
-do
- if [ -z "$xlists" ]
- then
-  xlists=$xlist
- else
-  xlists="$xlists $xlist"
- fi
- if [ -d "$setd/lists/$xlist${x11_version}" ]
- then
-  xlists="$xlists $xlist${x11_version}"
- fi
-done
+xlists="xbase xcomp xcontrib xfont xserver xmisc"
 lists=$nlists
 target=./dist
 
@@ -81,6 +68,23 @@ if [ ! -d $target ] ; then
 	exit 1
 fi
 
+# Automatically add XFree86 version specific sets
+for list in $lists
+do
+ if [ -z "$_lists" ]
+ then
+  _lists=$list
+ else
+  _lists="$_lists $list"
+ fi
+ if [ -d "$setd/lists/$list${x11_version}" ]
+ then
+  _lists="$_lists $list${x11_version}"
+ fi
+done
+lists=$_lists
+unset _lists
+
 for setname in $lists; do
 	file=$target/${setname}_obsolete
 	(