>Number:         28400
>Category:       install
>Synopsis:       latest change to use NetBSD logos in xdm was apparently not tested on 1.6.x
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    install-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Nov 23 18:42:00 +0000 2004
>Originator:     Greg A. Woods
>Release:        NetBSD 1.6.2_STABLE
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD always 1.6.2_STABLE NetBSD 1.6.2_STABLE (GENERIC) #0: Wed Oct 13 19:26:55 EDT 2004 woods@always:/build/woods/always/NetBSD-1.6.x-i386-i386-obj/mfbd/woods/m-NetBSD-1.6/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:

	the latest change to use NetBSD logos in xdm was apparently not
	tested with a 1.6.x release build....

>How-To-Repeat:

	build a release with x11 sets and observe:

cd /usr/src/distrib/sets &&  DESTDIR=/build/woods/always/NetBSD-1.6.x-i386-ppro-destdir  MACHINE=i386 MACHINE_ARCH=i386  MAKE=make MTREE= PAX= sh ./checkflist -x11 -M /build/woods/always/NetBSD-1.6.x-i386-ppro-destdir/METALOG.X11
5580,5581c5579,5580
< ./usr/X11R6/lib/X11/xdm/pixmaps/XFree86.xpm
< ./usr/X11R6/lib/X11/xdm/pixmaps/XFree86bw.xpm
---
> ./usr/X11R6/lib/X11/xdm/pixmaps/NetBSD.xpm
> ./usr/X11R6/lib/X11/xdm/pixmaps/NetBSDbw.xpm
checkflist: flist inconsistencies found
checkflist: key to output:
  <  file in flist but missing from DESTDIR
  >  file in DESTDIR but missing from flist
*** Error code 1

Stop.
make: stopped in /build/woods/always/NetBSD-1.6.x-i386-i386-ppro-obj/xsrc


>Fix:

	fix the logo filenames in distrib/sets/xbase4/mi

$ ed distrib/sets/xbase4/mi
1,$s/XFree86/NetBSD/
w
q


	Actually there are a number of changes that I think are
	necessary to cleanly build a full x11 release on 1.6.x:
	(that first change only works if /etc/X11 is part of base)
	(some of the other added lib/X11/xdm files are from my local enhancements)
	(line numbers are also wrong in the last manually edited hunk)

Index: distrib/sets/lists/xbase4/mi
===================================================================
RCS file: /cvs/master/m-NetBSD/main/src/distrib/sets/lists/xbase4/mi,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 mi
--- distrib/sets/lists/xbase4/mi	19 Oct 2003 08:05:12 -0000	1.2.2.2
+++ distrib/sets/lists/xbase4/mi	23 Nov 2004 18:10:15 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: mi,v 1.2.2.2 2003/10/19 08:05:12 tron Exp $
-./etc/X11
 ./etc/fonts
+# note: these two files should probably be in an xetc.tgz set
 ./etc/fonts/fonts.conf
 ./etc/fonts/fonts.dtd
 ./usr/X11R6/bin/bdftruncate
@@ -10,7 +10,9 @@
 ./usr/X11R6/bin/dpsinfo
 ./usr/X11R6/bin/fc-cache
 ./usr/X11R6/bin/fc-list
-./usr/X11R6/bin/fontconfig-config
+./usr/X11R6/bin/fonttosfnt
+./usr/X11R6/bin/getconfig
+./usr/X11R6/bin/getconfig.pl
 ./usr/X11R6/bin/glxgears
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/luit
@@ -39,8 +41,12 @@
 ./usr/X11R6/lib/X11/Xcms.txt
 ./usr/X11R6/lib/X11/app-defaults/Beforelight
 ./usr/X11R6/lib/X11/app-defaults/UXTerm
+./usr/X11R6/lib/X11/app-defaults/XClock-color
 ./usr/X11R6/lib/X11/app-defaults/Xedit-color
 ./usr/X11R6/lib/X11/app-defaults/Xmessage-color
+./usr/X11R6/lib/X11/getconfig
+./usr/X11R6/lib/X11/getconfig/cfg.sample
+./usr/X11R6/lib/X11/getconfig/xfree86.cfg
 ./usr/X11R6/lib/X11/locale/C/XI18N_OBJS
 ./usr/X11R6/lib/X11/locale/armscii-8
 ./usr/X11R6/lib/X11/locale/armscii-8/Compose
@@ -168,6 +174,9 @@
 ./usr/X11R6/lib/X11/locale/zh_CN.gbk/Compose
 ./usr/X11R6/lib/X11/locale/zh_CN.gbk/XI18N_OBJS
 ./usr/X11R6/lib/X11/locale/zh_CN.gbk/XLC_LOCALE
+./usr/X11R6/lib/X11/locale/zh_CN.UTF-8
+./usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS
+./usr/X11R6/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE
 ./usr/X11R6/lib/X11/locale/zh_CN/Compose
 ./usr/X11R6/lib/X11/locale/zh_CN/XI18N_OBJS
 ./usr/X11R6/lib/X11/locale/zh_CN/XLC_LOCALE
