Deorbit catman. The tradeoff of disk for performance has long since tipped

in favor of just rendering the manpage instead of relying on pre-formatted
catpages. Note, this does not impede the ability to use existing catpages,
it just removes the utility to generate them.

Reviewed by:	imp, allanjude
Approved by:	emaste (mentor)
Differential Revision:	https://reviews.freebsd.org/D12317

21 files changed, 20 insertions, 1084 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b74fd5344d0c..2e6ec04cfb35 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170913: remove unneeded catman utility
+OLD_FILES+=etc/periodic/weekly/330.catman
+OLD_FILES+=usr/bin/catman
+OLD_FILES+=usr/libexec/catman.local
+OLD_FILES+=usr/share/man/man1/catman.1.gz
+OLD_FILES+=usr/share/man/man8/catman.local.8.gz
+
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
 
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 789921d27bba..801733301318 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -181,9 +181,6 @@ weekly_locate_enable="YES"				# Update locate weekly
 # 320.whatis
 weekly_whatis_enable="YES"				# Update whatis weekly
 
-# 330.catman
-weekly_catman_enable="NO"				# Preformat man pages
-
 # 340.noid
 weekly_noid_enable="NO"					# Find unowned files
 weekly_noid_dirs="/"					# Look here
diff --git a/etc/periodic/weekly/330.catman b/etc/periodic/weekly/330.catman
deleted file mode 100755
index 1ba2f7e9a973..000000000000
--- a/etc/periodic/weekly/330.catman
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh -
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-case "$weekly_catman_enable" in
-    [Yy][Ee][Ss])
-	if [ ! -d /usr/share/man/cat1 ]
-	then
-	    echo '$weekly_catman_enable is set but /usr/share/man/cat1' \
-		"doesn't exist"
-	    rc=2
-	else
-	    echo ""
-	    echo "Reformatting manual pages:"
-
-	    MANPATH=`/usr/bin/manpath -q`
-	    if [ $? = 0 ]
-	    then
-		if [ -z "${MANPATH}" ]
-		then
-		    echo "manpath failed to find any manpath directories"
-		    rc=3
-		else
-		    man_locales=`/usr/bin/manpath -qL`
-		    rc=0
-
-		    # Preformat original, non-localized manpages
-		    echo /usr/libexec/catman.local -r "$MANPATH" |
-			su -fm man || rc=3
-
-		    # Preformat localized manpages.
-		    if [ -n "$man_locales" ]
-		    then
-			for i in $man_locales
-			do
-			    echo /usr/libexec/catman.local -Lr \
-				"$MANPATH" | LC_ALL=$i su -fm man || rc=3
-			done
-		    fi
-		fi
-	    else
-		rc=3
-	    fi
-	fi;;
-
-    *)  rc=0;;
-esac
-
-exit $rc
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index 865ef5340def..c32420a2be65 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -13,7 +13,7 @@ FILES+=	310.locate
 .endif
 
 .if ${MK_MAN_UTILS} != "no"
-FILES+=	320.whatis 330.catman
+FILES+=	320.whatis
 .endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile
index 91872846202b..5038085cc4e3 100644
--- a/libexec/makewhatis.local/Makefile
+++ b/libexec/makewhatis.local/Makefile
@@ -3,7 +3,5 @@
 SCRIPTS=	makewhatis.local.sh
 MAN=		makewhatis.local.8
 SCRIPTSDIR=	${LIBEXECDIR}
-LINKS=		${SCRIPTSDIR}/makewhatis.local ${SCRIPTSDIR}/catman.local
-MLINKS=		makewhatis.local.8 catman.local.8
 
 .include <bsd.prog.mk>
diff --git a/libexec/makewhatis.local/makewhatis.local.8 b/libexec/makewhatis.local/makewhatis.local.8
index dfe252fdd961..b3ef432bda00 100644
--- a/libexec/makewhatis.local/makewhatis.local.8
+++ b/libexec/makewhatis.local/makewhatis.local.8
@@ -27,22 +27,19 @@
 .Dt MAKEWHATIS.LOCAL 8
 .Os
 .Sh NAME
-.Nm makewhatis.local , catman.local
-.Nd start makewhatis or catman for local file systems
+.Nm makewhatis.local
+.Nd start makewhatis for local file systems
 .Sh SYNOPSIS
 .Nm /usr/libexec/makewhatis.local
 .Op options
 .Ar directories ...
-.Nm /usr/libexec/catman.local
-.Op options
-.Ar directories ...
 .Sh DESCRIPTION
 The
 .Nm
 utility starts
 .Xr makewhatis 1
 only for file systems physically mounted on the system
-where the
+where
 .Nm
 is being executed.
 Running makewhatis
@@ -53,25 +50,14 @@ your NFS server -- all NFS clients start makewhatis at the same time!
 So use this wrapper for
 .Xr cron 8
 instead of calling makewhatis directly.
-The
-.Nm catman.local
-utility is using for same purposes as
-.Nm
-but for
-.Xr catman 1 .
 .Sh FILES
 .Bl -tag -width /etc/periodic/weekly/320.whatis.XXX -compact
 .It Pa /etc/periodic/weekly/320.whatis
 run
 .Nm
 every week
