NetBSD Problem Report #50593

From dieter.r@pandora.be  Fri Dec 25 18:31:26 2015
Return-Path: <dieter.r@pandora.be>
Received: from mail.netbsd.org (mail.NetBSD.org [199.233.217.200])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
	by mollari.NetBSD.org (Postfix) with ESMTPS id 837DE7A217
	for <gnats-bugs@gnats.NetBSD.org>; Fri, 25 Dec 2015 18:31:26 +0000 (UTC)
Message-Id: <20151225181618.35ABABDB55@simult.auwegem.be>
Date: Fri, 25 Dec 2015 19:16:18 +0100 (CET)
From: dieter.NetBSD@pandora.be
Reply-To: dieter.NetBSD@pandora.be
To: gnats-bugs@NetBSD.org
Subject: unexpanded definitions in xterm(1)
X-Send-Pr-Version: 3.95

>Number:         50593
>Category:       xsrc
>Synopsis:       unexpanded definitions in xterm(1)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    xsrc-manager
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 25 18:35:00 +0000 2015
>Closed-Date:    Fri Dec 25 22:26:52 +0000 2015
>Last-Modified:  Fri Dec 25 22:26:52 +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:/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'

>Release-Note:

>Audit-Trail:
From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/50593 CVS commit: src/external/mit/xorg/bin/xterm
Date: Fri, 25 Dec 2015 13:50:48 -0500

 Module Name:	src
 Committed By:	christos
 Date:		Fri Dec 25 18:50:48 UTC 2015

 Modified Files:
 	src/external/mit/xorg/bin/xterm: Makefile.inc

 Log Message:
 PR/50593: dieter roelants: fix unexpanded definitions in xterm(1)


 To generate a diff of this commit:
 cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xterm/Makefile.inc

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Fri, 25 Dec 2015 22:26:52 +0000
State-Changed-Why:
christos fixed it, thanks!


>Unformatted:

Home	PR Database Search