@@ -185,10 +194,13 @@
 ./usr/X11R6/lib/X11/locale/zh_TW.big5/XLC_LOCALE
 ./usr/X11R6/lib/X11/locale/zh_TW/Compose
 ./usr/X11R6/lib/X11/locale/zh_TW/XI18N_OBJS
+./usr/X11R6/lib/X11/xdm/Xreset
+./usr/X11R6/lib/X11/xdm/Xsetup
+./usr/X11R6/lib/X11/xdm/Xstartup
 ./usr/X11R6/lib/X11/xdm/Xwilling
 ./usr/X11R6/lib/X11/xdm/pixmaps
-./usr/X11R6/lib/X11/xdm/pixmaps/XFree86.xpm
-./usr/X11R6/lib/X11/xdm/pixmaps/XFree86bw.xpm
+./usr/X11R6/lib/X11/xdm/pixmaps/NetBSD.xpm
+./usr/X11R6/lib/X11/xdm/pixmaps/NetBSDbw.xpm
 ./usr/X11R6/lib/X11/xedit
 ./usr/X11R6/lib/X11/xedit/lisp
 ./usr/X11R6/lib/X11/xedit/lisp/indent.lsp
@@ -200,6 +212,7 @@
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/lisp.lsp
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/make.lsp
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/man.lsp
+./usr/X11R6/lib/X11/xedit/lisp/progmodes/patch.lsp
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/rpm.lsp
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/sgml.lsp
 ./usr/X11R6/lib/X11/xedit/lisp/progmodes/sh.lsp
@@ -216,9 +229,14 @@
 ./usr/X11R6/lib/X11/xkb/compat/xfree86
 ./usr/X11R6/lib/X11/xkb/geometry/README
 ./usr/X11R6/lib/X11/xkb/geometry/hp
+./usr/X11R6/lib/X11/xkb/geometry/ibm
+./usr/X11R6/lib/X11/xkb/geometry/ibm/thinkpad
+./usr/X11R6/lib/X11/xkb/geometry/chicony
+./usr/X11R6/lib/X11/xkb/geometry/sharp
 ./usr/X11R6/lib/X11/xkb/keycodes/README
 ./usr/X11R6/lib/X11/xkb/keycodes/aliases
 ./usr/X11R6/lib/X11/xkb/keycodes/powerpcps2
+./usr/X11R6/lib/X11/xkb/keycodes/x68k
 ./usr/X11R6/lib/X11/xkb/keymap/README
 ./usr/X11R6/lib/X11/xkb/keymap/sgi/cz
 ./usr/X11R6/lib/X11/xkb/keymap/sgi/cz_qwerty
@@ -231,6 +249,7 @@
 ./usr/X11R6/lib/X11/xkb/keymap/sun/pl
 ./usr/X11R6/lib/X11/xkb/keymap/sun/ru
 ./usr/X11R6/lib/X11/xkb/keymap/sun/uk
+./usr/X11R6/lib/X11/xkb/keymap/x68k
 ./usr/X11R6/lib/X11/xkb/rules/README
 ./usr/X11R6/lib/X11/xkb/rules/sun
 ./usr/X11R6/lib/X11/xkb/rules/sun.lst
@@ -239,6 +258,7 @@
 ./usr/X11R6/lib/X11/xkb/symbols/al
 ./usr/X11R6/lib/X11/xkb/symbols/altwin
 ./usr/X11R6/lib/X11/xkb/symbols/am
+./usr/X11R6/lib/X11/xkb/symbols/apple
 ./usr/X11R6/lib/X11/xkb/symbols/ar
 ./usr/X11R6/lib/X11/xkb/symbols/az
 ./usr/X11R6/lib/X11/xkb/symbols/ben
@@ -257,6 +277,7 @@
 ./usr/X11R6/lib/X11/xkb/symbols/hp
 ./usr/X11R6/lib/X11/xkb/symbols/hp/us
 ./usr/X11R6/lib/X11/xkb/symbols/hr
+./usr/X11R6/lib/X11/xkb/symbols/hr_US
 ./usr/X11R6/lib/X11/xkb/symbols/hu_US
 ./usr/X11R6/lib/X11/xkb/symbols/hu_qwerty
 ./usr/X11R6/lib/X11/xkb/symbols/ie
@@ -308,6 +329,7 @@
 ./usr/X11R6/lib/X11/xkb/symbols/pc/dev
 ./usr/X11R6/lib/X11/xkb/symbols/pc/dk
 ./usr/X11R6/lib/X11/xkb/symbols/pc/dvorak
+./usr/X11R6/lib/X11/xkb/symbols/pc/dz
 ./usr/X11R6/lib/X11/xkb/symbols/pc/ee
 ./usr/X11R6/lib/X11/xkb/symbols/pc/el
 ./usr/X11R6/lib/X11/xkb/symbols/pc/en_US
