Module Name:    src
Committed By:   uwe
Date:           Mon May  2 10:50:02 UTC 2022

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

Log Message:
xterm: Try to make manpage substitutions more readable.

Use X11EXTRAMANTRANSFORMS to set most of them, so that the sed(1)
syntax noise doesn't drown out the keys/values.  Add comments.

Keep using X11EXTRAMANDEFS for __app_version__ - my make-fu is too
weak to figure out how to do that properly while keeping happy
multiple levels of quoting along the way.

Same output is generated.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.

Modified files:

Index: src/external/mit/xorg/bin/xterm/Makefile.inc
diff -u src/external/mit/xorg/bin/xterm/Makefile.inc:1.3 src/external/mit/xorg/bin/xterm/Makefile.inc:1.4
--- src/external/mit/xorg/bin/xterm/Makefile.inc:1.3	Sun May  1 23:24:34 2022
+++ src/external/mit/xorg/bin/xterm/Makefile.inc	Mon May  2 10:50:02 2022
@@ -1,21 +1,34 @@
-#	$NetBSD: Makefile.inc,v 1.3 2022/05/01 23:24:34 uwe Exp $
+#	$NetBSD: Makefile.inc,v 1.4 2022/05/02 10:50:02 uwe Exp $
 
 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]*//}
 
+# my make-fu is too weak to use X11EXTRAMANTRANSFORMS to set
+# __app_version__
 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,__double_buffer__,False,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'
+	-e 's,__app_date__,${XTERM_DATE},g'
+
+
+# The standard name for this is __appmansuffix__ but xterm doesn't use it.
+X11EXTRAMANTRANSFORMS += __mansuffix__		1
+
+# XXX: FIXME: we do NOT install xpm icons distributed with xterm.
+#
+# Also, X11INCDIR was IMO not a great choice.  The fact that xpm files
+# happen to also be valid C is not reason enough to declare them
+# "includes" - this is not the way they are primarily used.
+X11EXTRAMANTRANSFORMS += __pixmapsdir__		${X11INCDIR}/X11/pixmaps
+
+# Cf. xsrc/external/mit/xterm/include/xtermcfg.h
+X11EXTRAMANTRANSFORMS += __alt_sends_esc__	False
+X11EXTRAMANTRANSFORMS += __backarrow_is_bs__	True
+X11EXTRAMANTRANSFORMS += __backarrow_is_erase__	False
+X11EXTRAMANTRANSFORMS += __default_class__	XTerm
+X11EXTRAMANTRANSFORMS += __default_termid__	420
+X11EXTRAMANTRANSFORMS += __default_termname__	xterm
+X11EXTRAMANTRANSFORMS += __delete_is_del__	Maybe
+X11EXTRAMANTRANSFORMS += __double_buffer__	False
+X11EXTRAMANTRANSFORMS += __initial_erase__	False
+X11EXTRAMANTRANSFORMS += __meta_sends_esc__	False

Reply via email to