Re: two files necessary for X11R7 xdm config

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

On Wed, 11 Mar 2009, Toru Nishimura wrote:

> The issue is that X11R7 xdm now needs two more shell scripts
> (refer /etc/X11/xdm/xdm-config, PLS) and NetBSD standard
> installation does not include them.

it does seem so

> 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..?

> ***************
> *** 38,43 ****
> --- 38,45 ----
>  FILESDIR_NetBSD-inv.xpm=${X11INCDIR}/X11/pixmaps
>  FILESMODE_GiveConsole= ${BINMODE}
>  FILESMODE_TakeConsole= ${BINMODE}
> + FILESMODE_Xstartup= ${BINMODE}
> + FILESMODE_Xreset= ${BINMODE}

please sort alphabetically

> Index: distrib/sets/lists/xetc/mi
> ===================================================================
> RCS file: /cvsroot/src/distrib/sets/lists/xetc/mi,v
> retrieving revision 1.12
> diff -c -r1.12 mi
> *** distrib/sets/lists/xetc/mi 11 Feb 2009 10:25:14 -0000 1.12
> --- distrib/sets/lists/xetc/mi 11 Mar 2009 07:12:47 -0000
> ***************
> *** 44,49 ****
> --- 44,51 ----
>  ./etc/X11/xdm/Xsetup_0     -unknown- xorg
>  ./etc/X11/xdm/Xwilling     -unknown- x11
>  ./etc/X11/xdm/Xwilling     -unknown- xorg
> + ./etc/X11/xdm/Xstartup     -unknown- xorg
> + ./etc/X11/xdm/Xreset     -unknown- xorg

same here :)

iain