Module Name: src
Committed By: lukem
Date: Wed May 24 13:00:16 UTC 2023
Modified Files:
src/distrib/evbsh3/rom/ramdiskcommon: ramdiskbin.conf
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/usr.bin: Makefile
src/usr.bin/crunch/examples: really-big.conf
src/usr.sbin/makemandb: nostem.txt
Removed Files:
src/usr.bin/mkstr: Makefile mkstr.1 mkstr.c
src/usr.bin/xstr: Makefile pathnames.h xstr.1 xstr.c
Log Message:
obsolete mkstr(1) and xstr(1)
These were only used on PDP-11 for two programs we don't ship,
and have been obsolete since the VAX days.
xstr never worked in the build.sh cross-build environment (22 years), or
parallel make environment (nearly 28 years), didn't work in the orignal 386bsd
import, and has never been needed in NetBSD as we don't have the older BSD
programs (pascal, pre-nvi ex) that needed mkstr/xstr on PDP-11.
PR toolchain/35964
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf
cvs rdiff -u -r1.2428 -r1.2429 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.398 -r1.399 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.238 -r1.239 src/usr.bin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/crunch/examples/really-big.conf
cvs rdiff -u -r1.3 -r0 src/usr.bin/mkstr/Makefile
cvs rdiff -u -r1.14 -r0 src/usr.bin/mkstr/mkstr.1
cvs rdiff -u -r1.17 -r0 src/usr.bin/mkstr/mkstr.c
cvs rdiff -u -r1.3 -r0 src/usr.bin/xstr/Makefile
cvs rdiff -u -r1.4 -r0 src/usr.bin/xstr/pathnames.h
cvs rdiff -u -r1.20 -r0 src/usr.bin/xstr/xstr.1
cvs rdiff -u -r1.26 -r0 src/usr.bin/xstr/xstr.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/makemandb/nostem.txt
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf
diff -u src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.10 src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.11
--- src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf:1.10 Wed Apr 12 17:29:49 2017
+++ src/distrib/evbsh3/rom/ramdiskcommon/ramdiskbin.conf Wed May 24 13:00:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ramdiskbin.conf,v 1.10 2017/04/12 17:29:49 christos Exp $
+# $NetBSD: ramdiskbin.conf,v 1.11 2023/05/24 13:00:14 lukem Exp $
srcdirs bin sbin libexec usr.bin usr.sbin
@@ -39,7 +39,7 @@ progs compress crontab ctags cut dirname
progs fstat ftp gencat getopt head hexdump id
progs indent ipcrm ipcs join jot kdump ktrace lam last lastcomm leave less
progs lex lock logger login logname look m4 mail man menuc mesg mkdep
-progs mkfifo mkstr mktemp msgc msgs netgroup netstat newsyslog nfsstat
+progs mkfifo mktemp msgc msgs netgroup netstat newsyslog nfsstat
progs nice nl nohup paste patch pr printenv printf quota renice rev rpcgen
progs rpcinfo rs sed showmount shuffle skey skeyinfo skeyinit soelim
progs su systat tail tee tftp time touch tset tsort tty uname
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2428 src/distrib/sets/lists/comp/mi:1.2429
--- src/distrib/sets/lists/comp/mi:1.2428 Fri May 12 11:13:09 2023
+++ src/distrib/sets/lists/comp/mi Wed May 24 13:00:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2428 2023/05/12 11:13:09 riastradh Exp $
+# $NetBSD: mi,v 1.2429 2023/05/24 13:00:15 lukem Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -58,7 +58,7 @@
./usr/bin/lto-dump comp-c-bin gcccmds,gcc=10
./usr/bin/luac comp-util-bin
./usr/bin/menuc comp-c-bin
-./usr/bin/mkstr comp-c-bin
+./usr/bin/mkstr comp-obsolete obsolete
./usr/bin/mkubootimage comp-util-bin
./usr/bin/msgattrib comp-c-bin
./usr/bin/msgc comp-c-bin
@@ -93,7 +93,7 @@
./usr/bin/unifdefall comp-util-bin
./usr/bin/unprotoize comp-obsolete obsolete
./usr/bin/xgettext comp-c-bin
-./usr/bin/xstr comp-c-bin
+./usr/bin/xstr comp-obsolete obsolete
./usr/bin/yacc comp-c-bin
./usr/include/a.out.h comp-c-include
./usr/include/adosfs/adosfs.h comp-c-include
@@ -4613,7 +4613,7 @@
./usr/share/man/cat1/lto-dump.0 comp-c-catman gcccmds,.cat,gcc=10
./usr/share/man/cat1/luac.0 comp-util-catman .cat
./usr/share/man/cat1/menuc.0 comp-c-catman .cat
-./usr/share/man/cat1/mkstr.0 comp-c-catman .cat
+./usr/share/man/cat1/mkstr.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_clear.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_display.0 comp-obsolete obsolete
./usr/share/man/cat1/msg_display_add.0 comp-obsolete obsolete
@@ -4649,7 +4649,7 @@
./usr/share/man/cat1/tsort.0 comp-c-catman .cat
./usr/share/man/cat1/unifdef.0 comp-c-catman .cat
./usr/share/man/cat1/unifdefall.0 comp-c-catman .cat
-./usr/share/man/cat1/xstr.0 comp-c-catman .cat
+./usr/share/man/cat1/xstr.0 comp-obsolete obsolete
./usr/share/man/cat1/yacc.0 comp-c-catman .cat
./usr/share/man/cat2/EV_SET.0 comp-c-catman .cat
./usr/share/man/cat2/_Exit.0 comp-c-catman .cat
@@ -13119,7 +13119,7 @@
./usr/share/man/html1/lto-dump.html comp-c-htmlman gcccmds,html,gcc=10
./usr/share/man/html1/luac.html comp-util-htmlman html
./usr/share/man/html1/menuc.html comp-c-htmlman html
-./usr/share/man/html1/mkstr.html comp-c-htmlman html
+./usr/share/man/html1/mkstr.html comp-obsolete obsolete
./usr/share/man/html1/msgc.html comp-c-htmlman html
./usr/share/man/html1/nbperf.html comp-util-htmlman html
./usr/share/man/html1/nm.html comp-util-htmlman binutils,html
@@ -13144,7 +13144,7 @@
./usr/share/man/html1/tsort.html comp-c-htmlman html
./usr/share/man/html1/unifdef.html comp-c-htmlman html
./usr/share/man/html1/unifdefall.html comp-c-htmlman html
-./usr/share/man/html1/xstr.html comp-c-htmlman html
+./usr/share/man/html1/xstr.html comp-obsolete obsolete
./usr/share/man/html1/yacc.html comp-c-htmlman html
./usr/share/man/html2/EV_SET.html comp-c-htmlman html
./usr/share/man/html2/_Exit.html comp-c-htmlman html
@@ -21415,7 +21415,7 @@
./usr/share/man/man1/lto-dump.1 comp-c-man gcccmds,.man,gcc=10
./usr/share/man/man1/luac.1 comp-util-man .man
./usr/share/man/man1/menuc.1 comp-c-man .man
-./usr/share/man/man1/mkstr.1 comp-c-man .man
+./usr/share/man/man1/mkstr.1 comp-obsolete obsolete
./usr/share/man/man1/msg_clear.1 comp-obsolete obsolete
./usr/share/man/man1/msg_display.1 comp-obsolete obsolete
./usr/share/man/man1/msg_display_add.1 comp-obsolete obsolete
@@ -21452,7 +21452,7 @@
./usr/share/man/man1/tsort.1 comp-util-man .man
./usr/share/man/man1/unifdef.1 comp-util-man .man
./usr/share/man/man1/unifdefall.1 comp-util-man .man
-./usr/share/man/man1/xstr.1 comp-c-man .man
+./usr/share/man/man1/xstr.1 comp-obsolete obsolete
./usr/share/man/man1/yacc.1 comp-c-man .man
./usr/share/man/man2/EV_SET.2 comp-c-man .man
./usr/share/man/man2/_Exit.2 comp-c-man .man
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.398 src/distrib/sets/lists/debug/mi:1.399
--- src/distrib/sets/lists/debug/mi:1.398 Wed May 10 15:52:07 2023
+++ src/distrib/sets/lists/debug/mi Wed May 24 13:00:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.398 2023/05/10 15:52:07 christos Exp $
+# $NetBSD: mi,v 1.399 2023/05/24 13:00:15 lukem Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -689,7 +689,7 @@
./usr/libdata/debug/usr/bin/mkesdb.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mkfifo.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mklocale.debug comp-locale-debug debug
-./usr/libdata/debug/usr/bin/mkstr.debug comp-c-debug debug
+./usr/libdata/debug/usr/bin/mkstr.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/mktemp.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/mkubootimage.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/modstat.debug comp-obsolete obsolete
@@ -896,7 +896,7 @@
./usr/libdata/debug/usr/bin/xargs.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/xgettext.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/xmlwf.debug comp-util-debug debug
-./usr/libdata/debug/usr/bin/xstr.debug comp-c-debug debug
+./usr/libdata/debug/usr/bin/xstr.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/xz.debug comp-util-debug debug
./usr/libdata/debug/usr/bin/yacc.debug comp-c-debug debug
./usr/libdata/debug/usr/bin/yes.debug comp-util-debug debug
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.238 src/usr.bin/Makefile:1.239
--- src/usr.bin/Makefile:1.238 Mon Jun 6 10:56:29 2022
+++ src/usr.bin/Makefile Wed May 24 13:00:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.238 2022/06/06 10:56:29 nia Exp $
+# $NetBSD: Makefile,v 1.239 2023/05/24 13:00:15 lukem Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ SUBDIR= aiomixer apply asa at audio audi
kdump ktrace ktruss lam last lastcomm ldd leave \
locale locate lock logger login logname look lorder m4 \
machine mail make man menuc mesg midiplay midirecord mixerctl \
- mkcsmapper mkdep mkesdb mkfifo mklocale mkstr mktemp mkubootimage \
+ mkcsmapper mkdep mkesdb mkfifo mklocale mktemp mkubootimage \
moduli msgc msgs \
nbperf nc netgroup netstat newgrp newsyslog nfsstat nice nl nohup \
pagesize passwd paste patch pathchk pkill pmap pr \
@@ -34,7 +34,7 @@ SUBDIR= aiomixer apply asa at audio audi
uudecode uuencode uuidgen vacation vgrind videoctl vis \
vmstat vndcompress w \
wall wc what whereis who whois \
- write xargs xinstall xlint xstr yes
+ write xargs xinstall xlint yes
SUBDIR+= ../external/zlib/pigz/bin/pigz
Index: src/usr.bin/crunch/examples/really-big.conf
diff -u src/usr.bin/crunch/examples/really-big.conf:1.5 src/usr.bin/crunch/examples/really-big.conf:1.6
--- src/usr.bin/crunch/examples/really-big.conf:1.5 Sat Apr 21 12:27:29 2012
+++ src/usr.bin/crunch/examples/really-big.conf Wed May 24 13:00:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: really-big.conf,v 1.5 2012/04/21 12:27:29 roy Exp $
+# $NetBSD: really-big.conf,v 1.6 2023/05/24 13:00:15 lukem Exp $
#
# really-big.conf - just about everything, just for testing.
# This ends up having some good examples of the use of specials for
@@ -43,14 +43,14 @@ progs dirname du env error expand false
progs fsplit fstat ftp getconf getopt gprof head hexdump id indent ipcrm
progs ipcs join kdump ktrace last lastcomm leave lex lock logger locate
progs login logname look m4 machine mail make man mesg mkfifo
-progs mkstr modstat more msgs netstat newsyslog nfsstat nice nm nohup
+progs modstat more msgs netstat newsyslog nfsstat nice nm nohup
progs pagesize passwd paste patch pr printenv printf quota ranlib
progs renice rev rlogin rpcgen rpcinfo rsh rup ruptime rusers rwall rwho
progs script sed showmount size soelim split strings strip su tail talk
progs tcopy tee telnet tftp time tip tn3270 touch tput tr true tset tsort
progs tty ul uname unexpand unifdef uniq units unvis users uudecode uuencode
progs vacation vgrind vi vis vmstat w wall wc what whatis whereis who
-progs whois window write xargs xinstall xstr yacc yes ypcat ypmatch ypwhich
+progs whois window write xargs xinstall yacc yes ypcat ypmatch ypwhich
# shell scripts: lorder mkdep shar which
# problems: rdist uses libcompat.a(regex.o), which conflicts with
Index: src/usr.sbin/makemandb/nostem.txt
diff -u src/usr.sbin/makemandb/nostem.txt:1.7 src/usr.sbin/makemandb/nostem.txt:1.8
--- src/usr.sbin/makemandb/nostem.txt:1.7 Fri Apr 16 07:45:41 2021
+++ src/usr.sbin/makemandb/nostem.txt Wed May 24 13:00:15 2023
@@ -2469,7 +2469,6 @@ mkostemps
mkquery
mkstemp
mkstemps
-mkstr
mktemp
mktime
mkubootimage
@@ -4781,7 +4780,6 @@ xname
xpci
xprt
xsh
-xstr
xsurf
xt
xvif
