Module Name: src
Committed By: mrg
Date: Sun Sep 11 05:54:00 UTC 2022
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xdebug: mi
src/external/mit/xorg/bin: Makefile
Log Message:
add missing showfont(1). remove obsolete comment.
To generate a diff of this commit:
cvs rdiff -u -r1.170 -r1.171 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.170 src/distrib/sets/lists/xbase/mi:1.171
--- src/distrib/sets/lists/xbase/mi:1.170 Fri Jul 15 00:16:04 2022
+++ src/distrib/sets/lists/xbase/mi Sun Sep 11 05:54:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.170 2022/07/15 00:16:04 mrg Exp $
+# $NetBSD: mi,v 1.171 2022/09/11 05:54:00 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -58,6 +58,7 @@
./usr/X11R7/bin/revpath xbase-revpath-bin xorg
./usr/X11R7/bin/sessreg xbase-sessreg-bin xorg
./usr/X11R7/bin/setxkbmap xbase-setxkbmap-bin xorg
+./usr/X11R7/bin/showfont xbase-showfont-bin xorg
./usr/X11R7/bin/showrgb xbase-rgb-bin xorg
./usr/X11R7/bin/smproxy xbase-smproxy-bin xorg
./usr/X11R7/bin/ssh-askpass xbase-ssh-askpass-bin xorg
@@ -1320,6 +1321,7 @@
./usr/X11R7/man/cat1/revpath.0 xbase-revpath-catman .cat,xorg
./usr/X11R7/man/cat1/sessreg.0 xbase-sessreg-catman .cat,xorg
./usr/X11R7/man/cat1/setxkbmap.0 xbase-setxkbmap-catman .cat,xorg
+./usr/X11R7/man/cat1/showfont.0 xbase-showfont-catman .cat,xorg
./usr/X11R7/man/cat1/showrgb.0 xbase-rgb-catman .cat,xorg
./usr/X11R7/man/cat1/smproxy.0 xbase-smproxy-catman .cat,xorg
./usr/X11R7/man/cat1/ssh-askpass.0 xbase-ssh-askpass-catman .cat,xorg
@@ -1471,6 +1473,7 @@
./usr/X11R7/man/html1/revpath.html xbase-revpath-htmlman html,xorg
./usr/X11R7/man/html1/sessreg.html xbase-sessreg-htmlman html,xorg
./usr/X11R7/man/html1/setxkbmap.html xbase-setxkbmap-htmlman html,xorg
+./usr/X11R7/man/html1/showfont.html xbase-showfont-htmlman html,xorg
./usr/X11R7/man/html1/showrgb.html xbase-rgb-htmlman html,xorg
./usr/X11R7/man/html1/smproxy.html xbase-smproxy-htmlman html,xorg
./usr/X11R7/man/html1/ssh-askpass.html xbase-ssh-askpass-htmlman html,xorg
@@ -1623,6 +1626,7 @@
./usr/X11R7/man/man1/revpath.1 xbase-revpath-man .man,xorg
./usr/X11R7/man/man1/sessreg.1 xbase-sessreg-man .man,xorg
./usr/X11R7/man/man1/setxkbmap.1 xbase-setxkbmap-man .man,xorg
+./usr/X11R7/man/man1/showfont.1 xbase-showfont-man .man,xorg
./usr/X11R7/man/man1/showrgb.1 xbase-rgb-man .man,xorg
./usr/X11R7/man/man1/smproxy.1 xbase-smproxy-man .man,xorg
./usr/X11R7/man/man1/ssh-askpass.1 xbase-ssh-askpass-man .man,xorg
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.44 src/distrib/sets/lists/xdebug/mi:1.45
--- src/distrib/sets/lists/xdebug/mi:1.44 Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xdebug/mi Sun Sep 11 05:54:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.44 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: mi,v 1.45 2022/09/11 05:54:00 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib base-x11-root xorg,debuglib,compatx11dir
./usr/X11R7/lib/libEGL_g.a xdebug-libEGL-debuglib xorg,debuglib,compatx11file,xorg_glamor
@@ -151,6 +151,7 @@
./usr/libdata/debug/usr/X11R7/bin/scanpci.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/bin/sessreg.debug xdebug-sessreg-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/setxkbmap.debug xdebug-setxkbmap-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/showfont.debug xdebug-showfont-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/showrgb.debug xdebug-rgb-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/smproxy.debug xdebug-smproxy-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/ssh-askpass.debug xdebug-ssh-askpass-debug xorg,debug
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.18 src/external/mit/xorg/bin/Makefile:1.19
--- src/external/mit/xorg/bin/Makefile:1.18 Thu Jul 14 18:52:23 2022
+++ src/external/mit/xorg/bin/Makefile Sun Sep 11 05:54:00 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/07/14 18:52:23 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2022/09/11 05:54:00 mrg Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cvt cxpm editres \
@@ -8,7 +8,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
iceauth ico imake listres lndir luit makedepend \
makeg makestrs mergelib mkdirhier mkfontdir \
mkfontscale mkhtmlindex oclock proxymngr revpath \
- rgb setxkbmap smproxy sxpm \
+ rgb setxkbmap showfont smproxy sxpm \
transset twm ucs2any viewres x11perf xauth xbiff xcalc \
xclipboard xclock xcmsdb xconsole xcutsel xditview xdm \
xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel \
@@ -22,7 +22,4 @@ SUBDIR= appres bdftopcf bdftruncate befo
SUBDIR+=ssh-askpass
SUBDIR+=xsetwallpaper
-# bring back from xfree:
-# lndir
-
.include <bsd.subdir.mk>
