>Number:         16060
>Category:       install
>Synopsis:       X sets are incomplete
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    install-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Mar 25 18:17:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Minoura Makoto
>Release:        1.5ZC, 2002.3.24
>Organization:
The NetBSD Project
>Environment:
Built from 2002.3.24 sources on the following system:
System: NetBSD daisy 1.5W NetBSD 1.5W (DAISY) #193: Tue Sep 18 11:08:14 JST 2001 root@daisy:/usr/obj/sys/arch/i386/compile/DAISY i386
Architecture: i386
Machine: i386
>Description:
	X sets lists are splitted into XFree86 version-specific parts and
	the common parts. However, the sets would contain only the common
	parts.
>How-To-Repeat:
	make release in the xsrc directory, and check the product.
>Fix:
Index: distrib/sets/makeflist
===================================================================
RCS file: /cvsroot/basesrc/distrib/sets/makeflist,v
retrieving revision 1.42
diff -u -r1.42 makeflist
--- distrib/sets/makeflist	2002/02/27 10:42:55	1.42
+++ distrib/sets/makeflist	2002/03/26 02:03:31
@@ -70,8 +70,23 @@
 	esac
 	shift
 done
-if [ -n "$1" ]; then
-	lists="$@"
+if [ $# -gt 0 ]; then
+	lists=""
+	while [ $# -gt 0 ]; do
+		if [ -d "$setd/lists/$1" ]; then
+			lists="$lists $1"
+		else
+			echo "invalid set name $1" 1>&1
+		fi	
+		case $1 in
+		x*)
+			if [ -d "$setd/lists/$1${x11_version}" ]; then
+				lists="$lists $1${x11_version}"
+			fi
+			;;
+		esac
+		shift
+	done
 fi
 
 # Determine shlib type.
>Release-Note:
>Audit-Trail:
>Unformatted: