Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update ${X11TOOL_UNXCOMM} to XFree86 4.4.0's "CppSedMagic". From the comments

Browse Source 
in Imake.rules:

 * Allow XCOMM to be preceded by whitespace and provide a means of generating
 * output lines with trailing backslashes.
 * Allow XHASH to always be substituted, even in cases where XCOMM isn't.

In particular, this fixes an issue pointed out by wiz on tech-x11, where "@@"
remains unsubstituted for "\" in "startx".
This commit is contained in:
fredb 2004-03-27 20:16:16 +00:00
parent 4cf6501fa6
commit 3dcd362c80
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
share/mk/bsd.x11.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.x11.mk,v 1.37 2004/03/26 21:29:54 fredb Exp $
# $NetBSD: bsd.x11.mk,v 1.38 2004/03/27 20:16:16 fredb Exp $
.include <bsd.init.mk>
@ -83,12 +83,15 @@ PRINTX11VERSION=awk '/^\#define XF86_VERSION_MAJOR/ {major = $$3} \
END { print "((("major") * 10000000) + (("minor") * 100000) + (("patch") * 1000) + "snap")"}' \
${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/xf86Version.h
# Commandline to convert 'XCOMM' comments and 'XHASH' to #
# Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other
# things. Transformed from the "CppSedMagic" macro from "Imake.rules".
#
X11TOOL_UNXCOMM= sed -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/^XCOMM$$/s//\#/' \
-e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/\#/' \
-e '/^XHASH[ie]/s/^XHASH/\#/'
X11TOOL_UNXCOMM= sed -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e '/^\#line *[0-9][0-9]* *.*$$/d' \
-e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
-e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
-e '/^[ ]*XHASH/s/XHASH/\#/' \
-e '/\@\@$$/s/\@\@$$/\\/'
CPPFLAGS+= -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO