--CE+1k2dSO48ffgeK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Tue, Mar 16, 2004 at 11:59:02PM +1100, Tyler Retzlaff wrote:
> On Monday 15 March 2004 02:21, Nicolas Joly wrote:
> > Hi,
> >
> > I noticed a few things about xdm(1) build using src/x11 framwork :
> >
> > 1) The xdm Xresources file is currently missing some substitutions for
> >    the 'XHASH' keyword. In that case, the xdm login banner can't use
> >    this resource file and looks diffrent (no pixmap, default fonts,
> >    ...).
> 
> sounds like a reasonable idea, will look at it further

Thanks. Perry has already commited the attached for that one
(bsd.x11.mk r1.36).

> >    A work around for this problem can be done by modifying the
> >    X11TOOL_UNXCOMM command to replace 'XHASH' keys with `#' too :
> >
> > # Commandline to convert 'XCOMM' comments and 'XHASH' to #
> > #
> > X11TOOL_UNXCOMM=        sed -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
> >                             -e '/^XCOMM$$/s//\#/' \
> >                             -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/\#/' \
> >                             -e '/^XHASH(if|else|end)/s/^XHASH/\#/'
> >
> > 2) xdm build with src/x11 does not use `prngc.c' source file as native
> >    build do. Is it expected, or was it forgotten ?
> 
> I would say overlooked, will check when I get time.

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.

--CE+1k2dSO48ffgeK
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="netbsd-x11mk.diff"

Index: share/mk/bsd.x11.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.x11.mk,v
retrieving revision 1.35
diff -u -r1.35 bsd.x11.mk
--- share/mk/bsd.x11.mk	14 Mar 2004 16:59:00 -0000	1.35
+++ share/mk/bsd.x11.mk	15 Mar 2004 16:13:44 -0000
@@ -82,11 +82,12 @@
 		     END { print "((("major") * 10000000) + (("minor") * 100000) + (("patch") * 1000) + "snap")"}' \
 		     ${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h
 
-# Commandline to convert 'XCOMM' comments to #
+# Commandline to convert 'XCOMM' comments and 'XHASH' to #
 #
 X11TOOL_UNXCOMM=	sed -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
 			    -e '/^XCOMM$$/s//\#/' \
-			    -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/\#/'
+			    -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/\#/' \
+			    -e '/^XHASH[ie]/s/^XHASH/\#/'
 
 
 CPPFLAGS+=		-DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO

--CE+1k2dSO48ffgeK--