@@ -351,6 +373,9 @@
 ./usr/X11R6/lib/X11/xkb/symbols/pc/ru
 ./usr/X11R6/lib/X11/xkb/symbols/pc/sapmi
 ./usr/X11R6/lib/X11/xkb/symbols/pc/se
+./usr/X11R6/lib/X11/xkb/symbols/pc/se_FI
+./usr/X11R6/lib/X11/xkb/symbols/pc/se_NO
+./usr/X11R6/lib/X11/xkb/symbols/pc/se_SE
 ./usr/X11R6/lib/X11/xkb/symbols/pc/si
 ./usr/X11R6/lib/X11/xkb/symbols/pc/sk
 ./usr/X11R6/lib/X11/xkb/symbols/pc/sk_qwerty
@@ -359,25 +384,34 @@
 ./usr/X11R6/lib/X11/xkb/symbols/pc/syr_phonetic
 ./usr/X11R6/lib/X11/xkb/symbols/pc/tel
 ./usr/X11R6/lib/X11/xkb/symbols/pc/th
+./usr/X11R6/lib/X11/xkb/symbols/pc/th_pat
+./usr/X11R6/lib/X11/xkb/symbols/pc/th_tis
 ./usr/X11R6/lib/X11/xkb/symbols/pc/tj
 ./usr/X11R6/lib/X11/xkb/symbols/pc/tml
 ./usr/X11R6/lib/X11/xkb/symbols/pc/tr
 ./usr/X11R6/lib/X11/xkb/symbols/pc/ua
 ./usr/X11R6/lib/X11/xkb/symbols/pc/us
+./usr/X11R6/lib/X11/xkb/symbols/pc/us_intl
+./usr/X11R6/lib/X11/xkb/symbols/pc/uz
 ./usr/X11R6/lib/X11/xkb/symbols/pc/yu
 ./usr/X11R6/lib/X11/xkb/symbols/pl2
-./usr/X11R6/lib/X11/xkb/symbols/ru_yawerty
+./usr/X11R6/lib/X11/xkb/symbols/ro2
 ./usr/X11R6/lib/X11/xkb/symbols/sapmi
 ./usr/X11R6/lib/X11/xkb/symbols/se_FI
 ./usr/X11R6/lib/X11/xkb/symbols/se_NO
 ./usr/X11R6/lib/X11/xkb/symbols/se_SE
+./usr/X11R6/lib/X11/xkb/symbols/sharp
+./usr/X11R6/lib/X11/xkb/symbols/sharp/jp
 ./usr/X11R6/lib/X11/xkb/symbols/sk
 ./usr/X11R6/lib/X11/xkb/symbols/sk_qwerty
 ./usr/X11R6/lib/X11/xkb/symbols/sr
 ./usr/X11R6/lib/X11/xkb/symbols/srvr_ctrl
+./usr/X11R6/lib/X11/xkb/symbols/sun/usb
 ./usr/X11R6/lib/X11/xkb/symbols/syr
 ./usr/X11R6/lib/X11/xkb/symbols/syr_phonetic
 ./usr/X11R6/lib/X11/xkb/symbols/tel
+./usr/X11R6/lib/X11/xkb/symbols/th_pat
+./usr/X11R6/lib/X11/xkb/symbols/th_tis
 ./usr/X11R6/lib/X11/xkb/symbols/tj
 ./usr/X11R6/lib/X11/xkb/symbols/tml
 ./usr/X11R6/lib/X11/xkb/symbols/tr
@@ -385,6 +419,7 @@
 ./usr/X11R6/lib/X11/xkb/symbols/ua
 ./usr/X11R6/lib/X11/xkb/symbols/us_group2
 ./usr/X11R6/lib/X11/xkb/symbols/us_group3
+./usr/X11R6/lib/X11/xkb/symbols/uz
 ./usr/X11R6/lib/X11/xkb/symbols/vn
 ./usr/X11R6/lib/X11/xkb/symbols/xfree68
 ./usr/X11R6/lib/X11/xkb/symbols/xfree68/amiga
@@ -393,37 +428,40 @@
 ./usr/X11R6/lib/X11/xkb/types/README
 ./usr/X11R6/lib/X11/xkb/types/caps
 ./usr/X11R6/lib/X11/xkb/types/extra
+./usr/X11R6/lib/X11/xkb/types/numpad
 ./usr/X11R6/share/man/cat1/Xmark.0
 ./usr/X11R6/share/man/cat1/bdftruncate.0
 ./usr/X11R6/share/man/cat1/beforelight.0

>Unformatted:
 1.6.x
 
 From: "Greg A. Woods" <woods@weird.com>
 Reply-To: "Greg A. Woods" <woods@planix.com>
 X-send-pr-version: 3.95