release/2.2.5

7 files changed, 11 insertions, 743 deletions

diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile
deleted file mode 100644
index c6f909fae8714..0000000000000
--- a/usr.bin/c89/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-MAN1 = c89.1
-
-beforeinstall:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	     ${.CURDIR}/c89.sh ${DESTDIR}${BINDIR}/c89
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
deleted file mode 100644
index 75b4c770d30f1..0000000000000
--- a/usr.bin/c89/c89.1
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Joerg Wunsch
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $Id: c89.1,v 1.1.1.1 1997/09/17 20:44:54 joerg Exp $
-.\" "
-.Dd September 17, 1997
-.Os
-.Dt C89 1
-.Sh NAME
-.Nm c89
-.Nd Posix.2 C language compiler
-.Sh SYNOPSIS
-.Nm c89
-.Op Fl c
-.Op Fl D Ar name Ns Op Ar =value 
-.Op ...
-.Op Fl E
-.Op Fl g
-.Op Fl I Ar directory ...
-.Op Fl L Ar directory ...
-.Op Fl o Ar outfile
-.Op Fl O
-.Op Fl s
-.Op Fl U Ar name ...
-.Ar operand ...
-.Sh DESCRIPTION
-This is the name of the C language compiler as required by the
-.St -p1003.2 .
-standard.
-.Pp
-The
-.Nm
-compiler accepts the following options:
-.Bl -tag -offset indent -width "-D name = value"
-.It Fl c
-Suppress the link-edit phase of the compilation, and do not remove any
-object files that are produced.
-.It Fl D Ar name Ns Op Ar =value
-Define name as if by a C-language
-.Ql #define
-directive.  If
-no
-.Ar =value
-is given, a value of 1 will be used.  The
-.Fl D
-option has lower precedence than the
-.Fl U
-option.  That is, if
-.Ar name
-is used in both a
-.Fl U
-and a
-.Fl D
-option,
-.Ar name
-will be undefined regardless of the order of the options.  The
-.Fl D
-option may be specified more than once.
-.It Fl E
-Copy C-language source files to the standard output, expanding all
-preprocessor directives; no compilation will be performed.
-.It Fl g
-Produce symbolic information in the object or executable files.
-.It Fl I Ar directory
-Change the algorithm for searching for headers whose names are not
-absolute pathnames to look in the directory named by the
-.Ar directory
-pathname before looking in the usual places.  Thus, headers whose
-names are enclosed in double-quotes (\&"\&") will be searched for first
-in the directory of the file with the
-.Ql #include
-line, then in
-directories named in
-.Fl I
-options, and last in the usual places.  For
-headers whose names are enclosed in angle brackets (<>), the header
-will be searched for only in directories named in
-.Fl I
-options and then in the usual places.  Directories named in
-.Fl I
-options shall be searched in the order specified.  The
-.Fl I
-option may be specified more than once.
-.It Fl L Ar directory
-Change the algorithm of searching for the libraries named in the
-.Fl l
-objects to look in the directory named by the
-.Ar directory
-pathname before looking in the usual places.  Directories named in
-.Fl L
-options will be searched in the order specified.  The
-.Fl L
-option may be specified more than once.
-.It Fl o Ar outfile
-Use the pathname
-.Ar outfile ,
-instead of the default
-.Pa a.out ,
-for the executable file produced.
-.It Fl O
-Optimize the compilation.
-.It Fl s
-Produce object and/or executable files from which symbolic and other
-information not required for proper execution has been removed
-(stripped).
-.It Fl U Ar name
-Remove any initial definition of
-.Ar name .
-The
-.Fl U
-option may be specified more than once.
-.El
-.Pp
-An operand is either in the form of a pathname or the form
-.Fl l
-library.  At least one operand of the pathname form needs to be
-specified.  Supported operands are of the form:
-.Bl -tag -offset indent -width "-l library"
-.It Pa file Ns \&.c
-A C-language source file to be compiled and optionally linked.  The
-operand must be of this form if the
-.Fl c
-option is used.
-.It Pa file Ns \&.a
-A library of object files, as produced by
-.Xr ar 1 ,
-passed directly to the link editor.
-.It Pa file Ns \&.o
-An object file produced by
-.Nm
-.Fl c ,
-and passed directly to the link editor.
-.It Fl l Pa library
-Search the library named
-.Dl lib Ns Em library Ns \&.a
-A library will be searched when its name is encountered, so the
-placement of a
-.Fl l
-operand is significant.
-.El
-.Sh SEE ALSO
-.Xr ar 1 ,
-.Xr cc 1
-.Sh STANDARDS
-The
-.Nm
-command is believed to comply with
-.St -p1003.2 .
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
deleted file mode 100755
index a9ad3d0c35d02..0000000000000
--- a/usr.bin/c89/c89.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 1997 Joerg Wunsch
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#	$Id: c89.sh,v 1.2 1997/09/18 20:55:50 joerg Exp $
-#
-# This is the Posix.2 mandated C compiler.  Basically, a hook to the
-# cc(1) command.
-
-usage()
-{
-	echo "usage: c89 [-c] [-D name[=value]] [...] [-E] [-g] [-I directory ...]
-       [-L directory ...] [-o outfile] [-O] [-s] [-U name ...] operand ..." 1>&2
-	exit 64
-}
-
-_PARAMS="$@"
-
-while getopts "cD:EgI:L:o:OsU:" opt
-do
-	case $opt in
-	[cDEgILoOsU])
-		;;
-	*)
-		usage
-		;;
-	esac
-done
-
-shift $(($OPTIND - 1))
-
-if [ $# = "0" ]
-then
-	echo "Missing operand" 1>&2
-	usage
-fi
-
-while [ $# != "0" ]
-do
-	case $1 in
-	-l* | *.a | *.c | *.o)
-		shift
-		;;
-	*)
-		echo "Invalid operand" 1>&2
-		usage
-		;;
-	esac
-done
-
-exec cc -ansi -pedantic -D_ANSI_SOURCE $_PARAMS
diff --git a/usr.bin/cksum/crc32.c b/usr.bin/cksum/crc32.c
deleted file mode 100644
index ffeacc1151c14..0000000000000
--- a/usr.bin/cksum/crc32.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * This code implements the AUTODIN II polynomial used by Ethernet,
- * and can be used to calculate multicast address hash indices.
- * It assumes that the low order bits will be transmitted first,
- * and consequently the low byte should be sent first when
- * the crc computation is finished.  The crc should be complemented
- * before transmission.
- * The variable corresponding to the macro argument "crc" should
- * be an unsigned long and should be preset to all ones for Ethernet
- * use.  An error-free packet will leave 0xDEBB20E3 in the crc.
- *			Spencer Garrett <srg@quick.com>
- */
-
-#define CRC(crc, ch)	 (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff])
-
-/* generated using the AUTODIN II polynomial
- *	x^32 + x^26 + x^23 + x^22 + x^16 +
- *	x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x^1 + 1
- */
-unsigned long crctab[256] = {
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
-	0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
-	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
-	0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
-	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
-	0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
-	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
-	0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
-	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
-	0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
-	0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
-	0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
-	0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
-	0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
-	0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
-	0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
-	0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
-	0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
-	0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
-	0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
-	0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
-	0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
-	0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
-	0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
-	0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
-	0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
-	0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
-	0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
-	0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
-	0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
-	0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
-	0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
-	0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
-	0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
-	0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
-	0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
-	0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
-	0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
-	0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
-	0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
-	0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
-	0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
-	0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
-};
-
-#include <stdio.h>
-#include <sys/types.h>
-
-u_long crc32_total = 0 ;
-
-crc32(fd, cval, clen)
-    register int fd;
-    u_long *cval, *clen;
-{
-    u_long crc = ~0;
-    char buf[BUFSIZ], *p ;
-    int len, nr ;
-    FILE *in;
-	
-    len = 0 ;
-    crc32_total = ~crc32_total ;
-    while (nr = read(fd, buf, sizeof(buf)))
-        for (len += nr, p = buf; nr--; ++p) {
-	    CRC(crc, *p) ;
-	    CRC(crc32_total, *p) ;
-	}
-    if (nr < 0)
-        return 1 ;
-
-    *clen = len ;
-    *cval = ~crc ;
-    crc32_total = ~crc32_total ;
-    return 0 ;
-}
diff --git a/usr.bin/mklocale/data/ja_JP.SJIS.src b/usr.bin/mklocale/data/ja_JP.SJIS.src
deleted file mode 100644
index 2358c820de29f..0000000000000
--- a/usr.bin/mklocale/data/ja_JP.SJIS.src
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- *    ja_JP.SJIS locale table for BSD4.4/rune
- *    version 1.0
- *    (C) Sin'ichiro MIYATANI / Phase One, Inc
- *    May 12, 1995
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Phase One, Inc.
- * 4. The name of Phase One, Inc. may be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-ENCODING	"MSKanji"
-
-/*
- * ASCII byte code
- */
-ALPHA		'A'-'Z' 'a'-'z'
-CONTROL		0x00-0x1f 0x7f
-DIGIT		'0'-'9'
-GRAPH		0x21-0x7e
-LOWER		'a'-'z'
-PUNCT		0x21-0x2f 0x3a-0x40 0x5b-0x60 0x7b-0x7e
-SPACE		0x09-0x0d 0x20
-UPPER		'A'-'Z'
-XDIGIT		'a'-'f' 'A'-'F'
-BLANK		' ' '\t'
-PRINT		0x20-0x7e
-/* SWIDTH1		0x20-0x7e */
-
-MAPLOWER	<'A'-'Z':'a'><'a'-'z':'a'>
-MAPUPPER	<'A'-'Z':'A'><'a'-'z':'A'>
-TODIGIT		<'0'-'9':0>
-TODIGIT		<'A'-'F':10><'a'-'f':10>
-
-/*
- * JIS X201
- */
-PUNCT		0xa1-0xa5
-SPACE		0xa0
-BLANK		0xa0
-PRINT		0xa0-0xdf
-SPECIAL		0xa1-0xdf
-PHONOGRAM	0xa6-0xdf
-/* SWIDTH1		0xa0-0xdf*/
-
-/*
- * JIS X208/SJIS
- */
-/* 100 */
-PUNCT		0x8141-0x8151 0x8159-0x815a 0x815c-0x817e 0x8180-0x819e
-SPACE		0x8140
-PHONOGRAM	0x8152-0x8158 0x815b
-
-/* 200 */
-PUNCT		0x819f-0x81ac 0x81b8-0x81bf 0x81c8-0x81ce 0x81da-0x81e8
-PUNCT		0x81f0-0x81f7 0x81fc
-
-/* 300 */
-DIGIT		0x824f-0x8258
-XDIGIT		0x8260-0x8265 0x8281-0x8286
-ALPHA		0x8260-0x8279 0x8281-0x829a
-UPPER		0x8260-0x8279
-LOWER		0x8281-0x829a
-
-MAPLOWER	<0x8260-0x8279:0x8281>
-MAPLOWER	<0x8281-0x829a:0x8281>
-MAPUPPER	<0x8260-0x8279:0x8260>
-MAPUPPER	<0x8281-0x829a:0x8260>
-TODIGIT		<0x824f-0x8258:0>
-TODIGIT		<0x8260-0x8265:10>
-TODIGIT		<0x8281-0x8286:10>
-
-/* 400 */
-PHONOGRAM	0x829f-0x82f1
-
-/* 500 */
-PHONOGRAM	0x8340-0x837e
-PHONOGRAM	0x8380-0x8396
-
-/* 600 */
-UPPER		0x839f-0x83b6
-LOWER		0x83bf-0x83d6
-MAPLOWER	<0x839f-0x83b6:0x83bf>
-MAPLOWER	<0x83bf-0x83d6:0x83bf>
-MAPUPPER	<0x839f-0x83b6:0x839f>
-MAPUPPER	<0x83bf-0x83d6:0x839f>
-
-/* 700 */
-UPPER		0x8440-0x8460
-LOWER		0x8470-0x847e 0x8480-0x8491
-MAPLOWER	<0x8440-0x844e:0x8470><0x844f-0x8460:0x8480>
-MAPLOWER	<0x8470-0x847e:0x8470><0x8480-0x8491:0x8480>
-MAPUPPER	<0x8440-0x8460:0x8440>
-MAPUPPER	<0x8470-0x847e:0x8440><0x8480-0x8491:0x844f>
-
-/* 800 */
-SPECIAL		0x849f-0x84be
-
-/*SWIDTH2		0x8140-0x817e 0x8180-0x819e */	/* 100 */
-/*SWIDTH2		0x819f-0x81ac 0x81b8-0x81bf */	/* 200 */
-/*SWIDTH2		0x81c8-0x81ce 0x81da-0x81e8 */
-/*SWIDTH2		0x81f0-0x81f7 0x81fc */
-/*SWIDTH2		0x824f-0x8258 0x8260-0x8279 */	/* 300 */
-/*SWIDTH2		0x8281-0x829a */
-/*SWIDTH2		0x829f-0x82f1 */			/* 400 */
-/*SWIDTH2		0x8340-0x837e */			/* 500 */
-/*SWIDTH2		0x8380-0x8396 */
-/*SWIDTH2		0x839f-0x83b6 */			/* 600 */
-/*SWIDTH2		0x83bf-0x83d6 */
-/*SWIDTH2		0x8440-0x8460 */			/* 700 */
-/*SWIDTH2		0x8470-0x847e 0x8480-0x8491 */
-/*SWIDTH2		0x849f-0x84be */			/* 800 */
-
-/* 1600- */
-IDEOGRAM	0x889f-0x88fc			/* 1600 */
-IDEOGRAM	0x8940-0x897e 0x8980-0x899e	/* 1700 */
-IDEOGRAM	0x899f-0x89fc			/* 1800 */
-IDEOGRAM	0x8a40-0x8a7e 0x8a80-0x8a9e	/* 1900 */
-IDEOGRAM	0x8a9f-0x8afc			/* 2000 */
-IDEOGRAM	0x8b40-0x8b7e 0x8b80-0x8b9e	/* 2100 */
-IDEOGRAM	0x8b9f-0x8bfc			/* 2200 */
-IDEOGRAM	0x8c40-0x8c7e 0x8c80-0x8c9e	/* 2300 */
-IDEOGRAM	0x8c9f-0x8cfc			/* 2400 */
-IDEOGRAM	0x8d40-0x8d7e 0x8d80-0x8d9e	/* 2500 */
-IDEOGRAM	0x8d9f-0x8dfc			/* 2600 */
-IDEOGRAM	0x8e40-0x8e7e 0x8e80-0x8e9e	/* 2700 */
-IDEOGRAM	0x8e9f-0x8efc			/* 2800 */
-IDEOGRAM	0x8f40-0x8f7e 0x8f80-0x8f9e	/* 2900 */
-IDEOGRAM	0x8f9f-0x8ffc			/* 3000 */
-IDEOGRAM	0x9040-0x907e 0x9080-0x909e	/* 3100 */
-IDEOGRAM	0x909f-0x90fc			/* 3200 */
-IDEOGRAM	0x9140-0x917e 0x9180-0x919e	/* 3300 */
-IDEOGRAM	0x919f-0x91fc			/* 3400 */
-IDEOGRAM	0x9240-0x927e 0x9280-0x929e	/* 3500 */
-IDEOGRAM	0x929f-0x92fc			/* 3600 */
-IDEOGRAM	0x9340-0x937e 0x9380-0x939e	/* 3700 */
-IDEOGRAM	0x939f-0x93fc			/* 3800 */
-IDEOGRAM	0x9440-0x947e 0x9480-0x949e	/* 3900 */
-IDEOGRAM	0x949f-0x94fc			/* 4000 */
-IDEOGRAM	0x9540-0x957e 0x9580-0x959e	/* 4100 */
-IDEOGRAM	0x959f-0x95fc			/* 4200 */
-IDEOGRAM	0x9640-0x967e 0x9680-0x969e	/* 4300 */
-IDEOGRAM	0x969f-0x96fc			/* 4400 */
-IDEOGRAM	0x9740-0x977e 0x9780-0x979e	/* 4500 */
-IDEOGRAM	0x979f-0x97fc			/* 4600 */
-IDEOGRAM	0x9840-0x987e 0x9880-0x989e	/* 4700 */
-IDEOGRAM	0x989f-0x98fc			/* 4800 */
-IDEOGRAM	0x9940-0x997e 0x9980-0x999e	/* 4900 */
-IDEOGRAM	0x999f-0x99fc			/* 5000 */
-IDEOGRAM	0x9a40-0x9a7e 0x9a80-0x9a9e	/* 5100 */
-IDEOGRAM	0x9a9f-0x9afc			/* 5200 */
-IDEOGRAM	0x9b40-0x9b7e 0x9b80-0x9b9e	/* 5300 */
-IDEOGRAM	0x9b9f-0x9bfc			/* 5400 */
-IDEOGRAM	0x9c40-0x9c7e 0x9c80-0x9c9e	/* 5500 */
-IDEOGRAM	0x9c9f-0x9cfc			/* 5600 */
-IDEOGRAM	0x9d40-0x9d7e 0x9d80-0x9d9e	/* 5700 */
-IDEOGRAM	0x9d9f-0x9dfc			/* 5800 */
-IDEOGRAM	0x9e40-0x9e7e 0x9e80-0x9e9e	/* 5900 */
-IDEOGRAM	0x9e9f-0x9efc			/* 6000 */
-IDEOGRAM	0x9f40-0x9f7e 0x9f80-0x9f9e	/* 6100 */
-IDEOGRAM	0x9f9f-0x9ffc			/* 6200 */
-IDEOGRAM	0xe040-0xe07e 0xe080-0xe09e	/* 6300 */
-IDEOGRAM	0xe09f-0xe0fc			/* 6400 */
-IDEOGRAM	0xe140-0xe17e 0xe180-0xe19e	/* 6500 */
-IDEOGRAM	0xe19f-0xe1fc			/* 6600 */
-IDEOGRAM	0xe240-0xe27e 0xe280-0xe29e	/* 6700 */
-IDEOGRAM	0xe29f-0xe2fc			/* 6800 */
-IDEOGRAM	0xe340-0xe37e 0xe380-0xe39e	/* 6900 */
-IDEOGRAM	0xe39f-0xe3fc			/* 7000 */
-IDEOGRAM	0xe440-0xe47e 0xe480-0xe49e	/* 7100 */
-IDEOGRAM	0xe49f-0xe4fc			/* 7200 */
-IDEOGRAM	0xe540-0xe57e 0xe580-0xe59e	/* 7300 */
-IDEOGRAM	0xe59f-0xe5fc			/* 7400 */
-IDEOGRAM	0xe640-0xe67e 0xe680-0xe69e	/* 7500 */
-IDEOGRAM	0xe69f-0xe6fc			/* 7600 */
-IDEOGRAM	0xe740-0xe77e 0xe780-0xe79e	/* 7700 */
-IDEOGRAM	0xe79f-0xe7fc			/* 7800 */
-IDEOGRAM	0xe840-0xe87e 0xe880-0xe89e	/* 7900 */
-IDEOGRAM	0xe89f-0xe8fc			/* 8000 */
-IDEOGRAM	0xe940-0xe97e 0xe980-0xe99e	/* 8100 */
-IDEOGRAM	0xe99f-0xe9fc			/* 8200 */
-IDEOGRAM	0xea40-0xea7e 0xea80-0xea9e	/* 8300 */
-IDEOGRAM	0xea9f-0xeaa4			/* 8400 */
-
-/*SWIDTH2		0x889f-0x88fc */		/* 1600 */
-/*SWIDTH2		0x8940-0x897e 0x8980-0x899e */	/* 1700 */
-/*SWIDTH2		0x899f-0x89fc */		/* 1800 */
-/*SWIDTH2		0x8a40-0x8a7e 0x8a80-0x8a9e */	/* 1900 */
-/*SWIDTH2		0x8a9f-0x8afc */		/* 2000 */
-/*SWIDTH2		0x8b40-0x8b7e 0x8b80-0x8b9e */	/* 2100 */
-/*SWIDTH2		0x8b9f-0x8bfc */		/* 2200 */
-/*SWIDTH2		0x8c40-0x8c7e 0x8c80-0x8c9e */	/* 2300 */
-/*SWIDTH2		0x8c9f-0x8cfc	*/		/* 2400 */
-/*SWIDTH2		0x8d40-0x8d7e 0x8d80-0x8d9e */	/* 2500 */
-/*SWIDTH2		0x8d9f-0x8dfc	*/		/* 2600 */
-/*SWIDTH2		0x8e40-0x8e7e 0x8e80-0x8e9e */	/* 2700 */
-/*SWIDTH2		0x8e9f-0x8efc	*/		/* 2800 */
-/*SWIDTH2		0x8f40-0x8f7e 0x8f80-0x8f9e */	/* 2900 */
-/*SWIDTH2		0x8f9f-0x8ffc	*/		/* 3000 */
-/*SWIDTH2		0x9040-0x907e 0x9080-0x909e */	/* 3100 */
-/*SWIDTH2		0x909f-0x90fc	*/		/* 3200 */
-/*SWIDTH2		0x9140-0x917e 0x9180-0x919e */	/* 3300 */
-/*SWIDTH2		0x919f-0x91fc	*/		/* 3400 */
-/*SWIDTH2		0x9240-0x927e 0x9280-0x929e */	/* 3500 */
-/*SWIDTH2		0x929f-0x92fc	*/		/* 3600 */
-/*SWIDTH2		0x9340-0x937e 0x9380-0x939e */	/* 3700 */
-/*SWIDTH2		0x939f-0x93fc	*/		/* 3800 */
-/*SWIDTH2		0x9440-0x947e 0x9480-0x949e */	/* 3900 */
-/*SWIDTH2		0x949f-0x94fc	*/		/* 4000 */
-/*SWIDTH2		0x9540-0x957e 0x9580-0x959e */	/* 4100 */
-/*SWIDTH2		0x959f-0x95fc	*/		/* 4200 */
-/*SWIDTH2		0x9640-0x967e 0x9680-0x969e */	/* 4300 */
-/*SWIDTH2		0x969f-0x96fc	*/		/* 4400 */
-/*SWIDTH2		0x9740-0x977e 0x9780-0x979e */	/* 4500 */
-/*SWIDTH2		0x979f-0x97fc	*/		/* 4600 */
-/*SWIDTH2		0x9840-0x987e 0x9880-0x989e */	/* 4700 */
-/*SWIDTH2		0x989f-0x98fc	*/		/* 4800 */
-/*SWIDTH2		0x9940-0x997e 0x9980-0x999e */	/* 4900 */
-/*SWIDTH2		0x999f-0x99fc	*/		/* 5000 */
-/*SWIDTH2		0x9a40-0x9a7e 0x9a80-0x9a9e */	/* 5100 */
-/*SWIDTH2		0x9a9f-0x9afc	*/		/* 5200 */
-/*SWIDTH2		0x9b40-0x9b7e 0x9b80-0x9b9e */	/* 5300 */
-/*SWIDTH2		0x9b9f-0x9bfc	*/		/* 5400 */
-/*SWIDTH2		0x9c40-0x9c7e 0x9c80-0x9c9e */	/* 5500 */
-/*SWIDTH2		0x9c9f-0x9cfc	*/		/* 5600 */
-/*SWIDTH2		0x9d40-0x9d7e 0x9d80-0x9d9e */	/* 5700 */
-/*SWIDTH2		0x9d9f-0x9dfc	*/		/* 5800 */
-/*SWIDTH2		0x9e40-0x9e7e 0x9e80-0x9e9e */	/* 5900 */
-/*SWIDTH2		0x9e9f-0x9efc	*/		/* 6000 */
-/*SWIDTH2		0x9f40-0x9f7e 0x9f80-0x9f9e */	/* 6100 */
-/*SWIDTH2		0x9f9f-0x9ffc	*/		/* 6200 */
-/*SWIDTH2		0xe040-0xe07e 0xe080-0xe09e */	/* 6300 */
-/*SWIDTH2		0xe09f-0xe0fc	*/		/* 6400 */
-/*SWIDTH2		0xe140-0xe17e 0xe180-0xe19e */	/* 6500 */
-/*SWIDTH2		0xe19f-0xe1fc	*/		/* 6600 */
-/*SWIDTH2		0xe240-0xe27e 0xe280-0xe29e */	/* 6700 */
-/*SWIDTH2		0xe29f-0xe2fc	*/		/* 6800 */
-/*SWIDTH2		0xe340-0xe37e 0xe380-0xe39e */	/* 6900 */
-/*SWIDTH2		0xe39f-0xe3fc	*/		/* 7000 */
-/*SWIDTH2		0xe440-0xe47e 0xe480-0xe49e */	/* 7100 */
-/*SWIDTH2		0xe49f-0xe4fc	*/		/* 7200 */
-/*SWIDTH2		0xe540-0xe57e 0xe580-0xe59e */	/* 7300 */
-/*SWIDTH2		0xe59f-0xe5fc	*/		/* 7400 */
-/*SWIDTH2		0xe640-0xe67e 0xe680-0xe69e */	/* 7500 */
-/*SWIDTH2		0xe69f-0xe6fc	*/		/* 7600 */
-/*SWIDTH2		0xe740-0xe77e 0xe780-0xe79e */	/* 7700 */
-/*SWIDTH2		0xe79f-0xe7fc	*/		/* 7800 */
-/*SWIDTH2		0xe840-0xe87e 0xe880-0xe89e */	/* 7900 */
-/*SWIDTH2		0xe89f-0xe8fc	*/		/* 8000 */
-/*SWIDTH2		0xe940-0xe97e 0xe980-0xe99e */	/* 8100 */
-/*SWIDTH2		0xe99f-0xe9fc	*/		/* 8200 */
-/*SWIDTH2		0xea40-0xea7e 0xea80-0xea9e */	/* 8300 */
-/*SWIDTH2		0xea9f-0xeaa4	*/		/* 8400 */
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 08db22c97a0e2..bf541c0d0c97d 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -35,10 +35,18 @@
 #
 
 if [ $# -eq 0 ]; then
-	echo 'usage: shar file ...'
-	exit 1
+	echo 'usage: shar file ...' 1>&2
+	exit 64			# EX_USAGE
 fi
 
+for i
+do
+	if [ ! \( -d $i -o -r $i \) ]; then
+		echo "$i inaccessible or not exist" 1>&2
+		exit 66		# EX_NOINPUT
+	fi
+done
+
 cat << EOF
 # This is a shell archive.  Save it in a file, remove anything before
 # this line, and then unpack it by entering "sh file".  Note, it may
@@ -64,7 +72,7 @@ do
 	else
 		echo "echo x - $i"
 		echo "sed 's/^X//' >$i << 'END-of-$i'"
-		sed 's/^/X/' $i
+		sed 's/^/X/' $i || exit
 		echo "END-of-$i"
 	fi
 done
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
deleted file mode 100644
index 66886222ff921..0000000000000
--- a/usr.bin/ypwhich/ypwhich.1
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"	$NetBSD: ypwhich.1,v 1.3 1996/05/13 02:43:46 thorpej Exp $
-.\"
-.\" Copyright (c) 1994 Christopher G. Demetriou
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"      This product includes software developed by Christopher G. Demetriou.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\"	$Id$
-.\"
-.Dd February 23, 1994
-.Dt YPWHICH 1
-.Os
-.Sh NAME
-.Nm ypwhich
-.Nd return hostname of YP server of map master
-.Sh SYNOPSIS
-.Nm ypwhich
-.Op Fl d Ar domain
-.Oo
-.Op Fl t
-.Fl m Op Ar mname
-|
-.Ar host
-.Oc
-.Nm ypwhich
-.Fl x
-.Sh DESCRIPTION
-.Nm Ypwhich
-tells which
-.Tn YP
-server supplies
-.Tn YP
-services to a client, or which is the master for a map.
-If invoked without arguments, it gives the
-.Tn YP
-server for the local machine.
-If
-.Ar host
-is specified, that machine is queried to find out
-which
-.Tn YP
-server it is using.
-.Pp
-The options are as follows:
-.Bl -tag -width indent
-.It Fl d Ar domain
-Specify a domain other than the default domain.
-.It Fl t
-Inhibit translation of map nicknames
-to their corresponding map names.
-.It Fl m Op Ar mname
-Find the master
-.Tn YP
-server for the named map.  No
-.Ar host
-may be specified with the
-.Fl m
-option.
-.Ar Mname
-can be a map name or nickname.  If
-.Ar mname
-is ommitted,
-.Nm ypwhich
-will produce a list of available maps.
-.It Fl x
-Display the map nickname table.
-.El
-.Sh SEE ALSO
-.Xr domainname 1 ,
-.Xr ypcat 1 ,
-.Xr ypmatch 1 ,
-.Xr yp 4 ,
-.Xr ypbind 8 ,
-.Xr yppoll 8 ,
-.Xr ypset 8
-.Sh AUTHOR
-Theo De Raadt