-.It Pa /etc/periodic/weekly/330.catman
-run
-.Nm catman.local
-every week
 .El
 .Sh SEE ALSO
-.Xr catman 1 ,
 .Xr find 1 ,
 .Xr makewhatis 1 ,
 .Xr cron 8 ,
diff --git a/libexec/makewhatis.local/makewhatis.local.sh b/libexec/makewhatis.local/makewhatis.local.sh
index 8be25300b75d..777c0c0153c4 100644
--- a/libexec/makewhatis.local/makewhatis.local.sh
+++ b/libexec/makewhatis.local/makewhatis.local.sh
@@ -31,8 +31,6 @@
 # /usr may kill your NFS server -- all clients start makewhatis at the same
 # time! So use this wrapper instead calling makewhatis directly.
 #
-# PS: this wrapper works also for catman(1)
-#
 # $FreeBSD$
 
 PATH=/bin:/usr/bin:$PATH; export PATH
diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5
index abcf4a358d24..01f6817c6d62 100644
--- a/share/man/man5/periodic.conf.5
+++ b/share/man/man5/periodic.conf.5
@@ -593,15 +593,6 @@ if you want to run
 This script regenerates the database used by the
 .Xr apropos 1
 command.
-.It Va weekly_catman_enable
-.Pq Vt bool
-Set to
-.Dq Li YES
-if you want to run
-.Pa /usr/libexec/catman.local .
-This script processes all out of date manual pages, speeding up the
-.Xr man 1
-command at the expense of disk space.
 .It Va weekly_noid_enable
 .Pq Vt bool
 Set to
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index a03f4de5cb95..eb4a0fca9f16 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -4453,7 +4453,6 @@ configuration file.
 .It Pa /etc/rc.conf.local
 .El
 .Sh SEE ALSO
-.Xr catman 1 ,
 .Xr chmod 1 ,
 .Xr gdb 1 ,
 .Xr info 1 ,
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 692879f4cb1e..0d67b68cb1c1 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1069,7 +1069,6 @@ Only the uncompressed versions will be installed.
 .It Va WITHOUT_MAN_UTILS
 Set to not build utilities for manual pages,
 .Xr apropos 1 ,
-.Xr catman 1 ,
 .Xr makewhatis 1 ,
 .Xr man 1 ,
 .Xr whatis 1 ,
diff --git a/sys/mips/rmi/rootfs_list.txt b/sys/mips/rmi/rootfs_list.txt
index 86895b6a2f5c..e68b2d865d75 100644
--- a/sys/mips/rmi/rootfs_list.txt
+++ b/sys/mips/rmi/rootfs_list.txt
@@ -158,7 +158,6 @@
 ./etc/periodic/weekly/999.local
 ./etc/periodic/weekly/310.locate
 ./etc/periodic/weekly/320.whatis
-./etc/periodic/weekly/330.catman
 ./etc/periodic/weekly/400.status-pkg
 ./etc/ppp
 ./etc/ppp/ppp.conf
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend
index 3ca21821902d..4fc4b07daa63 100644
--- a/targets/pseudo/userland/Makefile.depend
+++ b/targets/pseudo/userland/Makefile.depend
@@ -182,7 +182,6 @@ DIRDEPS+= \
 	usr.bin/c99 \
 	usr.bin/calendar \
 	usr.bin/cap_mkdb \
-	usr.bin/catman \
 	usr.bin/chat \
 	usr.bin/checknr \
 	usr.bin/chkey \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index e497b8d55352..e72ed85ca5c2 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -6097,24 +6097,19 @@ OLD_DIRS+=${MAN_DIRS}
 
 .if ${MK_MAN_UTILS} == no
 OLD_FILES+=etc/periodic/weekly/320.whatis
-OLD_FILES+=etc/periodic/weekly/330.catman
 OLD_FILES+=usr/bin/apropos
-OLD_FILES+=usr/bin/catman
 OLD_FILES+=usr/bin/makewhatis
 OLD_FILES+=usr/bin/man
 OLD_FILES+=usr/bin/manpath
 OLD_FILES+=usr/bin/whatis
-OLD_FILES+=usr/libexec/catman.local
 OLD_FILES+=usr/libexec/makewhatis.local
 OLD_FILES+=usr/sbin/manctl
 OLD_FILES+=usr/share/man/man1/apropos.1.gz
-OLD_FILES+=usr/share/man/man1/catman.1.gz
 OLD_FILES+=usr/share/man/man1/makewhatis.1.gz
 OLD_FILES+=usr/share/man/man1/man.1.gz
 OLD_FILES+=usr/share/man/man1/manpath.1.gz
 OLD_FILES+=usr/share/man/man1/whatis.1.gz
 OLD_FILES+=usr/share/man/man5/man.conf.5.gz
-OLD_FILES+=usr/share/man/man8/catman.local.8.gz
 OLD_FILES+=usr/share/man/man8/makewhatis.local.8.gz
 OLD_FILES+=usr/share/man/man8/manctl.8.gz
 OLD_FILES+=usr/share/man/whatis
