Module Name: src
Committed By: nia
Date: Wed Oct 28 08:10:10 UTC 2020
Modified Files:
src/distrib/sets/lists/xbase: mi shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/bin: Makefile
src/external/mit/xorg/lib: Makefile
Removed Files:
src/external/mit/xorg/bin/xtrap: Makefile Makefile.xtrap
src/external/mit/xorg/bin/xtrap/xtrapchar: Makefile
src/external/mit/xorg/bin/xtrap/xtrapin: Makefile
src/external/mit/xorg/bin/xtrap/xtrapinfo: Makefile
src/external/mit/xorg/bin/xtrap/xtrapout: Makefile
src/external/mit/xorg/bin/xtrap/xtrapproto: Makefile
src/external/mit/xorg/bin/xtrap/xtrapreset: Makefile
src/external/mit/xorg/bin/xtrap/xtrapstats: Makefile
Log Message:
xorg: retire XTrap library and sample clients
the DEC-XTRAP extension is deprecated since 1994, so modern X servers do
not support it
the library was removed from pkgsrc last year and is not required by
anything not-sample-client related in src
if you try to query the protocol on netbsd, you get the following:
$ xtrapproto
Display: :0.0
Warning: Can't load DEC-XTRAP extension
xtrapproto: could not initialize extension
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/bin/xtrap/Makefile.xtrap
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapchar/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapin/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapout/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/bin/xtrap/xtrapproto/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/bin/xtrap/xtrapreset/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/bin/xtrap/xtrapstats/Makefile
cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/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.159 src/distrib/sets/lists/xbase/mi:1.160
--- src/distrib/sets/lists/xbase/mi:1.159 Fri Oct 16 08:28:17 2020
+++ src/distrib/sets/lists/xbase/mi Wed Oct 28 08:10:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.159 2020/10/16 08:28:17 nia Exp $
+# $NetBSD: mi,v 1.160 2020/10/28 08:10:08 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -133,13 +133,13 @@
./usr/X11R7/bin/xsm xbase-xsm-bin xorg
./usr/X11R7/bin/xstdcmap xbase-xstdcmap-bin xorg
./usr/X11R7/bin/xterm xbase-xterm-bin xorg
-./usr/X11R7/bin/xtrapchar xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapin xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapinfo xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapout xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapproto xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapreset xbase-xtrap-bin xorg
-./usr/X11R7/bin/xtrapstats xbase-xtrap-bin xorg
+./usr/X11R7/bin/xtrapchar xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapin xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapinfo xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapout xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapproto xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapreset xbase-obsolete obsolete
+./usr/X11R7/bin/xtrapstats xbase-obsolete obsolete
./usr/X11R7/bin/xvidtune xbase-xvidtune-bin xorg
./usr/X11R7/bin/xvinfo xbase-xvinfo-bin xorg
./usr/X11R7/bin/xwd xbase-xwd-bin xorg
@@ -1386,14 +1386,14 @@
./usr/X11R7/man/cat1/xsm.0 xbase-xsm-catman .cat,xorg
./usr/X11R7/man/cat1/xstdcmap.0 xbase-xstdcmap-catman .cat,xorg
./usr/X11R7/man/cat1/xterm.0 xbase-xterm-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrap.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapchar.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapin.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapinfo.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapout.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapproto.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapreset.0 xbase-xtrap-catman .cat,xorg
-./usr/X11R7/man/cat1/xtrapstats.0 xbase-xtrap-catman .cat,xorg
+./usr/X11R7/man/cat1/xtrap.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapchar.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapin.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapinfo.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapout.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapproto.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapreset.0 xbase-obsolete obsolete
+./usr/X11R7/man/cat1/xtrapstats.0 xbase-obsolete obsolete
./usr/X11R7/man/cat1/xvidtune.0 xbase-xvidtune-catman .cat,xorg
./usr/X11R7/man/cat1/xvinfo.0 xbase-xvinfo-catman .cat,xorg
./usr/X11R7/man/cat1/xwd.0 xbase-xwd-catman .cat,xorg
@@ -1534,14 +1534,14 @@
./usr/X11R7/man/html1/xsm.html xbase-xsm-htmlman html,xorg
./usr/X11R7/man/html1/xstdcmap.html xbase-xstdcmap-htmlman html,xorg
./usr/X11R7/man/html1/xterm.html xbase-xterm-htmlman html,xorg
-./usr/X11R7/man/html1/xtrap.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapchar.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapin.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapinfo.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapout.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapproto.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapreset.html xbase-xtrap-htmlman html,xorg
-./usr/X11R7/man/html1/xtrapstats.html xbase-xtrap-htmlman html,xorg
+./usr/X11R7/man/html1/xtrap.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapchar.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapin.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapinfo.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapout.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapproto.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapreset.html xbase-obsolete obsolete
+./usr/X11R7/man/html1/xtrapstats.html xbase-obsolete obsolete
./usr/X11R7/man/html1/xvidtune.html xbase-xvidtune-htmlman html,xorg
./usr/X11R7/man/html1/xvinfo.html xbase-xvinfo-htmlman html,xorg
./usr/X11R7/man/html1/xwd.html xbase-xwd-htmlman html,xorg
@@ -1683,14 +1683,14 @@
./usr/X11R7/man/man1/xsm.1 xbase-xsm-man .man,xorg
./usr/X11R7/man/man1/xstdcmap.1 xbase-xstdcmap-man .man,xorg
./usr/X11R7/man/man1/xterm.1 xbase-xterm-man .man,xorg
-./usr/X11R7/man/man1/xtrap.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapchar.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapin.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapinfo.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapout.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapproto.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapreset.1 xbase-xtrap-man .man,xorg
-./usr/X11R7/man/man1/xtrapstats.1 xbase-xtrap-man .man,xorg
+./usr/X11R7/man/man1/xtrap.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapchar.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapin.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapinfo.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapout.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapproto.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapreset.1 xbase-obsolete obsolete
+./usr/X11R7/man/man1/xtrapstats.1 xbase-obsolete obsolete
./usr/X11R7/man/man1/xvidtune.1 xbase-xvidtune-man .man,xorg
./usr/X11R7/man/man1/xvinfo.1 xbase-xvinfo-man .man,xorg
./usr/X11R7/man/man1/xwd.1 xbase-xwd-man .man,xorg
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.91 src/distrib/sets/lists/xbase/shl.mi:1.92
--- src/distrib/sets/lists/xbase/shl.mi:1.91 Tue Oct 27 13:42:22 2020
+++ src/distrib/sets/lists/xbase/shl.mi Wed Oct 28 08:10:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.91 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: shl.mi,v 1.92 2020/10/28 08:10:08 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -53,9 +53,9 @@
./usr/X11R7/lib/libXRes.so xbase-libXres-lib xorg,compatx11file
./usr/X11R7/lib/libXRes.so.2 xbase-libXres-lib xorg,compatx11file
./usr/X11R7/lib/libXRes.so.2.0 xbase-libXres-lib xorg,compatx11file
-./usr/X11R7/lib/libXTrap.so xbase-libXTrap-lib xorg,compatx11file
-./usr/X11R7/lib/libXTrap.so.7 xbase-libXTrap-lib xorg,compatx11file
-./usr/X11R7/lib/libXTrap.so.7.0 xbase-libXTrap-lib xorg,compatx11file
+./usr/X11R7/lib/libXTrap.so xbase-obsolete obsolete
+./usr/X11R7/lib/libXTrap.so.7 xbase-obsolete obsolete
+./usr/X11R7/lib/libXTrap.so.7.0 xbase-obsolete obsolete
./usr/X11R7/lib/libXau.so xbase-libXau-lib xorg,compatx11file
./usr/X11R7/lib/libXau.so.7 xbase-libXau-lib xorg,compatx11file
./usr/X11R7/lib/libXau.so.7.0 xbase-libXau-lib xorg,compatx11file
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.220 src/distrib/sets/lists/xcomp/mi:1.221
--- src/distrib/sets/lists/xcomp/mi:1.220 Tue Oct 27 13:42:22 2020
+++ src/distrib/sets/lists/xcomp/mi Wed Oct 28 08:10:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.220 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: mi,v 1.221 2020/10/28 08:10:09 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1135,8 +1135,8 @@
./usr/X11R7/lib/libX11_p.a xcomp-libX11-lib profile,xorg,compatx11file
./usr/X11R7/lib/libXRes.a xcomp-libXRes-lib xorg,compatx11file
./usr/X11R7/lib/libXRes_p.a xcomp-libXRes-lib profile,xorg,compatx11file
-./usr/X11R7/lib/libXTrap.a xcomp-libXTrap-lib xorg,compatx11file
-./usr/X11R7/lib/libXTrap_p.a xcomp-libXTrap-lib profile,xorg,compatx11file
+./usr/X11R7/lib/libXTrap.a xcomp-obsolete xorg,obsolete
+./usr/X11R7/lib/libXTrap_p.a xcomp-obsolete xorg,obsolete
./usr/X11R7/lib/libXau.a xcomp-libXau-lib xorg,compatx11file
./usr/X11R7/lib/libXau_p.a xcomp-libXau-lib profile,xorg,compatx11file
./usr/X11R7/lib/libXaw.a xcomp-libXaw-lib xorg,compatx11file
@@ -1446,7 +1446,7 @@
./usr/X11R7/lib/pkgconfig/xshmfence.pc xcomp-libxshmfence-lib xorg
./usr/X11R7/lib/pkgconfig/xt.pc xcomp-libXt-lib xorg
./usr/X11R7/lib/pkgconfig/xtrans.pc xcomp-xtrans-lib xorg
-./usr/X11R7/lib/pkgconfig/xtrap.pc xcomp-libXTrap-lib xorg
+./usr/X11R7/lib/pkgconfig/xtrap.pc xcomp-obsolete obsolete
./usr/X11R7/lib/pkgconfig/xtst.pc xcomp-libXtst-lib xorg
./usr/X11R7/lib/pkgconfig/xv.pc xcomp-libXv-lib xorg
./usr/X11R7/lib/pkgconfig/xvmc.pc xcomp-libXvMC-lib xorg
@@ -4337,7 +4337,7 @@
./usr/libdata/lint/llib-lSM.ln xcomp-libSM-lintlib lint,xorg
./usr/libdata/lint/llib-lX11.ln xcomp-libX11-lintlib lint,xorg
./usr/libdata/lint/llib-lXRes.ln xcomp-libXRes-lintlib lint,xorg
-./usr/libdata/lint/llib-lXTrap.ln xcomp-libXTrap-lintlib lint,xorg
+./usr/libdata/lint/llib-lXTrap.ln xcomp-obsolete obsolete
./usr/libdata/lint/llib-lXau.ln xcomp-libXau-lintlib lint,xorg
./usr/libdata/lint/llib-lXaw7.ln xcomp-libXaw-lintlib lint,xorg
./usr/libdata/lint/llib-lXaw8.ln xcomp-obsolete obsolete
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.55 src/distrib/sets/lists/xcomp/shl.mi:1.56
--- src/distrib/sets/lists/xcomp/shl.mi:1.55 Tue Oct 27 13:42:22 2020
+++ src/distrib/sets/lists/xcomp/shl.mi Wed Oct 28 08:10:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: shl.mi,v 1.56 2020/10/28 08:10:09 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -15,7 +15,7 @@
./usr/X11R7/lib/libX11-xcb_pic.a xcomp-libX11-xcb-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libX11_pic.a xcomp-libX11-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libXRes_pic.a xcomp-libXres-lib xorg,picinstall,compatx11file
-./usr/X11R7/lib/libXTrap_pic.a xcomp-libXTrap-lib xorg,picinstall,compatx11file
+./usr/X11R7/lib/libXTrap_pic.a xcomp-obsolete obsolete
./usr/X11R7/lib/libXau_pic.a xcomp-libXau-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libXaw7_pic.a xcomp-libXaw-lib xorg,picinstall,compatx11file
./usr/X11R7/lib/libXaw8_pic.a xcomp-obsolete obsolete
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.38 src/distrib/sets/lists/xdebug/mi:1.39
--- src/distrib/sets/lists/xdebug/mi:1.38 Tue Oct 27 13:42:22 2020
+++ src/distrib/sets/lists/xdebug/mi Wed Oct 28 08:10:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.38 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: mi,v 1.39 2020/10/28 08:10:09 nia 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
@@ -12,7 +12,7 @@
./usr/X11R7/lib/libX11-xcb_g.a xdebug-libX11-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libX11_g.a xdebug-libX11-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libXRes_g.a xdebug-libXres-debuglib xorg,debuglib,compatx11file
-./usr/X11R7/lib/libXTrap_g.a xdebug-libXTrap-debuglib xorg,debuglib,compatx11file
+./usr/X11R7/lib/libXTrap_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/libXau_g.a xdebug-libXau-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libXaw6_g.a xdebug-libXaw6-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libXaw7_g.a xdebug-libXaw-debuglib xorg,debuglib,compatx11file
@@ -221,13 +221,13 @@
./usr/libdata/debug/usr/X11R7/bin/xsm.debug xdebug-xsm-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xstdcmap.debug xdebug-xstdcmap-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xterm.debug xdebug-xterm-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapchar.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapin.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapinfo.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapout.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapproto.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapreset.debug xdebug-xtrap-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xtrapstats.debug xdebug-xtrap-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/xtrapchar.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapin.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapinfo.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapout.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapproto.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapreset.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/xtrapstats.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/bin/xvidtune.debug xdebug-xvidtune-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xvinfo.debug xdebug-xvinfo-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xwd.debug xdebug-xwd-debug xorg,debug
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.57 src/distrib/sets/lists/xdebug/shl.mi:1.58
--- src/distrib/sets/lists/xdebug/shl.mi:1.57 Tue Oct 27 13:42:22 2020
+++ src/distrib/sets/lists/xdebug/shl.mi Wed Oct 28 08:10:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.57 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: shl.mi,v 1.58 2020/10/28 08:10:09 nia Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete
@@ -23,7 +23,7 @@
./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug xdebug-libX11-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug xdebug-libX11-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug xdebug-libXres-debug xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug xdebug-libXTrap-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug xdebug-libXau-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXaw6.so.7.0.debug xdebug-libXaw6-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXaw7.so.10.0.debug xdebug-libXaw7-debug xorg,debug,compatx11file
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.16 src/external/mit/xorg/bin/Makefile:1.17
--- src/external/mit/xorg/bin/Makefile:1.16 Fri Oct 16 08:28:17 2020
+++ src/external/mit/xorg/bin/Makefile Wed Oct 28 08:10:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/10/16 08:28:17 nia Exp $
+# $NetBSD: Makefile,v 1.17 2020/10/28 08:10:09 nia Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
@@ -16,7 +16,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients \
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
- xsetroot xsm xstdcmap xterm xtrap xvidtune \
+ xsetroot xsm xstdcmap xterm xvidtune \
xvinfo xwd xwininfo xwud xdriinfo sessreg xcompmgr
SUBDIR+=ssh-askpass
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.53 src/external/mit/xorg/lib/Makefile:1.54
--- src/external/mit/xorg/lib/Makefile:1.53 Tue Oct 27 13:42:22 2020
+++ src/external/mit/xorg/lib/Makefile Wed Oct 28 08:10:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2020/10/27 13:42:22 nia Exp $
+# $NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $
# build libraries for xorg
@@ -36,7 +36,7 @@ SUBDIR+=libvdpau \
.WAIT
.endif
SUBDIR+=libXi libXxf86vm \
- libGL${OLD_PREFIX} libXScrnSaver libXTrap libXfont libXfont2 \
+ libGL${OLD_PREFIX} libXScrnSaver libXfont libXfont2 \
libXinerama libXmu libXmuu libXpm libXrender \
libXres libXtst libXvMC libXvMCW libXv libXxf86dga libXxf86misc \
libxkbui \
