Date: Wed, 13 Sep 2017 16:35:16 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323550 - in head: . etc/defaults etc/periodic/weekly libexec/makewhatis.local share/man/man5 sys/mips/rmi targets/pseudo/userland tools/build/mk tools/build/options usr.bin usr.bin/cat... Message-ID: <201709131635.v8DGZGFB010742@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gordon Date: Wed Sep 13 16:35:16 2017 New Revision: 323550 URL: https://svnweb.freebsd.org/changeset/base/323550 Log: 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 Deleted: head/etc/periodic/weekly/330.catman head/usr.bin/catman/ Modified: head/ObsoleteFiles.inc head/etc/defaults/periodic.conf head/etc/periodic/weekly/Makefile head/libexec/makewhatis.local/Makefile head/libexec/makewhatis.local/makewhatis.local.8 head/libexec/makewhatis.local/makewhatis.local.sh head/share/man/man5/periodic.conf.5 head/share/man/man5/rc.conf.5 head/share/man/man5/src.conf.5 head/sys/mips/rmi/rootfs_list.txt head/targets/pseudo/userland/Makefile.depend head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/build/options/WITHOUT_MAN_UTILS head/usr.bin/Makefile head/usr.bin/su/su.1 head/usr.sbin/crunch/examples/really-big.conf Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Sep 13 16:23:59 2017 (r323549) +++ head/ObsoleteFiles.inc Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/etc/defaults/periodic.conf ============================================================================== --- head/etc/defaults/periodic.conf Wed Sep 13 16:23:59 2017 (r323549) +++ head/etc/defaults/periodic.conf Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/etc/periodic/weekly/Makefile ============================================================================== --- head/etc/periodic/weekly/Makefile Wed Sep 13 16:23:59 2017 (r323549) +++ head/etc/periodic/weekly/Makefile Wed Sep 13 16:35:16 2017 (r323550) @@ -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> Modified: head/libexec/makewhatis.local/Makefile ============================================================================== --- head/libexec/makewhatis.local/Makefile Wed Sep 13 16:23:59 2017 (r323549) +++ head/libexec/makewhatis.local/Makefile Wed Sep 13 16:35:16 2017 (r323550) @@ -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> Modified: head/libexec/makewhatis.local/makewhatis.local.8 ============================================================================== --- head/libexec/makewhatis.local/makewhatis.local.8 Wed Sep 13 16:23:59 2017 (r323549) +++ head/libexec/makewhatis.local/makewhatis.local.8 Wed Sep 13 16:35:16 2017 (r323550) @@ -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 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 , Modified: head/libexec/makewhatis.local/makewhatis.local.sh ============================================================================== --- head/libexec/makewhatis.local/makewhatis.local.sh Wed Sep 13 16:23:59 2017 (r323549) +++ head/libexec/makewhatis.local/makewhatis.local.sh Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/share/man/man5/periodic.conf.5 ============================================================================== --- head/share/man/man5/periodic.conf.5 Wed Sep 13 16:23:59 2017 (r323549) +++ head/share/man/man5/periodic.conf.5 Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/share/man/man5/rc.conf.5 ============================================================================== --- head/share/man/man5/rc.conf.5 Wed Sep 13 16:23:59 2017 (r323549) +++ head/share/man/man5/rc.conf.5 Wed Sep 13 16:35:16 2017 (r323550) @@ -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 , Modified: head/share/man/man5/src.conf.5 ============================================================================== --- head/share/man/man5/src.conf.5 Wed Sep 13 16:23:59 2017 (r323549) +++ head/share/man/man5/src.conf.5 Wed Sep 13 16:35:16 2017 (r323550) @@ -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 , Modified: head/sys/mips/rmi/rootfs_list.txt ============================================================================== --- head/sys/mips/rmi/rootfs_list.txt Wed Sep 13 16:23:59 2017 (r323549) +++ head/sys/mips/rmi/rootfs_list.txt Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/targets/pseudo/userland/Makefile.depend ============================================================================== --- head/targets/pseudo/userland/Makefile.depend Wed Sep 13 16:23:59 2017 (r323549) +++ head/targets/pseudo/userland/Makefile.depend Wed Sep 13 16:35:16 2017 (r323550) @@ -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 \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 13 16:23:59 2017 (r323549) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/tools/build/options/WITHOUT_MAN_UTILS ============================================================================== --- head/tools/build/options/WITHOUT_MAN_UTILS Wed Sep 13 16:23:59 2017 (r323549) +++ head/tools/build/options/WITHOUT_MAN_UTILS Wed Sep 13 16:35:16 2017 (r323550) @@ -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 , Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Wed Sep 13 16:23:59 2017 (r323549) +++ head/usr.bin/Makefile Wed Sep 13 16:35:16 2017 (r323550) @@ -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 Modified: head/usr.bin/su/su.1 ============================================================================== --- head/usr.bin/su/su.1 Wed Sep 13 16:23:59 2017 (r323549) +++ head/usr.bin/su/su.1 Wed Sep 13 16:35:16 2017 (r323550) @@ -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 . Modified: head/usr.sbin/crunch/examples/really-big.conf ============================================================================== --- head/usr.sbin/crunch/examples/really-big.conf Wed Sep 13 16:23:59 2017 (r323549) +++ head/usr.sbin/crunch/examples/really-big.conf Wed Sep 13 16:35:16 2017 (r323550) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709131635.v8DGZGFB010742>