diff --git a/tools/build/options/WITHOUT_MAN_UTILS b/tools/build/options/WITHOUT_MAN_UTILS
index b2c4190486ce..8fc3f3e54f75 100644
--- a/tools/build/options/WITHOUT_MAN_UTILS
+++ b/tools/build/options/WITHOUT_MAN_UTILS
@@ -1,7 +1,6 @@
 .\" $FreeBSD$
 Set to not build utilities for manual pages,
 .Xr apropos 1 ,
-.Xr catman 1 ,
 .Xr makewhatis 1 ,
 .Xr man 1 ,
 .Xr whatis 1 ,
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index e25144992931..03c0d500a5eb 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -239,7 +239,6 @@ SUBDIR.${MK_MAIL}+=	from
 SUBDIR.${MK_MAIL}+=	mail
 SUBDIR.${MK_MAIL}+=	msgs
 SUBDIR.${MK_MAKE}+=	bmake
-SUBDIR.${MK_MAN_UTILS}+=	catman
 SUBDIR.${MK_MAN_UTILS}+=	man
 SUBDIR.${MK_NETCAT}+=	nc
 SUBDIR.${MK_NIS}+=	ypcat
diff --git a/usr.bin/catman/Makefile b/usr.bin/catman/Makefile
deleted file mode 100644
index ab4c01453a1b..000000000000
--- a/usr.bin/catman/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-PROG=	catman
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/catman/Makefile.depend b/usr.bin/catman/Makefile.depend
deleted file mode 100644
index 3646e2e2b1af..000000000000
--- a/usr.bin/catman/Makefile.depend
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/usr.bin/catman/catman.1 b/usr.bin/catman/catman.1
deleted file mode 100644
index 3b387c312750..000000000000
--- a/usr.bin/catman/catman.1
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" Copyright (c) 2002 John Rochester
-.\" 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 AUTHOR 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 AUTHOR 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.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd May 22, 2017
-.Dt CATMAN 1
-.Os
-.Sh NAME
-.Nm catman
-.Nd "preformat man pages"
-.Sh SYNOPSIS
-.Nm
-.Op Fl fLnrv
-.Op Ar directories ...
-.Sh DESCRIPTION
-The
-.Nm
-utility preformats all the man pages in
-.Ar directories
-using the
-.Nm mandoc
-command when supported, falling back on the
-.Nm nroff Fl man
-command.
-Directories may be separated by colons instead of spaces.
-If no
-.Ar directories
-are specified, the contents of the
-.Ev MANPATH
-environment variable is used, or if that is not set, the default directory
-.Pa /usr/share/man
-is processed.
-.Pp
-The options are as follows:
-.Bl -tag -width indent
-.It Fl f
-Force all man pages to be reformatted even if the corresponding cat page
-is newer.
-.It Fl L
-Process only localized subdirectories corresponding to the locale specified
-in the standard environment variables.
-.It Fl n
-Print out what would be done instead of performing any formatting.
-.It Fl r
-Scan for and remove
-.Dq junk
-files that are neither man pages nor their
-corresponding formatted cat pages.
-.It Fl v
-Cause
-.Nm
-to be more verbose about what it is doing.
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev MANPATH"
-.It Ev LC_ALL , LC_CTYPE , LANG
-These variables control what subdirectories will be processed if the
-.Fl L
-option is used.
-.It Ev MACHINE
-If set, overrides the current machine type when searching for
-machine specific man page subdirectories.
-.It Ev MACHINE_ARCH
-If set, overrides the current architecture when searching for
-architecture specific man page subdirectories.
-.It Ev MANPATH
-Determines the set of directories to be processed if none are given on
-the command line.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa /usr/share/man" -compact
-.It Pa /usr/share/man
-Default directory to process if the
-.Ev MANPATH
-environment variable is not set.
-.El
-.Sh EXIT STATUS
-.Ex -std
-.Sh SEE ALSO
-.Xr makewhatis 1 ,
-.Xr man 1 ,
-.Xr mandoc 1 ,
-.Xr nroff 1
-.Sh HISTORY
-A previous version of the
-.Nm
-command appeared in
-.Fx 2.1 .
-.Sh AUTHORS
-.An John Rochester
diff --git a/usr.bin/catman/catman.c b/usr.bin/catman/catman.c
deleted file mode 100644
index c3897e1a715f..000000000000
--- a/usr.bin/catman/catman.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/*-
- * Copyright (c) 2002 John Rochester
- * 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,
- *    in this position and unchanged.
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/utsname.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <langinfo.h>
-#include <libgen.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define DEFAULT_MANPATH		"/usr/share/man"
-
-#define TOP_LEVEL_DIR	0	/* signifies a top-level man directory */
-#define MAN_SECTION_DIR	1	/* signifies a man section directory */
-#define UNKNOWN		2	/* signifies an unclassifiable directory */
-
-#define TEST_EXISTS	0x01
-#define TEST_DIR	0x02
-#define TEST_FILE	0x04
-#define TEST_READABLE	0x08
-#define TEST_WRITABLE	0x10
-
-static int verbose;		/* -v flag: be verbose with warnings */
-static int pretend;		/* -n, -p flags: print out what would be done
-				   instead of actually doing it */
-static int force;		/* -f flag: force overwriting all cat pages */
-static int rm_junk;		/* -r flag: remove garbage pages */
-static char *locale;		/* user's locale if -L is used */
-static char *lang_locale;	/* short form of locale */
-static const char *machine, *machine_arch;
-static int exit_code;		/* exit code to use when finished */
-
-extern char **environ;
-
-/*
- * -T argument for nroff
- */
-static const char *nroff_device = "ascii";
-
-/*
- * Mapping from locale to nroff device
- */
-static const char *locale_device[] = {
-	"KOI8-R",	"koi8-r",
-	"ISO8859-1",	"latin1",
-	"ISO8859-15",	"latin1",
-	NULL
-};
-
-#define	BZ2_CMD		"bzip2"
-#define	BZ2_EXT		".bz2"
-#define	BZ2CAT_CMD	"bz"
-#define	GZ_CMD		"gzip"
-#define	GZ_EXT		".gz"
-#define	GZCAT_CMD	"z"
-enum Ziptype {NONE, BZIP, GZIP};
-
-static bool mandoc_locales = false;
-static uid_t uid;
-static int starting_dir;
-static char tmp_file[MAXPATHLEN];
-static struct stat test_st;
-
-/*
- * A hashtable is an array of chains composed of this entry structure.
- */
-struct hash_entry {
-	ino_t		inode_number;
-	dev_t		device_number;
-	const char	*data;
-	struct hash_entry *next;
-};
-
-#define HASHTABLE_ALLOC	16384	/* allocation for hashtable (power of 2) */
-#define HASH_MASK	(HASHTABLE_ALLOC - 1)
-
-static struct hash_entry *visited[HASHTABLE_ALLOC];
-static struct hash_entry *links[HASHTABLE_ALLOC];
-
-/*
- * Inserts a string into a hashtable keyed by inode & device number.
- */
-static void
-insert_hashtable(struct hash_entry **table,
-    ino_t inode_number,
-    dev_t device_number,
-    const char *data)
-{
-	struct hash_entry *new_entry;
-	struct hash_entry **chain;
-
-	new_entry = (struct hash_entry *) malloc(sizeof(struct hash_entry));
-	if (new_entry == NULL)
-		err(1, "can't insert into hashtable");
-	chain = &table[inode_number & HASH_MASK];
-	new_entry->inode_number = inode_number;
-	new_entry->device_number = device_number;
-	new_entry->data = data;
-	new_entry->next = *chain;
-	*chain = new_entry;
-}
-
-/*
- * Finds a string in a hashtable keyed by inode & device number.
- */
-static const char *
-find_hashtable(struct hash_entry **table,
-    ino_t inode_number,
-    dev_t device_number)
-{
-	struct hash_entry *chain;
-
-	chain = table[inode_number & HASH_MASK];
-	while (chain != NULL) {
-		if (chain->inode_number == inode_number &&
-		    chain->device_number == device_number)
-			return chain->data;
-		chain = chain->next;
-	}
-	return NULL;
-}
-
-static void
-trap_signal(int sig __unused)
-{
-	if (tmp_file[0] != '\0')
-		unlink(tmp_file);
-	exit(1);
-}
-
-/*
- * Deals with junk files in the man or cat section directories.
- */
-static void
-junk(const char *mandir, const char *name, const char *reason)
-{
-	if (verbose)
-		fprintf(stderr, "%s/%s: %s\n", mandir, name, reason);
-	if (rm_junk) {
-		fprintf(stderr, "rm %s/%s\n", mandir, name);
-		if (!pretend && unlink(name) < 0)
-			warn("%s/%s", mandir, name);
-	}
-}
-
-/*
- * Returns TOP_LEVEL_DIR for .../man, MAN_SECTION_DIR for .../manXXX,
- * and UNKNOWN for everything else.
- */
-static int
-directory_type(char *dir)
-{
-	char *p;
-
-	for (;;) {
-		p = strrchr(dir, '/');
-		if (p == NULL || p[1] != '\0')
-			break;
-		*p = '\0';
-	}
-	if (p == NULL)
-		p = dir;
-	else
-		p++;
-	if (strncmp(p, "man", 3) == 0) {
-		p += 3;
-		if (*p == '\0')
-			return TOP_LEVEL_DIR;
-		while (isalnum((unsigned char)*p) || *p == '_') {
-			if (*++p == '\0')
-				return MAN_SECTION_DIR;
-		}
-	}
-	return UNKNOWN;
-}
-
-/*
- * Tests whether the given file name (without a preceding path)
- * is a proper man page name (like "mk-amd-map.8.gz").
- * Only alphanumerics and '_' are allowed after the last '.' and
- * the last '.' can't be the first or last characters.
- */
-static int
-is_manpage_name(char *name)
-{
-	char *lastdot = NULL;
-	char *n = name;
-
-	while (*n != '\0') {
-		if (!isalnum((unsigned char)*n)) {
-			switch (*n) {
-			case '_':
-				break;
-			case '-':
-			case '+':
-			case '[':
-			case ':':
-				lastdot = NULL;
-				break;
-			case '.':
-				lastdot = n;
-				break;
-			default:
-				return 0;
-			}
-		}
-		n++;
-	}
-	return lastdot > name && lastdot + 1 < n;
-}
-
-static int
-is_bzipped(char *name)
-{
-	int len = strlen(name);
-	return len >= 5 && strcmp(&name[len - 4], BZ2_EXT) == 0;
-}
-
-static int
-is_gzipped(char *name)
-{
-	int len = strlen(name);
-	return len >= 4 && strcmp(&name[len - 3], GZ_EXT) == 0;
-}
-
-/*
- * Converts manXXX to catXXX.
- */
-static char *
-get_cat_section(char *section)
-{
-	char *cat_section;
-
-	cat_section = strdup(section);
-	assert(strlen(section) > 3 && strncmp(section, "man", 3) == 0);
-	memcpy(cat_section, "cat", 3);
-	return cat_section;
-}
-
-/*
- * Tests to see if the given directory has already been visited.
- */
-static int
-already_visited(char *mandir, char *dir, int count_visit)
-{
-	struct stat st;
-
-	if (stat(dir, &st) < 0) {
-		if (mandir != NULL)
-			warn("%s/%s", mandir, dir);
-		else
-			warn("%s", dir);
-		exit_code = 1;
-		return 1;
-	}
-	if (find_hashtable(visited, st.st_ino, st.st_dev) != NULL) {
-		if (mandir != NULL)
-			warnx("already visited %s/%s", mandir, dir);
-		else
-			warnx("already visited %s", dir);
-		return 1;
-	}
-	if (count_visit)
-		insert_hashtable(visited, st.st_ino, st.st_dev, "");
-	return 0;
-}
-
-/*
- * Returns a set of TEST_* bits describing a file's type and permissions.
- * If mod_time isn't NULL, it will contain the file's modification time.
- */
-static int
-test_path(char *name, time_t *mod_time)
-{
-	int result;
-
-	if (stat(name, &test_st) < 0)
-		return 0;
-	result = TEST_EXISTS;
-	if (mod_time != NULL)
-		*mod_time = test_st.st_mtime;
-	if (S_ISDIR(test_st.st_mode))
-		result |= TEST_DIR;
-	else if (S_ISREG(test_st.st_mode))
-		result |= TEST_FILE;
-	if (access(name, R_OK))
-		result |= TEST_READABLE;
-	if (access(name, W_OK))
-		result |= TEST_WRITABLE;
-	return result;
-}
-
-/*
- * Checks whether a file is a symbolic link.
- */
-static int
-is_symlink(char *path)
-{
-	struct stat st;
-
-	return lstat(path, &st) >= 0 && S_ISLNK(st.st_mode);
-}
-
-/*
- * Tests to see if the given directory can be written to.
- */
-static void
-check_writable(char *mandir)
-{
-	if (verbose && !(test_path(mandir, NULL) & TEST_WRITABLE))
-		fprintf(stderr, "%s: not writable - will only be able to write to existing cat directories\n", mandir);
-}
-
-/*
- * If the directory exists, attempt to make it writable, otherwise
- * attempt to create it.
- */
-static int
-make_writable_dir(char *mandir, char *dir)
-{
-	int test;
-
-	if ((test = test_path(dir, NULL)) != 0) {
-		if (!(test & TEST_WRITABLE) && chmod(dir, 0755) < 0) {
-			warn("%s/%s: chmod", mandir, dir);
-			exit_code = 1;
-			return 0;
-		}
-	} else {
-		if (verbose || pretend)
-			fprintf(stderr, "mkdir %s\n", dir);
-		if (!pretend) {
-			unlink(dir);
-			if (mkdir(dir, 0755) < 0) {
-				warn("%s/%s: mkdir", mandir, dir);
-				exit_code = 1;
-				return 0;
-			}
-		}
-	}
-	return 1;
-}
-
-/*
- * Processes a single man page source by using nroff to create
- * the preformatted cat page.
- */
-static void
-process_page(char *mandir, char *src, char *cat, enum Ziptype zipped)
-{
-	int src_test, cat_test;
-	time_t src_mtime, cat_mtime;
-	char cmd[MAXPATHLEN];
-	dev_t src_dev;
-	ino_t src_ino;
-	const char *link_name;
-
-	src_test = test_path(src, &src_mtime);
-	if (!(src_test & (TEST_FILE|TEST_READABLE))) {
-		if (!(src_test & TEST_DIR)) {
-			warnx("%s/%s: unreadable", mandir, src);
-			exit_code = 1;
-			if (rm_junk && is_symlink(src))
-				junk(mandir, src, "bogus symlink");
-		}
-		return;
-	}
-	src_dev = test_st.st_dev;
-	src_ino = test_st.st_ino;
-	cat_test = test_path(cat, &cat_mtime);
-	if (cat_test & (TEST_FILE|TEST_READABLE)) {
-		if (!force && cat_mtime >= src_mtime) {
-			if (verbose) {
-				fprintf(stderr, "\t%s/%s: up to date\n",
-				    mandir, src);
-			}
-			return;
-		}
-	}
-	/*
-	 * Is the man page a link to one we've already processed?
-	 */
-	if ((link_name = find_hashtable(links, src_ino, src_dev)) != NULL) {
-		if (verbose || pretend) {
-			fprintf(stderr, "%slink %s -> %s\n",
-			    verbose ? "\t" : "", cat, link_name);
-		}
-		if (!pretend) {
-			(void) unlink(cat);
-			if (link(link_name, cat) < 0)
-				warn("%s %s: link", link_name, cat);
-		}
-		return;
-	}
-	insert_hashtable(links, src_ino, src_dev, strdup(cat));
-	if (verbose || pretend) {
-		fprintf(stderr, "%sformat %s -> %s\n",
-		    verbose ? "\t" : "", src, cat);
-		if (pretend)
-			return;
-	}
-	snprintf(tmp_file, sizeof tmp_file, "%s.tmp", cat);
-	snprintf(cmd, sizeof cmd,
-	    "%scat %s | mandoc -Tlint -Wunsupp 2>/dev/null",
-	    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
-	    src);
-	if (system(cmd) == 0) {
-		snprintf(cmd, sizeof cmd,
-		    "%scat %s | mandoc -T%s | %s > %s.tmp",
-		    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
-		    src, mandoc_locales ? "locale" : "ascii",
-		    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
-		    cat);
-	} else {
-		snprintf(cmd, sizeof cmd,
-		    "%scat %s | tbl | nroff -c -T%s -man | %s > %s.tmp",
-		    zipped == BZIP ? BZ2CAT_CMD : zipped == GZIP ? GZCAT_CMD : "",
-		    src, nroff_device,
-		    zipped == BZIP ? BZ2_CMD : zipped == GZIP ? GZ_CMD : "cat",
-		    cat);
-	}
-	if (system(cmd) != 0)
-		err(1, "formatting pipeline");
-	if (rename(tmp_file, cat) < 0)
-		warn("%s", cat);
-	tmp_file[0] = '\0';
-}
-
-/*
- * Scan the man section directory for pages and process each one,
- * then check for junk in the corresponding cat section.
- */
-static void
-scan_section(char *mandir, char *section, char *cat_section)
-{
-	struct dirent **entries;
-	char **expected = NULL;
-	int npages;
-	int nexpected = 0;
-	int i, e;
-	enum Ziptype zipped;
-	char *page_name;
-	char page_path[MAXPATHLEN];
-	char cat_path[MAXPATHLEN];
-	char zip_path[MAXPATHLEN];
-
-	/*
-	 * scan the man section directory for pages
-	 */
-	npages = scandir(section, &entries, NULL, alphasort);
-	if (npages < 0) {
-		warn("%s/%s", mandir, section);
-		exit_code = 1;
-		return;
-	}
-	if (verbose || rm_junk) {
-		/*
-		 * Maintain a list of all cat pages that should exist,
-		 * corresponding to existing man pages.
-		 */
-		expected = (char **) calloc(npages, sizeof(char *));
-	}
-	for (i = 0; i < npages; free(entries[i++])) {
-		page_name = entries[i]->d_name;
-		snprintf(page_path, sizeof page_path, "%s/%s", section,
-		    page_name);
-		if (!is_manpage_name(page_name)) {
-			if (!(test_path(page_path, NULL) & TEST_DIR)) {
-				junk(mandir, page_path,
-				    "invalid man page name");
-			}
-			continue;
-		}
-		zipped = is_bzipped(page_name) ? BZIP :
-		    is_gzipped(page_name) ? GZIP : NONE;
-		if (zipped != NONE) {
-			snprintf(cat_path, sizeof cat_path, "%s/%s",
-			    cat_section, page_name);
-			if (expected != NULL)
-				expected[nexpected++] = strdup(page_name);
-			process_page(mandir, page_path, cat_path, zipped);
-		} else {
-			/*
-			 * We've got an uncompressed man page,
-			 * check to see if there's a (preferred)
-			 * compressed one.
-			 */
-			snprintf(zip_path, sizeof zip_path, "%s%s",
-			    page_path, GZ_EXT);
-			if (test_path(zip_path, NULL) != 0) {
-				junk(mandir, page_path,
-				    "man page unused due to existing " GZ_EXT);
-			} else {
-				if (verbose) {
-					fprintf(stderr,
-						"warning, %s is uncompressed\n",
-						page_path);
-				}
-				snprintf(cat_path, sizeof cat_path, "%s/%s",
-				    cat_section, page_name);
-				if (expected != NULL) {
-					asprintf(&expected[nexpected++],
-					    "%s", page_name);
-				}
-				process_page(mandir, page_path, cat_path, NONE);
-			}
-		}
-	}
-	free(entries);
-	if (expected == NULL)
-	    return;
-	/*
-	 * scan cat sections for junk
-	 */
-	npages = scandir(cat_section, &entries, NULL, alphasort);
-	e = 0;
-	for (i = 0; i < npages; free(entries[i++])) {
-		const char *junk_reason;
-		int cmp = 1;
-
-		page_name = entries[i]->d_name;
-		if (strcmp(page_name, ".") == 0 || strcmp(page_name, "..") == 0)
-			continue;
-		/*
-		 * Keep the index into the expected cat page list
-		 * ahead of the name we've found.
-		 */
-		while (e < nexpected &&
-		    (cmp = strcmp(page_name, expected[e])) > 0)
-			free(expected[e++]);
-		if (cmp == 0)
-			continue;
-		/* we have an unexpected page */
-		snprintf(cat_path, sizeof cat_path, "%s/%s", cat_section,
-		    page_name);
-		if (!is_manpage_name(page_name)) {
-			if (test_path(cat_path, NULL) & TEST_DIR)
-				continue;
-			junk_reason = "invalid cat page name";
-		} else if (!is_gzipped(page_name) && e + 1 < nexpected &&
-		    strncmp(page_name, expected[e + 1], strlen(page_name)) == 0 &&
-		    strlen(expected[e + 1]) == strlen(page_name) + 3) {
-			junk_reason = "cat page unused due to existing " GZ_EXT;
-		} else
-			junk_reason = "cat page without man page";
-		junk(mandir, cat_path, junk_reason);
-	}
-	free(entries);
-	while (e < nexpected)
-		free(expected[e++]);
-	free(expected);
-}
-
-
-/*
- * Processes a single man section.
- */
-static void
-process_section(char *mandir, char *section)
-{
-	char *cat_section;
-
-	if (already_visited(mandir, section, 1))
-		return;
-	if (verbose)
-		fprintf(stderr, "  section %s\n", section);
-	cat_section = get_cat_section(section);
-	if (make_writable_dir(mandir, cat_section))
-		scan_section(mandir, section, cat_section);
-	free(cat_section);
-}
-
-static int
-select_sections(const struct dirent *entry)
-{
-	char *name;
-	int ret;
-
-	name = strdup(entry->d_name);
-	ret = directory_type(name) == MAN_SECTION_DIR;
-	free(name);
-	return (ret);
-}
-
-/*
- * Processes a single top-level man directory.  If section isn't NULL,
- * it will only process that section sub-directory, otherwise it will
- * process all of them.
- */
-static void
-process_mandir(char *dir_name, char *section)
-{
-	if (fchdir(starting_dir) < 0)
-		err(1, "fchdir");
-	if (already_visited(NULL, dir_name, section == NULL))
-		return;
-	check_writable(dir_name);
-	if (verbose)
-		fprintf(stderr, "man directory %s\n", dir_name);
-	if (pretend)
-		fprintf(stderr, "cd %s\n", dir_name);
-	if (chdir(dir_name) < 0) {
-		warn("%s: chdir", dir_name);
-		exit_code = 1;
-		return;
-	}
-	if (section != NULL) {
-		process_section(dir_name, section);
-	} else {
-		struct dirent **entries;
-		char *machine_dir, *arch_dir;
-		int nsections;
-		int i;
-
-		nsections = scandir(".", &entries, select_sections, alphasort);
-		if (nsections < 0) {
-			warn("%s", dir_name);
-			exit_code = 1;
-			return;
-		}
-		for (i = 0; i < nsections; i++) {
-			process_section(dir_name, entries[i]->d_name);
-			asprintf(&machine_dir, "%s/%s", entries[i]->d_name,
-			    machine);
-			if (test_path(machine_dir, NULL) & TEST_DIR)
-				process_section(dir_name, machine_dir);
-			free(machine_dir);
-			if (strcmp(machine_arch, machine) != 0) {
-				asprintf(&arch_dir, "%s/%s", entries[i]->d_name,
-				    machine_arch);
-				if (test_path(arch_dir, NULL) & TEST_DIR)
-					process_section(dir_name, arch_dir);
-				free(arch_dir);
-			}
-			free(entries[i]);
-		}
-		free(entries);
-	}
-}
-
-/*
- * Processes one argument, which may be a colon-separated list of
- * directories.
- */
-static void
-process_argument(const char *arg)
-{
-	char *dir;
-	char *mandir;
-	char *section;
-	char *parg;
-
-	parg = strdup(arg);
-	if (parg == NULL)
-		err(1, "out of memory");
-	while ((dir = strsep(&parg, ":")) != NULL) {
-		switch (directory_type(dir)) {
-		case TOP_LEVEL_DIR:
-			if (locale != NULL) {
-				asprintf(&mandir, "%s/%s", dir, locale);
-				process_mandir(mandir, NULL);
-				free(mandir);
-				if (lang_locale != NULL) {
-					asprintf(&mandir, "%s/%s", dir,
-					    lang_locale);
-					process_mandir(mandir, NULL);
-					free(mandir);
-				}
-			} else {
-				process_mandir(dir, NULL);
-			}
-			break;
-		case MAN_SECTION_DIR: {
-			mandir = strdup(dirname(dir));
-			section = strdup(basename(dir));
-			process_mandir(mandir, section);
-			free(mandir);
-			free(section);
-			break;
-			}
-		default:
-			warnx("%s: directory name not in proper man form", dir);
-			exit_code = 1;
-		}
-	}
-	free(parg);
-}
-
-static void
-determine_locale(void)
-{
-	char *sep;
-
-	if ((locale = setlocale(LC_CTYPE, "")) == NULL) {
-		warnx("-L option used, but no locale found\n");
-		return;
-	}
-	sep = strchr(locale, '_');
-	if (sep != NULL && isupper((unsigned char)sep[1])
-			&& isupper((unsigned char)sep[2])) {
-		asprintf(&lang_locale, "%.*s%s", (int)(sep - locale),
-		    locale, &sep[3]);
-	}
-	sep = nl_langinfo(CODESET);
-	if (sep != NULL && *sep != '\0' && strcmp(sep, "US-ASCII") != 0) {
-		int i;
-
-		for (i = 0; locale_device[i] != NULL; i += 2) {
-			if (strcmp(sep, locale_device[i]) == 0) {
-				nroff_device = locale_device[i + 1];
-				break;
-			}
-		}
-	}
-	if (verbose) {
-		if (lang_locale != NULL)
-			fprintf(stderr, "short locale is %s\n", lang_locale);
-		fprintf(stderr, "nroff device is %s\n", nroff_device);
-	}
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: %s [-fLnrv] [directories ...]\n",
-	    getprogname());
-	exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-	int opt;
-
-	if ((uid = getuid()) == 0) {
-		fprintf(stderr, "don't run %s as root, use:\n   echo", argv[0]);
-		for (optind = 0; optind < argc; optind++) {
-			fprintf(stderr, " %s", argv[optind]);
-		}
-		fprintf(stderr, " | nice -5 su -m man\n");
-		exit(1);
-	}
-	while ((opt = getopt(argc, argv, "vnfLrh")) != -1) {
-		switch (opt) {
-		case 'f':
-			force++;
-			break;
-		case 'L':
-			determine_locale();
-			mandoc_locales = true;
-			break;
-		case 'n':
-			pretend++;
-			break;
-		case 'r':
-			rm_junk++;
-			break;
-		case 'v':
-			verbose++;
-			break;
-		default:
-			usage();
-			/* NOTREACHED */
-		}
-	}
-	if ((starting_dir = open(".", 0)) < 0) {
-		err(1, ".");
-	}
-	umask(022);
-	signal(SIGINT, trap_signal);
-	signal(SIGHUP, trap_signal);
-	signal(SIGQUIT, trap_signal);
-	signal(SIGTERM, trap_signal);
-
-	if ((machine = getenv("MACHINE")) == NULL) {
-		static struct utsname utsname;
-
-		if (uname(&utsname) == -1)
-			err(1, "uname");
-		machine = utsname.machine;
-	}
-
-	if ((machine_arch = getenv("MACHINE_ARCH")) == NULL)
-		machine_arch = MACHINE_ARCH;
-
-	if (optind == argc) {
-		const char *manpath = getenv("MANPATH");
-		if (manpath == NULL)
-			manpath = DEFAULT_MANPATH;
-		process_argument(manpath);
-	} else {
-		while (optind < argc)
-			process_argument(argv[optind++]);
-	}
-	exit(exit_code);
-}
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index c7b08db78c90..53e8aab1679e 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -194,24 +194,24 @@ PAM configuration for
 .El
 .Sh EXAMPLES
 .Bl -tag -width 5n -compact
