Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/bin/xdm/config make this work:
details: https://anonhg.NetBSD.org/src/rev/39357b7162ec
branches: trunk
changeset: 449416:39357b7162ec
user: christos <christos%NetBSD.org@localhost>
date: Wed Mar 06 04:43:50 2019 +0000
description:
make this work:
- fix sed rules
- change our own copy of Xresources from cpp to sed
diffstat:
external/mit/xorg/bin/xdm/config/Makefile | 22 ++--
external/mit/xorg/bin/xdm/config/Xresources.cpp | 108 ------------------------
external/mit/xorg/bin/xdm/config/Xresources.in | 101 ++++++++++++++++++++++
3 files changed, 114 insertions(+), 117 deletions(-)
diffs (272 lines):
diff -r 85c9689ebb93 -r 39357b7162ec external/mit/xorg/bin/xdm/config/Makefile
--- a/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 06 03:38:30 2019 +0000
+++ b/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 06 04:43:50 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/03/05 08:35:35 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2019/03/06 04:43:50 christos Exp $
.include <bsd.own.mk>
@@ -23,18 +23,22 @@
UUDECODE_FILES= NetBSD-flag.png
SEDSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
+.for f in ${SEDSCRIPTS}
+FILESBUILD_$f=yes
+.endfor
-SUFFIXES = .in
+.SUFFIXES: .in
.in:
- $(TOOL_SED) \
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} \
-e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
-e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
-e 's,XDM_PIXMAP,NetBSD.xpm,' \
-e 's,XDM_BWPIXMAP,NetBSD-bw.xpm,' \
-e 's,BINDIR,$(X11BINDIR),' \
-e 's,DEFAULTVT,$(DEFAULTVT),' \
- -e 's,XDMDIR,$(XDMDIR),'
+ -e 's,XDMDIR,$(XDMDIR),' \
-e 's,XDMLOGDIR,$(XDMLOGDIR),' \
-e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
-e 's,XDMPIDDIR,$(XDMPIDDIR),' \
@@ -50,14 +54,14 @@
-e 's,MKTEMP_COMMAND,/usr/bin/mktemp,' \
-e 's,XCOMM,\#,' \
-e 's,XHASH,\#,' \
- -e 's,NLBS,\\n\\,' \
- -e 's,BS,\\,' \
- -e 's,/\*\*/,,g'
+ -e 's,\<NLBS\>,\\n\\,' \
+ -e 's,\<BS\>,\\,' \
+ -e 's,/\*\*/,,g' < ${.IMPSRC} > ${.TARGET}
-CONFIGFILES= GiveConsole TakeConsole \
+CONFIGFILES+= GiveConsole TakeConsole \
Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
${SEDSCRIPTS}
-FILES= xorg-bw.xpm xorg.xpm \
+FILES+= xorg-bw.xpm xorg.xpm \
NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm \
NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
FILESDIR= ${XDMDIR}
diff -r 85c9689ebb93 -r 39357b7162ec external/mit/xorg/bin/xdm/config/Xresources.cpp
--- a/external/mit/xorg/bin/xdm/config/Xresources.cpp Wed Mar 06 03:38:30 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-!
-!
-!
-!
-!
-
-Xcursor.theme: whiteglass
-
-#define BS \ /* cpp can be trickier than m4 */
-#define NLBS \n\ /* don't remove these comments */
-xlogin*login.translations: #override BS
- Ctrl<Key>R: abort-display()NLBS
- <Key>F1: set-session-argument(failsafe) finish-field()NLBS
- <Key>Delete: delete-character()NLBS
- <Key>Left: move-backward-character()NLBS
- <Key>Right: move-forward-character()NLBS
- <Key>Home: move-to-begining()NLBS
- <Key>End: move-to-end()NLBS
- Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
- <Key>KP_Enter: set-session-argument() finish-field()NLBS
- Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
- <Key>Return: set-session-argument() finish-field()
-
-xlogin*greeting: Welcome to CLIENTHOST
-xlogin*namePrompt: \040\040\040\040\040\040\040Login:
-xlogin*fail: Login incorrect
-
-XHASHif WIDTH > 800
-xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1
-xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1
-xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
-xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
-xlogin*greetFace: Serif-24:bold:italic
-xlogin*face: Helvetica-14
-xlogin*promptFace: Helvetica-14:bold
-xlogin*failFace: Helvetica-14:bold
-XHASHelse
-xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
-xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
-xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
-xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-xlogin*greetFace: Serif-18:bold:italic
-xlogin*face: Helvetica-12
-xlogin*promptFace: Helvetica-12:bold
-xlogin*failFace: Helvetica-14:bold
-XHASHendif
-
-XHASHifdef COLOR
-xlogin*borderWidth: 1
-xlogin*frameWidth: 5
-xlogin*innerFramesWidth: 2
-xlogin*shdColor: grey30
-xlogin*hiColor: grey90
-xlogin*background: grey
-!xlogin*foreground: darkgreen
-xlogin*greetColor: Blue3
-xlogin*failColor: red
-*Foreground: black
-*Background: #fffff0
-XHASHelse
-xlogin*borderWidth: 3
-xlogin*frameWidth: 0
-xlogin*innerFramesWidth: 1
-xlogin*shdColor: black
-xlogin*hiColor: black
-XHASHendif
-#ifdef XPM
-XHASHif PLANES >= 8
-XHASHif 1
-! XDM has no support for images with alpha channel, so we precomputed a
-! NetBSD logo with fixed background and use it here. If you change this
-! file to use another background colour, you need to create a new logo
-! xpm file. This can be done with netpbm from pkgsrc:
-!
-! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm
-!
-! (all files in BITMAPDIR)
-!
-xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm
-xlogin*useShape: false
-XHASHelse
-!
-! This is the stock method, using a coloured xpm file and a b&w mask xpm.
-! Antialiased borders look ugly this way, but it works with arbitrary
-! background colours.
-!
-xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
-xlogin*useShape: true
-XHASHendif
-XHASHelse
-xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
-xlogin*useShape: true
-XHASHendif
-xlogin*logoPadding: 10
-#endif /* XPM */
-
-XConsole.text.geometry: 480x130
-XConsole.verbose: true
-XConsole*iconic: true
-XConsole*font: fixed
-
-Chooser*geometry: 700x500+300+200
-Chooser*allowShellResize: false
-Chooser*viewport.forceBars: true
-Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-*
-Chooser*label.label: XDMCP Host Menu from CLIENTHOST
-Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
-Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-*
diff -r 85c9689ebb93 -r 39357b7162ec external/mit/xorg/bin/xdm/config/Xresources.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/xdm/config/Xresources.in Wed Mar 06 04:43:50 2019 +0000
@@ -0,0 +1,101 @@
+Xcursor.theme: whiteglass
+
+xlogin*login.translations: #override BS
+ Ctrl<Key>R: abort-display()NLBS
+ <Key>F1: set-session-argument(failsafe) finish-field()NLBS
+ <Key>Delete: delete-character()NLBS
+ <Key>Left: move-backward-character()NLBS
+ <Key>Right: move-forward-character()NLBS
+ <Key>Home: move-to-begining()NLBS
+ <Key>End: move-to-end()NLBS
+ Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
+ <Key>KP_Enter: set-session-argument() finish-field()NLBS
+ Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
+ <Key>Return: set-session-argument() finish-field()
+
+xlogin*greeting: Welcome to CLIENTHOST
+xlogin*namePrompt: \040\040\040\040\040\040\040Login:
+xlogin*fail: Login incorrect
+
+XHASHif WIDTH > 800
+xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*greetFace: Serif-24:bold:italic
+xlogin*face: Helvetica-14
+xlogin*promptFace: Helvetica-14:bold
+xlogin*failFace: Helvetica-14:bold
+XHASHelse
+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+xlogin*greetFace: Serif-18:bold:italic
+xlogin*face: Helvetica-12
+xlogin*promptFace: Helvetica-12:bold
+xlogin*failFace: Helvetica-14:bold
+XHASHendif
+
+XHASHifdef COLOR
+xlogin*borderWidth: 1
+xlogin*frameWidth: 5
+xlogin*innerFramesWidth: 2
+xlogin*shdColor: grey30
+xlogin*hiColor: grey90
+xlogin*background: grey
+xlogin*inpColor: grey80
+!xlogin*foreground: darkgreen
+xlogin*greetColor: Blue3
+xlogin*failColor: red
+*Foreground: black
+*Background: #fffff0
+XHASHelse
+xlogin*borderWidth: 3
+xlogin*frameWidth: 0
+xlogin*innerFramesWidth: 1
+xlogin*shdColor: black
+xlogin*hiColor: black
+XHASHendif
+XHASHif 1
+! XDM has no support for images with alpha channel, so we precomputed a
+! NetBSD logo with fixed background and use it here. If you change this
+! file to use another background colour, you need to create a new logo
+! xpm file. This can be done with netpbm from pkgsrc:
+!
+! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm
+!
+! (all files in BITMAPDIR)
+!
+xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm
+xlogin*useShape: false
+XHASHelse
+!
+! This is the stock method, using a coloured xpm file and a b&w mask xpm.
+! Antialiased borders look ugly this way, but it works with arbitrary
+! background colours.
+!
+#ifdef XPM
+XHASHif PLANES >= 8
+xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
+xlogin*useShape: true
+XHASHendif
+XHASHelse
+xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
+xlogin*useShape: true
+XHASHendif
+xlogin*logoPadding: 10
+#endif /* XPM */
+
+XConsole.text.geometry: 480x130
+XConsole.verbose: true
+XConsole*iconic: true
+XConsole*font: fixed
+
+Chooser*geometry: 700x500+300+200
+Chooser*allowShellResize: false
+Chooser*viewport.forceBars: true
+Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-*
+Chooser*label.label: XDMCP Host Menu from CLIENTHOST
+Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
+Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-*
Home |
Main Index |
Thread Index |
Old Index