[src/trunk]: src/x11/bin/xinit - -DXFREE86 if we build an XFree86 server.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a21b9625844e
branches:  trunk
changeset: 565949:a21b9625844e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Apr 24 03:42:07 2004 +0000

description:
- -DXFREE86 if we build an XFree86 server.
- use /dev/urandom & hexdump to generate cookies.

mostly as-is from PR#25239.

XXX  the #ifdef XFREE86 line in xinit.c is simply for an error message to
XXX  include the text "XFree86     XFree86 displays" in an array of char *,
XXX  that is used to display an error message.  i think nearly all the
XXX  netbsd servers need to optionally be added to this list....

diffstat:

 x11/bin/xinit/Makefile |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r ecd47b469d07 -r a21b9625844e x11/bin/xinit/Makefile
--- a/x11/bin/xinit/Makefile    Sat Apr 24 02:59:19 2004 +0000
+++ b/x11/bin/xinit/Makefile    Sat Apr 24 03:42:07 2004 +0000
@@ -1,14 +1,24 @@
-#      $NetBSD: Makefile,v 1.3 2003/09/13 21:50:52 lukem Exp $
+#      $NetBSD: Makefile,v 1.4 2004/04/24 03:42:07 mrg Exp $
 
 .include <bsd.own.mk>
 
+.include "../../Xserver/Makefile.common"
+
 PROG=  xinit
 MAN=   xinit.1 startx.1
 
-CPPFLAGS+=-DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\"
+CPPFLAGS+=     -DHAS_VFORK ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
+
+.if ${XSERVER_XFREE86} != "no"
+CPPFLAGS+=     -DXFREE86
+.endif
 
 CPPSCRIPTS=    startx xinitrc
-CPPSCRIPTFLAGS=        -DXINITDIR=${X11LIBDIR}/xinit -DBINDIR=${X11BINDIR}
+CPPSCRIPTFLAGS_xinitrc=        -DXINITDIR=${X11LIBDIR}/xinit -DBINDIR=${X11BINDIR}
+CPPSCRIPTFLAGS_startx= -DXINITDIR=${X11LIBDIR}/xinit -DBINDIR=${X11BINDIR} \
+               -DHAS_COOKIE_MAKER \
+               -DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
+
 SCRIPTS=       startx
 FILES=         xinitrc
 FILESDIR=      ${X11LIBDIR}/xinit