-.It Li "su -m man -c catman"
+.It Li "su -m operator -c poweroff"
 Starts a shell as user
-.Li man ,
+.Li operator ,
 and runs the command
-.Li catman .
-You will be asked for man's password unless your real UID is 0.
+.Li poweroff .
+You will be asked for operator's password unless your real UID is 0.
 Note that the
 .Fl m
 option is required since user
-.Dq man
+.Dq operator
 does not have a valid shell by default.
 In this example,
 .Fl c
 is passed to the shell of the user
-.Dq man ,
+.Dq operator ,
 and is not interpreted as an argument to
 .Nm .
-.It Li "su -m man -c 'catman /usr/share/man /usr/local/man'"
+.It Li "su -m operator -c 'shutdown -p now'"
 Same as above, but the target command consists of more than a
 single word and hence is quoted for use with the
 .Fl c
@@ -219,7 +219,7 @@ option being passed to the shell.
 (Most shells expect the argument to
 .Fl c
 to be a single word).
-.It Li "su -m -c staff man -c 'catman /usr/share/man /usr/local/man'"
+.It Li "su -m -c staff operator -c 'shutdown -p now'"
 Same as above, but the target command is run with the resource limits of
 the login class
 .Dq staff .
diff --git a/usr.sbin/crunch/examples/really-big.conf b/usr.sbin/crunch/examples/really-big.conf
index 922078a83820..cf95ee04c8b8 100644
--- a/usr.sbin/crunch/examples/really-big.conf
+++ b/usr.sbin/crunch/examples/really-big.conf
@@ -67,7 +67,7 @@ special tn3270 srcdir /usr/src/usr.bin/tn3270/tn3270
 
 srcdirs /usr/src/usr.sbin
 
-progs ac accton amd arp bad144 catman chown chroot config config.new cron
+progs ac accton amd arp bad144 chown chroot config config.new cron
 progs dev_mkdb diskpart edquota flcopy gettable grfinfo hilinfo htable inetd
 progs iostat iteconfig kvm_mkdb mtree named portmap pppd
 progs pstat pwd_mkdb quot quotaon rarpd rbootd repquota rmt rpc.bootparamd