Re: Behaviour change in Xorg's xdm between 5.99.5 and 5.99.7

[Iain Hibbert <plunky%rya-online.net@localhost>]

On Thu, 22 Jan 2009, Paul Goyette wrote:
> Also noticed that Xorg's xdm doesn't display the NetBSD logo.  I no longer
> have a Xfree system available, but I could swear that xdm used to display that
> cute little devil carrying the NetBSD banner.  :)

It was just the banner and I've found the reason its not present.

- the xdm/Xresources is looking for "xorg.xpm" in the system pixmaps
  directory but it was actually in /etc/X11/xdm
  (thats in 5.0. christos fixed -current - presumably the X shows now)

- no NetBSD flag was installed with xorg

So, to fix it I've done this:

- add the NetBSD.xpm, NetBSD-bw.xpm and NetBSD-inv.xpm files to
  src/external/mit/xorg/bin/xdm/config/ directory
  (NetBSD-inv.xpm is unused but no doubt valuable)

- install pixmaps (including xorg.xpm and xorg-bw.xpm) to system pixmaps
  directory /usr/X11R7/include/X11/pixmaps

- make xdm/Xresources look for NetBSD.xpm or NetBSD-bw.xpm there

- move pixmap files to xbase.tgz (was xetc.tgz)

I don't know if there was a grand design to put them in etc, any flag
waving objections to changing it?

iain

Index: src/distrib/sets/lists/xbase/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xbase/mi,v
retrieving revision 1.70
diff -u -r1.70 mi
--- src/distrib/sets/lists/xbase/mi     25 Dec 2008 12:12:17 -0000      1.70
+++ src/distrib/sets/lists/xbase/mi     9 Feb 2009 14:51:53 -0000
@@ -1305,6 +1305,11 @@
 ./usr/X11R7/bin/xwd                                    -unknown-       xorg
 ./usr/X11R7/bin/xwininfo                               -unknown-       xorg
 ./usr/X11R7/bin/xwud                                   -unknown-       xorg
+./usr/X11R7/include/X11/pixmaps/NetBSD-bw.xpm          -unknown-       xorg
+./usr/X11R7/include/X11/pixmaps/NetBSD-inv.xpm         -unknown-       xorg
+./usr/X11R7/include/X11/pixmaps/NetBSD.xpm             -unknown-       xorg
+./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm            -unknown-       xorg
+./usr/X11R7/include/X11/pixmaps/xorg.xpm               -unknown-       xorg
 ./usr/X11R7/lib/X11/XErrorDB                           -unknown-       xorg
 ./usr/X11R7/lib/X11/XKeysymDB                          -unknown-       xorg
 ./usr/X11R7/lib/X11/Xcms.txt                           -unknown-       xorg
Index: src/distrib/sets/lists/xetc/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xetc/mi,v
retrieving revision 1.11
diff -u -r1.11 mi
--- src/distrib/sets/lists/xetc/mi      5 Dec 2008 18:56:47 -0000       1.11
+++ src/distrib/sets/lists/xetc/mi      9 Feb 2009 14:51:53 -0000
@@ -46,8 +46,8 @@
 ./etc/X11/xdm/Xwilling                                 -unknown-       xorg
 ./etc/X11/xdm/xdm-config                               -unknown-       x11
 ./etc/X11/xdm/xdm-config                               -unknown-       xorg
-./etc/X11/xdm/xorg-bw.xpm                              -unknown-       xorg
-./etc/X11/xdm/xorg.xpm                                 -unknown-       xorg
+./etc/X11/xdm/xorg-bw.xpm                              xetc-obsolete   obsolete
+./etc/X11/xdm/xorg.xpm                                 xetc-obsolete   obsolete
 ./etc/X11/xinit/xinitrc                                        -unknown-       
x11
 ./etc/X11/xinit/xinitrc                                        -unknown-       
xorg
 ./etc/X11/xserver/SecurityPolicy                       -unknown-       x11
Index: src/external/mit/xorg/bin/xdm/config/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xdm/config/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- src/external/mit/xorg/bin/xdm/config/Makefile       19 Jan 2009 04:38:36 
-0000      1.4
+++ src/external/mit/xorg/bin/xdm/config/Makefile       9 Feb 2009 14:51:53 
-0000
@@ -11,9 +11,9 @@
 
 CPPSCRIPTS=    Xresources Xservers.ws Xsession xdm-config 
 
-CPPSCRIPTFLAGS_Xresources=     -DXPM -DBITMAPDIR=${XDMDIR} \
-                               -DXDM_PIXMAP=xorg.xpm \
-                               -DXDM_BWPIXMAP=xorg-bw.xpm
+CPPSCRIPTFLAGS_Xresources=     -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
+                               -DXDM_PIXMAP=NetBSD.xpm \
+                               -DXDM_BWPIXMAP=NetBSD-bw.xpm
 CPPSCRIPTFLAGS_Xservers.ws=    -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
 CPPSCRIPTFLAGS_Xsession=       -DBINDIR=${X11BINDIR} \
                                -DMKTEMP_COMMAND=/usr/bin/mktemp \
@@ -28,10 +28,14 @@
 CONFIGFILES=           GiveConsole TakeConsole \
                        Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
                        ${CPPSCRIPTS} 
-FILES=                 xorg-bw.xpm xorg.xpm
+FILES=                 xorg-bw.xpm xorg.xpm \
+                       NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm
 FILESDIR=              ${XDMDIR}
-FILESDIR_XFree86.xpm=  ${X11INCDIR}/X11/pixmaps
-FILESDIR_XFree86bw.xpm=        ${X11INCDIR}/X11/pixmaps
+FILESDIR_xorg.xpm=     ${X11INCDIR}/X11/pixmaps
+FILESDIR_xorg-bw.xpm=  ${X11INCDIR}/X11/pixmaps
+FILESDIR_NetBSD.xpm=   ${X11INCDIR}/X11/pixmaps
+FILESDIR_NetBSD-bw.xpm=        ${X11INCDIR}/X11/pixmaps
+FILESDIR_NetBSD-inv.xpm=${X11INCDIR}/X11/pixmaps
 FILESMODE_GiveConsole= ${BINMODE}
 FILESMODE_TakeConsole= ${BINMODE}
 FILESMODE_Xsetup_0=    ${BINMODE}