Sun Mar 15 20:32:00 2009 UTC ()
Pull up following revision(s) (requested by plunky in ticket #574):
	distrib/sets/lists/xetc/mi: revision 1.13
	external/mit/xorg/bin/xdm/config/Makefile: revision 1.7
add the xdm config files Xstartup and Xreset to the build


(snj)
diff -r1.10.2.2 -r1.10.2.3 src/distrib/sets/lists/xetc/mi
diff -r1.2.8.3 -r1.2.8.4 src/external/mit/xorg/bin/xdm/config/Makefile
cvs diff -r1.10.2.2 -r1.10.2.3 src/distrib/sets/lists/xetc/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xetc/mi 2009/02/18 01:10:57 1.10.2.2
+++ src/distrib/sets/lists/xetc/mi 2009/03/15 20:31:59 1.10.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.10.2.2 2009/02/18 01:10:57 snj Exp $ 1# $NetBSD: mi,v 1.10.2.3 2009/03/15 20:31:59 snj Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/X11/fs/config -unknown- x11 5./etc/X11/fs/config -unknown- x11
6./etc/X11/fs/config -unknown- xorg 6./etc/X11/fs/config -unknown- xorg
7./etc/X11/lbxproxy/AtomControl -unknown- x11 7./etc/X11/lbxproxy/AtomControl -unknown- x11
8./etc/X11/lbxproxy/AtomControl -unknown- xorg 8./etc/X11/lbxproxy/AtomControl -unknown- xorg
9./etc/X11/proxymngr/pmconfig -unknown- x11 9./etc/X11/proxymngr/pmconfig -unknown- x11
10./etc/X11/proxymngr/pmconfig -unknown- xorg 10./etc/X11/proxymngr/pmconfig -unknown- xorg
11./etc/X11/rstart/commands/@List -unknown- x11 11./etc/X11/rstart/commands/@List -unknown- x11
12./etc/X11/rstart/commands/ListContexts -unknown- x11 12./etc/X11/rstart/commands/ListContexts -unknown- x11
13./etc/X11/rstart/commands/ListGenericCommands -unknown- x11 13./etc/X11/rstart/commands/ListGenericCommands -unknown- x11
14./etc/X11/rstart/commands/x -unknown- x11 14./etc/X11/rstart/commands/x -unknown- x11
@@ -22,36 +22,38 @@ @@ -22,36 +22,38 @@
22./etc/X11/rstart/contexts/x -unknown- x11 22./etc/X11/rstart/contexts/x -unknown- x11
23./etc/X11/rstart/contexts/x11 -unknown- x11 23./etc/X11/rstart/contexts/x11 -unknown- x11
24./etc/X11/rstart/contexts/x11r6 -unknown- x11 24./etc/X11/rstart/contexts/x11r6 -unknown- x11
25./etc/X11/twm/system.twmrc -unknown- x11 25./etc/X11/twm/system.twmrc -unknown- x11
26./etc/X11/twm/system.twmrc -unknown- xorg 26./etc/X11/twm/system.twmrc -unknown- xorg
27./etc/X11/xdm/GiveConsole -unknown- x11 27./etc/X11/xdm/GiveConsole -unknown- x11
28./etc/X11/xdm/GiveConsole -unknown- xorg 28./etc/X11/xdm/GiveConsole -unknown- xorg
29./etc/X11/xdm/TakeConsole -unknown- x11 29./etc/X11/xdm/TakeConsole -unknown- x11
30./etc/X11/xdm/TakeConsole -unknown- xorg 30./etc/X11/xdm/TakeConsole -unknown- xorg
31./etc/X11/xdm/Xaccess -unknown- x11 31./etc/X11/xdm/Xaccess -unknown- x11
32./etc/X11/xdm/Xaccess -unknown- xorg 32./etc/X11/xdm/Xaccess -unknown- xorg
33./etc/X11/xdm/Xresources -unknown- x11 33./etc/X11/xdm/Xresources -unknown- x11
34./etc/X11/xdm/Xresources -unknown- xorg 34./etc/X11/xdm/Xresources -unknown- xorg
 35./etc/X11/xdm/Xreset -unknown- xorg
35./etc/X11/xdm/Xservers -unknown- x11 36./etc/X11/xdm/Xservers -unknown- x11
36./etc/X11/xdm/Xservers -unknown- xorg 37./etc/X11/xdm/Xservers -unknown- xorg
37./etc/X11/xdm/Xservers.fs -unknown- x11 38./etc/X11/xdm/Xservers.fs -unknown- x11
38./etc/X11/xdm/Xservers.fs -unknown- xorg 39./etc/X11/xdm/Xservers.fs -unknown- xorg
39./etc/X11/xdm/Xservers.ws -unknown- x11 40./etc/X11/xdm/Xservers.ws -unknown- x11
40./etc/X11/xdm/Xservers.ws -unknown- xorg 41./etc/X11/xdm/Xservers.ws -unknown- xorg
41./etc/X11/xdm/Xsession -unknown- x11 42./etc/X11/xdm/Xsession -unknown- x11
42./etc/X11/xdm/Xsession -unknown- xorg 43./etc/X11/xdm/Xsession -unknown- xorg
43./etc/X11/xdm/Xsetup_0 -unknown- x11 44./etc/X11/xdm/Xsetup_0 -unknown- x11
44./etc/X11/xdm/Xsetup_0 -unknown- xorg 45./etc/X11/xdm/Xsetup_0 -unknown- xorg
 46./etc/X11/xdm/Xstartup -unknown- xorg
45./etc/X11/xdm/Xwilling -unknown- x11 47./etc/X11/xdm/Xwilling -unknown- x11
46./etc/X11/xdm/Xwilling -unknown- xorg 48./etc/X11/xdm/Xwilling -unknown- xorg
47./etc/X11/xdm/xdm-config -unknown- x11 49./etc/X11/xdm/xdm-config -unknown- x11
48./etc/X11/xdm/xdm-config -unknown- xorg 50./etc/X11/xdm/xdm-config -unknown- xorg
49./etc/X11/xdm/xorg-bw.xpm xetc-obsolete obsolete 51./etc/X11/xdm/xorg-bw.xpm xetc-obsolete obsolete
50./etc/X11/xdm/xorg.xpm xetc-obsolete obsolete 52./etc/X11/xdm/xorg.xpm xetc-obsolete obsolete
51./etc/X11/xinit/xinitrc -unknown- x11 53./etc/X11/xinit/xinitrc -unknown- x11
52./etc/X11/xinit/xinitrc -unknown- xorg 54./etc/X11/xinit/xinitrc -unknown- xorg
53./etc/X11/xserver/SecurityPolicy -unknown- x11 55./etc/X11/xserver/SecurityPolicy -unknown- x11
54./etc/X11/xsm/system.xsm -unknown- x11 56./etc/X11/xsm/system.xsm -unknown- x11
55./etc/X11/xsm/system.xsm -unknown- xorg 57./etc/X11/xsm/system.xsm -unknown- xorg
56./etc/fonts/conf.d/10-autohint.conf -unknown- xorg 58./etc/fonts/conf.d/10-autohint.conf -unknown- xorg
57./etc/fonts/conf.d/10-no-sub-pixel.conf -unknown- xorg 59./etc/fonts/conf.d/10-no-sub-pixel.conf -unknown- xorg
cvs diff -r1.2.8.3 -r1.2.8.4 src/external/mit/xorg/bin/xdm/config/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xdm/config/Makefile 2009/02/18 01:10:57 1.2.8.3
+++ src/external/mit/xorg/bin/xdm/config/Makefile 2009/03/15 20:31:59 1.2.8.4
@@ -1,54 +1,58 @@ @@ -1,54 +1,58 @@
1# $NetBSD: Makefile,v 1.2.8.3 2009/02/18 01:10:57 snj Exp $ 1# $NetBSD: Makefile,v 1.2.8.4 2009/03/15 20:31:59 snj Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# native only gives DEFAULTVT for i386 and amd64. 5# native only gives DEFAULTVT for i386 and amd64.
6.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" 6.if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
7DEFAULTVT=vt05 7DEFAULTVT=vt05
8.else 8.else
9DEFAULTVT= # defined empty 9DEFAULTVT= # defined empty
10.endif 10.endif
11 11
12CPPSCRIPTS= Xresources Xservers.ws Xsession xdm-config  12CPPSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
13 13
14CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \ 14CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
15 -DXDM_PIXMAP=NetBSD.xpm \ 15 -DXDM_PIXMAP=NetBSD.xpm \
16 -DXDM_BWPIXMAP=NetBSD-bw.xpm 16 -DXDM_BWPIXMAP=NetBSD-bw.xpm
 17CPPSCRIPTFLAGS_Xreset= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
17CPPSCRIPTFLAGS_Xservers.ws= -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT} 18CPPSCRIPTFLAGS_Xservers.ws= -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
18CPPSCRIPTFLAGS_Xsession= -DBINDIR=${X11BINDIR} \ 19CPPSCRIPTFLAGS_Xsession= -DBINDIR=${X11BINDIR} \
19 -DMKTEMP_COMMAND=/usr/bin/mktemp \ 20 -DMKTEMP_COMMAND=/usr/bin/mktemp \
20 -DSHELL_CMD=/bin/sh 21 -DSHELL_CMD=/bin/sh
 22CPPSCRIPTFLAGS_Xstartup= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
21CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${XDMDIR} \ 23CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${XDMDIR} \
22 -DXDMAUTHDIR=${XDMVARDIR} \ 24 -DXDMAUTHDIR=${XDMVARDIR} \
23 -DXDMLOGDIR=${XDMLOGDIR} \ 25 -DXDMLOGDIR=${XDMLOGDIR} \
24 -DXDMPIDDIR=${XDMPIDDIR} \ 26 -DXDMPIDDIR=${XDMPIDDIR} \
25 -DXPM \ 27 -DXPM \
26 -DSU="su -m" 28 -DSU="su -m"
27 29
28CONFIGFILES= GiveConsole TakeConsole \ 30CONFIGFILES= GiveConsole TakeConsole \
29 Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \ 31 Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
30 ${CPPSCRIPTS}  32 ${CPPSCRIPTS}
31FILES= xorg-bw.xpm xorg.xpm \ 33FILES= xorg-bw.xpm xorg.xpm \
32 NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm 34 NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm
33FILESDIR= ${XDMDIR} 35FILESDIR= ${XDMDIR}
34FILESDIR_xorg.xpm= ${X11INCDIR}/X11/pixmaps 36FILESDIR_xorg.xpm= ${X11INCDIR}/X11/pixmaps
35FILESDIR_xorg-bw.xpm= ${X11INCDIR}/X11/pixmaps 37FILESDIR_xorg-bw.xpm= ${X11INCDIR}/X11/pixmaps
36FILESDIR_NetBSD.xpm= ${X11INCDIR}/X11/pixmaps 38FILESDIR_NetBSD.xpm= ${X11INCDIR}/X11/pixmaps
37FILESDIR_NetBSD-bw.xpm= ${X11INCDIR}/X11/pixmaps 39FILESDIR_NetBSD-bw.xpm= ${X11INCDIR}/X11/pixmaps
38FILESDIR_NetBSD-inv.xpm=${X11INCDIR}/X11/pixmaps 40FILESDIR_NetBSD-inv.xpm=${X11INCDIR}/X11/pixmaps
39FILESMODE_GiveConsole= ${BINMODE} 41FILESMODE_GiveConsole= ${BINMODE}
40FILESMODE_TakeConsole= ${BINMODE} 42FILESMODE_TakeConsole= ${BINMODE}
 43FILESMODE_Xreset= ${BINMODE}
41FILESMODE_Xsetup_0= ${BINMODE} 44FILESMODE_Xsetup_0= ${BINMODE}
42FILESMODE_Xsession= ${BINMODE} 45FILESMODE_Xsession= ${BINMODE}
 46FILESMODE_Xstartup= ${BINMODE}
43FILESMODE_Xwilling= ${BINMODE} 47FILESMODE_Xwilling= ${BINMODE}
44 48
45CONFIGSYMLINKS= Xservers.ws ${XDMDIR}/Xservers 49CONFIGSYMLINKS= Xservers.ws ${XDMDIR}/Xservers
46 50
47.PATH: ${X11SRCDIR.xdm}/config 51.PATH: ${X11SRCDIR.xdm}/config
48 52
49.include "../Makefile.xdm" 53.include "../Makefile.xdm"
50 54
51CPPSCRIPTFLAGS_xdm-config+= -DCHOOSERPATH=${XDMCHOOSERPATH} 55CPPSCRIPTFLAGS_xdm-config+= -DCHOOSERPATH=${XDMCHOOSERPATH}
52 56
53.include <bsd.x11.mk> 57.include <bsd.x11.mk>
54.include <bsd.prog.mk> 58.include <bsd.prog.mk>