Re: two files necessary for X11R7 xdm config

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

On Thu, 12 Mar 2009, Iain Hibbert wrote:

> On Wed, 11 Mar 2009, Toru Nishimura wrote:
>
> > Index: external/mit/xorg/bin/xdm/config/Makefile
> > ===================================================================
> > RCS file: /cvsroot/src/external/mit/xorg/bin/xdm/config/Makefile,v
> > retrieving revision 1.6
> > diff -c -r1.6 Makefile
> > *** external/mit/xorg/bin/xdm/config/Makefile 14 Feb 2009 13:32:12 -0000 1.6
> > --- external/mit/xorg/bin/xdm/config/Makefile 11 Mar 2009 07:12:47 -0000
> > ***************
> > *** 25,31 ****
> >      -DXPM \
> >      -DSU="su -m"
> >  ! CONFIGFILES=  GiveConsole TakeConsole \
> >     Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
> >     ${CPPSCRIPTS}
> > --- 25,31 ----
> >      -DXPM \
> >      -DSU="su -m"
> >  ! CONFIGFILES=  GiveConsole TakeConsole Xstartup Xreset \
> >     Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
> >     ${CPPSCRIPTS}
>
> I think you need to add these files to CPPSCRIPTS variable instead as they
> are not represented directly and need to be passed through cpp..?

btw I tried that also (patch below) and there is an error in the Xorg
source files, the Xstartup.cpp and Xreset.cpp files both contain the
following


XCOMM!/bin/sh
XCOMM Deregister a login. (Derived from TakeConsole as follows:)
XCOMM
BINDIR/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
        -x "XDMCONFIGDIR/Xservers" -l $DISPLAY -h "" $USER


where the Makefile is supposed to be replacing XDMCONFIGDIR but it cannot
because cpp doesn't find tokens inside quotes. Perhaps the quote marks
need removing also?  I didn't check if they fixed that in latest Xorg
sources..

regards,
iain

--- /usr/src/external/mit/xorg/bin/xdm/config/Makefile  2009-02-18 
09:05:07.000000000 +0000
+++ Makefile    2009-03-12 21:10:48.000000000 +0000
@@ -9,15 +9,17 @@ DEFAULTVT=vt05
 DEFAULTVT=     # defined empty
 .endif

-CPPSCRIPTS=    Xresources Xservers.ws Xsession xdm-config
+CPPSCRIPTS=    Xresources Xreset Xservers.ws Xsession Xstartup xdm-config

 CPPSCRIPTFLAGS_Xresources=     -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
                                -DXDM_PIXMAP=NetBSD.xpm \
                                -DXDM_BWPIXMAP=NetBSD-bw.xpm
+CPPSCRIPTFLAGS_Xreset=         -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
 CPPSCRIPTFLAGS_Xservers.ws=    -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
 CPPSCRIPTFLAGS_Xsession=       -DBINDIR=${X11BINDIR} \
                                -DMKTEMP_COMMAND=/usr/bin/mktemp \
                                -DSHELL_CMD=/bin/sh
+CPPSCRIPTFLAGS_Xstartup=       -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
 CPPSCRIPTFLAGS_xdm-config=     -DXDMDIR=${XDMDIR} \
                                -DXDMAUTHDIR=${XDMVARDIR} \
                                -DXDMLOGDIR=${XDMLOGDIR} \
@@ -38,8 +40,10 @@ FILESDIR_NetBSD-bw.xpm=      ${X11INCDIR}/X11
 FILESDIR_NetBSD-inv.xpm=${X11INCDIR}/X11/pixmaps
 FILESMODE_GiveConsole= ${BINMODE}
 FILESMODE_TakeConsole= ${BINMODE}
+FILESMODE_Xreset=      ${BINMODE}
 FILESMODE_Xsetup_0=    ${BINMODE}
 FILESMODE_Xsession=    ${BINMODE}
+FILESMODE_Xstartup=    ${BINMODE}
 FILESMODE_Xwilling=    ${BINMODE}

 CONFIGSYMLINKS=                Xservers.ws ${XDMDIR}/Xservers