install/40508: Installed /etc/X11/xdm/Xresources file is broken

[kivinen%iki.fi@localhost]

>Number:         40508
>Category:       install
>Synopsis:       Xresources file has errors
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    install-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 28 20:30:00 +0000 2009
>Originator:     Tero Kivinen
>Release:        NetBSD 5.0_BETA
>Organization:
>Environment:
System: NetBSD haste.i.kivinen.iki.fi 5.0_BETA NetBSD 5.0_BETA (GENERIC) #0: 
Sat Jan 24 19:01:52 EET 2009 root@:/usr/obj/sys/arch/i386/compile/GENERIC i386
Architecture: i386
Machine: i386
>Description:

        The installed /etc/X11/xdm/Xresources file has errors. When
        xdm is started it complains about unbalanced #if. The line 30
        has #if WIDTH > 800 that is not terminated by matching #endif
        at all. I guess the #endif should be on the line 39.

        The Xresources file also refers to the
        /usr/X11R7/include/X11/pixmapcs/xorg.xpm and
        /usr/X11R7/include/X11/pixmapcs/xorg-bw.xpm but those files do
        not exists at those paths. They are at /etc/X11/xdm directory. 

>How-To-Repeat:

        Install NetBSD 5.0 BETA and notice that /var/log/xdm.log file
        complains about those errors. 

>Fix:

        Here is a diff:
----------------------------------------------------------------------
--- /usr/destdir/etc/X11/xdm/Xresources 2009-01-24 18:43:55.000000000 +0200
+++ /etc/X11/xdm/Xresources     2009-01-28 20:24:31.000000000 +0200
@@ -36,6 +36,7 @@
 xlogin*face:           Helvetica-18
 xlogin*promptFace:     Helvetica-18:bold
 xlogin*failFace:       Helvetica-18:bold
+#endif
 
 #ifdef COLOR
 xlogin*borderWidth: 1
@@ -58,9 +59,9 @@
 #endif
 
 #if PLANES >= 8
-xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps/xorg.xpm
+xlogin*logoFileName: /etc/X11/xdm/xorg.xpm
 #else
-xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps/xorg-bw.xpm
+xlogin*logoFileName: /etc/X11/xdm/xorg-bw.xpm
 #endif
 xlogin*useShape: true
 xlogin*logoPadding: 10