Module Name: src
Committed By: wiz
Date: Sat Feb 4 16:34:36 UTC 2023
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xdebug: mi
src/external/mit/xorg/bin: Makefile
src/share/mk: bsd.own.mk
Removed Files:
src/external/mit/xorg/bin/xfwp: Makefile
Log Message:
stop building and installing xfwp
As proposed on tech-x11
https://mail-index.netbsd.org/tech-x11/2022/12/29/msg002333.html
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xfwp/Makefile
cvs rdiff -u -r1.1304 -r1.1305 src/share/mk/bsd.own.mk
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.172 src/distrib/sets/lists/xbase/mi:1.173
--- src/distrib/sets/lists/xbase/mi:1.172 Mon Oct 17 07:40:22 2022
+++ src/distrib/sets/lists/xbase/mi Sat Feb 4 16:34:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.172 2022/10/17 07:40:22 mrg Exp $
+# $NetBSD: mi,v 1.173 2023/02/04 16:34:36 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -92,7 +92,7 @@
./usr/X11R7/bin/xfontsel xbase-xfontsel-bin xorg
./usr/X11R7/bin/xfs xbase-xfs-bin xorg
./usr/X11R7/bin/xfsinfo xbase-xfsinfo-bin xorg
-./usr/X11R7/bin/xfwp xbase-xfwp-bin xorg
+./usr/X11R7/bin/xfwp xbase-obsolete obsolete
./usr/X11R7/bin/xgamma xbase-xgamma-bin xorg
./usr/X11R7/bin/xgc xbase-xgc-bin xorg
./usr/X11R7/bin/xhost xbase-xhost-bin xorg
@@ -1355,7 +1355,7 @@
./usr/X11R7/man/cat1/xfontsel.0 xbase-xfontsel-catman .cat,xorg
./usr/X11R7/man/cat1/xfs.0 xbase-xfs-catman .cat,xorg
./usr/X11R7/man/cat1/xfsinfo.0 xbase-xfsinfo-catman .cat,xorg
-./usr/X11R7/man/cat1/xfwp.0 xbase-xfwp-catman .cat,xorg
+./usr/X11R7/man/cat1/xfwp.0 xbase-obsolet obsolete
./usr/X11R7/man/cat1/xgamma.0 xbase-xgamma-catman .cat,xorg
./usr/X11R7/man/cat1/xgc.0 xbase-xgc-catman .cat,xorg
./usr/X11R7/man/cat1/xhost.0 xbase-xhost-catman .cat,xorg
@@ -1507,7 +1507,7 @@
./usr/X11R7/man/html1/xfontsel.html xbase-xfontsel-htmlman html,xorg
./usr/X11R7/man/html1/xfs.html xbase-xfs-htmlman html,xorg
./usr/X11R7/man/html1/xfsinfo.html xbase-xfsinfo-htmlman html,xorg
-./usr/X11R7/man/html1/xfwp.html xbase-xfwp-htmlman html,xorg
+./usr/X11R7/man/html1/xfwp.html xbase-obsolete obsolete
./usr/X11R7/man/html1/xgamma.html xbase-xgamma-htmlman html,xorg
./usr/X11R7/man/html1/xgc.html xbase-xgc-htmlman html,xorg
./usr/X11R7/man/html1/xhost.html xbase-xhost-htmlman html,xorg
@@ -1660,7 +1660,7 @@
./usr/X11R7/man/man1/xfontsel.1 xbase-xfontsel-man .man,xorg
./usr/X11R7/man/man1/xfs.1 xbase-xfs-man .man,xorg
./usr/X11R7/man/man1/xfsinfo.1 xbase-xfsinfo-man .man,xorg
-./usr/X11R7/man/man1/xfwp.1 xbase-xfwp-man .man,xorg
+./usr/X11R7/man/man1/xfwp.1 xbase-obsolete obsolete
./usr/X11R7/man/man1/xgamma.1 xbase-xgamma-man .man,xorg
./usr/X11R7/man/man1/xgc.1 xbase-xgc-man .man,xorg
./usr/X11R7/man/man1/xhost.1 xbase-xhost-man .man,xorg
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.45 src/distrib/sets/lists/xdebug/mi:1.46
--- src/distrib/sets/lists/xdebug/mi:1.45 Sun Sep 11 05:54:00 2022
+++ src/distrib/sets/lists/xdebug/mi Sat Feb 4 16:34:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.45 2022/09/11 05:54:00 mrg Exp $
+# $NetBSD: mi,v 1.46 2023/02/04 16:34:36 wiz 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
@@ -182,7 +182,7 @@
./usr/libdata/debug/usr/X11R7/bin/xfontsel.debug xdebug-xfontsel-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xfs.debug xdebug-xfs-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xfsinfo.debug xdebug-xfsinfo-debug xorg,debug
-./usr/libdata/debug/usr/X11R7/bin/xfwp.debug xdebug-xfwp-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/xfwp.debug xdebug-obsolete obsolete
./usr/libdata/debug/usr/X11R7/bin/xgamma.debug xdebug-xgamma-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xgc.debug xdebug-xgc-debug xorg,debug
./usr/libdata/debug/usr/X11R7/bin/xhost.debug xdebug-xhost-debug xorg,debug
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.19 src/external/mit/xorg/bin/Makefile:1.20
--- src/external/mit/xorg/bin/Makefile:1.19 Sun Sep 11 05:54:00 2022
+++ src/external/mit/xorg/bin/Makefile Sat Feb 4 16:34:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/09/11 05:54:00 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2023/02/04 16:34:36 wiz Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cvt cxpm editres \
@@ -12,7 +12,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
transset twm ucs2any viewres x11perf xauth xbiff xcalc \
xclipboard xclock xcmsdb xconsole xcutsel xditview xdm \
xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel \
- xfs xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp \
+ xfs xfsinfo xgamma xgc xhost xinit xinput xkbcomp \
xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms xlsclients \
xlsfonts xmag xman xmessage xmh xmkmf xmlwf xmodmap xmore \
xprop xrandr xrdb xrefresh xset xsetmode xsetpointer \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1304 src/share/mk/bsd.own.mk:1.1305
--- src/share/mk/bsd.own.mk:1.1304 Sun Jan 29 06:55:44 2023
+++ src/share/mk/bsd.own.mk Sat Feb 4 16:34:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1304 2023/01/29 06:55:44 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1305 2023/02/04 16:34:36 wiz Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1632,7 +1632,7 @@ HAVE_XORG_GLAMOR?= no
util-macros \
x11perf xauth xcalc xclipboard \
xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
- xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
+ xfd xf86dga xfindproxy xfontsel xgamma xgc xhost xinit \
xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \
xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
