xsrc/50593: unexpanded definitions in xterm(1)

[dieter.NetBSD%pandora.be@localhost]

>Number:         50593
>Category:       xsrc
>Synopsis:       unexpanded definitions in xterm(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 25 18:35:00 +0000 2015
>Originator:     dieter roelants
>Release:        NetBSD 7.99.24
>Organization:
>Environment:
System: NetBSD simult.auwegem.be 7.99.24 NetBSD 7.99.24 (SIMULT) #120: Sat Dec 19 14:35:20 CET 2015 dieter%simult.auwegem.be@localhost:/build/obj.amd64.current/sys/arch/amd64/compile/SIMULT amd64
Architecture: x86_64
Machine: amd64
>Description:
	[I put this in xsrc as sw-bug because it's a build issue,
	I hope that's ok.]

	The xterm and resize man pages contain words that obviously
	should have been substituted at build time but weren't.
>How-To-Repeat:
	PAGER='fgrep __' man xterm
>Fix:

The following patch adds the necessary substitutions, based on the
minstall script in the xterm distribution and the defaults set by
its configure script. I set the pixmaps dir to the one that exists
in my /usr/X11R7/, although the xterm icons are apparently not
installed anywhere.

Index: external/mit/xorg/bin/xterm/Makefile.inc
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/bin/xterm/Makefile.inc,v
retrieving revision 1.1
diff -p -u -u -r1.1 Makefile.inc
--- external/mit/xorg/bin/xterm/Makefile.inc	14 Oct 2008 23:37:19 -0000	1.1
+++ external/mit/xorg/bin/xterm/Makefile.inc	25 Dec 2015 18:04:52 -0000
@@ -1,3 +1,20 @@
 #	$NetBSD: Makefile.inc,v 1.1 2008/10/14 23:37:19 cube Exp $
 
-X11EXTRAMANDEFS+=	-e 's,__mansuffix__,1,g'
+VERSION_H=	${X11SRCDIR.xterm}/version.h
+XTERM_DATE=	${:!${TOOL_GREP} XTERM_DATE ${VERSION_H}!:C/^[^0-9]*//}
+XTERM_PATCH=	${:!${TOOL_GREP} XTERM_PATCH ${VERSION_H}!:C/^[^0-9]*//}
+
+X11EXTRAMANDEFS+= \
+	-e 's,__app_version__,Patch \#${XTERM_PATCH},g' \
+	-e 's,__app_date__,${XTERM_DATE},g' \
+	-e 's,__default_termname__,xterm,g' \
+	-e 's,__default_termid__,420,g' \
+	-e 's,__alt_sends_esc__,False,g' \
+	-e 's,__meta_sends_esc__,False,g' \
+	-e 's,__backarrow_is_bs__,True,g' \
+	-e 's,__backarrow_is_erase__,False,g' \
+	-e 's,__delete_is_del__,Maybe,g' \
+	-e 's,__initial_erase__,False,g' \
+	-e 's,__default_class__,XTerm,g' \
+	-e 's,__mansuffix__,1,g' \
+	-e 's,__pixmapsdir__,${X11INCDIR}/X11/pixmaps,g'