diff options
author | Klemens Nanni <kn@cvs.openbsd.org> | 2023-08-14 08:56:22 +0000 |
---|---|---|
committer | Klemens Nanni <kn@cvs.openbsd.org> | 2023-08-14 08:56:22 +0000 |
commit | d679f111a50affa3f31222482e4fc6a490078f6b (patch) | |
tree | c6aab9444aeb9810eb4e758e68d9d727eda74820 | |
parent | bc945012e7a3c0775849f263dade77ee02523ca0 (diff) |
zap useless MAN bits
distrib/special/Makefile.inc sets MAN= NOMAN=1, thus setting MAN* in
distrib/special/*/Makefile is useless; no manuals in the installer.
disklabel(8) and fdisk(8) remain exceptions with their NOMAN handling
as they embed their manual for use with interactive commands.
OK miod
28 files changed, 28 insertions, 63 deletions
diff --git a/distrib/special/bioctl/Makefile b/distrib/special/bioctl/Makefile index b6dadf2259e..557040406f0 100644 --- a/distrib/special/bioctl/Makefile +++ b/distrib/special/bioctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:01 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= bioctl SRCS= bioctl.c @@ -15,7 +15,5 @@ CDIAGFLAGS+= -Wunused CDIAGFLAGS+= -Wsign-compare CDIAGFLAGS+= -Wshadow -MAN= bioctl.8 - .PATH: ${.CURDIR}/../../../sbin/bioctl .include <bsd.prog.mk> diff --git a/distrib/special/chmod/Makefile b/distrib/special/chmod/Makefile index 950a2db1ee8..c1795ae2a63 100644 --- a/distrib/special/chmod/Makefile +++ b/distrib/special/chmod/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:01 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= chmod CFLAGS+=-DSUPPORT_DOT -MAN= chmod.1 chgrp.1 chown.8 chflags.1 LINKS= ${BINDIR}/chmod ${BINDIR}/chgrp \ ${BINDIR}/chmod /sbin/chown diff --git a/distrib/special/dhcpleased/Makefile b/distrib/special/dhcpleased/Makefile index a881f3e8e45..e76787d37d3 100644 --- a/distrib/special/dhcpleased/Makefile +++ b/distrib/special/dhcpleased/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2021/06/18 11:46:06 florian Exp $ +# $OpenBSD: Makefile,v 1.3 2023/08/14 08:56:20 kn Exp $ PROG= dhcpleased COPTS+= -DSMALL .PATH: ${.CURDIR}/../../../sbin/dhcpleased SRCS= bpf.c checksum.c dhcpleased.c engine.c frontend.c -MAN= - LDADD+= -levent -lutil DPADD+= ${LIBEVENT} ${LIBUTIL} diff --git a/distrib/special/disklabel/Makefile b/distrib/special/disklabel/Makefile index 38e61d3a315..0e1e9fae35a 100644 --- a/distrib/special/disklabel/Makefile +++ b/distrib/special/disklabel/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.13 2021/09/21 18:36:09 bluhm Exp $ +# $OpenBSD: Makefile,v 1.14 2023/08/14 08:56:20 kn Exp $ PROG= disklabel SRCS= disklabel.c dkcksum.c editor.c manual.c DPADD= ${LIBUTIL} LDADD= -lutil -MAN= disklabel.8 disklabel.5 CLEANFILES += disklabel.cat8 manual.c diff --git a/distrib/special/fdisk/Makefile b/distrib/special/fdisk/Makefile index 9f09316c502..d63d9f2c919 100644 --- a/distrib/special/fdisk/Makefile +++ b/distrib/special/fdisk/Makefile @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile,v 1.6 2022/05/23 16:58:11 krw Exp $ +# $OpenBSD: Makefile,v 1.7 2023/08/14 08:56:20 kn Exp $ # # Copyright (c) 1997 Tobias Weingartner # @@ -38,8 +38,6 @@ manual.c: fdisk.cat8 echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c .endif -MAN= fdisk.8 - .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "landisk" CFLAGS += -DHAS_MBR .endif diff --git a/distrib/special/fsck/Makefile b/distrib/special/fsck/Makefile index 7bf70297336..87375d73cc5 100644 --- a/distrib/special/fsck/Makefile +++ b/distrib/special/fsck/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= fsck SRCS= fsck.c fsutil.c preen.c -MAN= fsck.8 DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/distrib/special/fsck_ext2fs/Makefile b/distrib/special/fsck_ext2fs/Makefile index 62384f15e6f..764e7e6a489 100644 --- a/distrib/special/fsck_ext2fs/Makefile +++ b/distrib/special/fsck_ext2fs/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2015/10/15 15:11:10 semarie Exp $ +# $OpenBSD: Makefile,v 1.3 2023/08/14 08:56:20 kn Exp $ PROG= fsck_ext2fs -MAN= fsck_ext2fs.8 SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c fsutil.c setup.c utilities.c ext2fs_bswap.c CFLAGS+= -I${.CURDIR}/../../../sbin/fsck -DSMALL diff --git a/distrib/special/fsck_ffs/Makefile b/distrib/special/fsck_ffs/Makefile index 3ec683e5c76..7e53f58d92a 100644 --- a/distrib/special/fsck_ffs/Makefile +++ b/distrib/special/fsck_ffs/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.3 2018/06/25 16:29:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2023/08/14 08:56:20 kn Exp $ PROG= fsck_ffs -MAN= fsck_ffs.8 SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c fsutil.c setup.c utilities.c ffs_subr.c ffs_tables.c CFLAGS+= -I${.CURDIR}/../../../sbin/fsck -DSMALL diff --git a/distrib/special/fsck_msdos/Makefile b/distrib/special/fsck_msdos/Makefile index 2217f918fd1..71ec70f4a04 100644 --- a/distrib/special/fsck_msdos/Makefile +++ b/distrib/special/fsck_msdos/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= fsck_msdos -MAN= fsck_msdos.8 SRCS= main.c check.c boot.c fat.c dir.c fsutil.c .PATH: ${.CURDIR}/../../../sbin/fsck CFLAGS+= -I${.CURDIR}/../../../sbin/fsck diff --git a/distrib/special/ksh/Makefile b/distrib/special/ksh/Makefile index c4b76dbc69b..9bac3c5f685 100644 --- a/distrib/special/ksh/Makefile +++ b/distrib/special/ksh/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2023/07/23 23:42:03 kn Exp $ +# $OpenBSD: Makefile,v 1.8 2023/08/14 08:56:20 kn Exp $ PROG= ksh SRCS= alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c eval.c \ @@ -8,7 +8,6 @@ SRCS= alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c eval.c \ DEFS= -Wall -DEMACS -DSMALL CFLAGS+=${DEFS} -I. -I${.CURDIR}/../../../bin/ksh -I${.CURDIR}/../../../lib/libc/gen -MAN= ksh.1 sh.1 LINKS= ${BINDIR}/ksh ${BINDIR}/rksh LINKS+= ${BINDIR}/ksh ${BINDIR}/sh diff --git a/distrib/special/ln/Makefile b/distrib/special/ln/Makefile index 5d1f233f5d1..352bc4b4dbb 100644 --- a/distrib/special/ln/Makefile +++ b/distrib/special/ln/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= ln -MAN= ln.1 symlink.7 .PATH: ${.CURDIR}/../../../bin/ln .include <bsd.prog.mk> diff --git a/distrib/special/mknod/Makefile b/distrib/special/mknod/Makefile index bb7dd6f2f8b..e81e55aa9e0 100644 --- a/distrib/special/mknod/Makefile +++ b/distrib/special/mknod/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:20 kn Exp $ PROG= mknod -MAN= mknod.8 mkfifo.1 LINKS= ${BINDIR}/mknod ${BINDIR}/mkfifo .PATH: ${.CURDIR}/../../../sbin/mknod diff --git a/distrib/special/mount/Makefile b/distrib/special/mount/Makefile index 05cc7cc9453..d3c8248730e 100644 --- a/distrib/special/mount/Makefile +++ b/distrib/special/mount/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.2 2023/07/23 23:21:19 kn Exp $ +# $OpenBSD: Makefile,v 1.3 2023/08/14 08:56:21 kn Exp $ PROG= mount SRCS= mount.c COPTS+= -DSMALL DPADD= ${LIBUTIL} LDADD= -lutil -MAN= mount.8 .PATH: ${.CURDIR}/../../../sbin/mount .include <bsd.prog.mk> diff --git a/distrib/special/mount_cd9660/Makefile b/distrib/special/mount_cd9660/Makefile index a296ae6e91d..c27806a40b9 100644 --- a/distrib/special/mount_cd9660/Makefile +++ b/distrib/special/mount_cd9660/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_cd9660 SRCS= mount_cd9660.c getmntopts.c -MAN= mount_cd9660.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -I${MOUNT} diff --git a/distrib/special/mount_ext2fs/Makefile b/distrib/special/mount_ext2fs/Makefile index 2a46ad30366..1333fba3e3f 100644 --- a/distrib/special/mount_ext2fs/Makefile +++ b/distrib/special/mount_ext2fs/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_ext2fs SRCS= mount_ext2fs.c getmntopts.c -MAN= mount_ext2fs.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -I${MOUNT} diff --git a/distrib/special/mount_ffs/Makefile b/distrib/special/mount_ffs/Makefile index 8131b7cc275..3e018e12546 100644 --- a/distrib/special/mount_ffs/Makefile +++ b/distrib/special/mount_ffs/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_ffs SRCS= mount_ffs.c getmntopts.c -MAN= mount_ffs.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -I${MOUNT} diff --git a/distrib/special/mount_msdos/Makefile b/distrib/special/mount_msdos/Makefile index d48d1ab3b6d..272a251a580 100644 --- a/distrib/special/mount_msdos/Makefile +++ b/distrib/special/mount_msdos/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_msdos SRCS= mount_msdos.c getmntopts.c -MAN= mount_msdos.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -I${MOUNT} diff --git a/distrib/special/mount_nfs/Makefile b/distrib/special/mount_nfs/Makefile index 9a08775f5a0..6e7b2d321bb 100644 --- a/distrib/special/mount_nfs/Makefile +++ b/distrib/special/mount_nfs/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c -MAN= mount_nfs.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -DNFS -I${MOUNT} diff --git a/distrib/special/mount_udf/Makefile b/distrib/special/mount_udf/Makefile index 0f079a27a6a..d2b7c3fcfd4 100644 --- a/distrib/special/mount_udf/Makefile +++ b/distrib/special/mount_udf/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= mount_udf SRCS= mount_udf.c getmntopts.c -MAN= mount_udf.8 MOUNT= ${.CURDIR}/../../../sbin/mount CFLAGS+= -I${MOUNT} diff --git a/distrib/special/newfs_ext2fs/Makefile b/distrib/special/newfs_ext2fs/Makefile index 998e8be6853..c7f7199e3e0 100644 --- a/distrib/special/newfs_ext2fs/Makefile +++ b/distrib/special/newfs_ext2fs/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= newfs_ext2fs SRCS= newfs_ext2fs.c mke2fs.c ext2fs_bswap.c -MAN= newfs_ext2fs.8 .PATH: ${.CURDIR}/../../../sys/ufs/ext2fs DPADD+= ${LIBUTIL} diff --git a/distrib/special/newfs_msdos/Makefile b/distrib/special/newfs_msdos/Makefile index 1b6d44e0ea6..8dca54df1ac 100644 --- a/distrib/special/newfs_msdos/Makefile +++ b/distrib/special/newfs_msdos/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ # $FreeBSD: src/sbin/newfs_msdos/Makefile,v 1.2 1999/08/28 00:13:52 peter Exp $ PROG= newfs_msdos -MAN= newfs_msdos.8 DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/distrib/special/pdisk/Makefile b/distrib/special/pdisk/Makefile index 9e8913e593d..7c7f0d45799 100644 --- a/distrib/special/pdisk/Makefile +++ b/distrib/special/pdisk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.10 2016/01/27 14:19:59 krw Exp $ +# $Id: Makefile,v 1.11 2023/08/14 08:56:21 kn Exp $ .if ${MACHINE} == "macppc" PROG= pdisk @@ -12,8 +12,5 @@ SRCS= dump.c file_media.c io.c partition_map.c pdisk.c NOPROG=yes .endif -MAN= pdisk.8 -MANSUBDIR=macppc - .PATH: ${.CURDIR}/../../../sbin/pdisk .include <bsd.prog.mk> diff --git a/distrib/special/reboot/Makefile b/distrib/special/reboot/Makefile index 186846e4b25..ed85f77b81a 100644 --- a/distrib/special/reboot/Makefile +++ b/distrib/special/reboot/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2016/03/30 06:38:40 jmc Exp $ +# $OpenBSD: Makefile,v 1.3 2023/08/14 08:56:21 kn Exp $ PROG= reboot DPADD= ${LIBUTIL} LDADD= -lutil -MAN= reboot.8 LINKS= ${BINDIR}/reboot ${BINDIR}/halt .PATH: ${.CURDIR}/../../../sbin/reboot diff --git a/distrib/special/resolvd/Makefile b/distrib/special/resolvd/Makefile index 8ce5f4a7fa5..1f28950c402 100644 --- a/distrib/special/resolvd/Makefile +++ b/distrib/special/resolvd/Makefile @@ -1,10 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2021/06/18 11:43:38 florian Exp $ +# $OpenBSD: Makefile,v 1.4 2023/08/14 08:56:21 kn Exp $ PROG= resolvd COPTS+= -DSMALL .PATH: ${.CURDIR}/../../../sbin/resolvd SRCS= resolvd.c -MAN= - .include <bsd.prog.mk> diff --git a/distrib/special/route/Makefile b/distrib/special/route/Makefile index 35d8a8ef926..e575f956c4a 100644 --- a/distrib/special/route/Makefile +++ b/distrib/special/route/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2017/10/17 19:31:56 naddy Exp $ +# $OpenBSD: Makefile,v 1.5 2023/08/14 08:56:21 kn Exp $ PROG= route -MAN= route.8 SRCS= route.c show.c CFLAGS+= -Wall -DSMALL diff --git a/distrib/special/slaacd/Makefile b/distrib/special/slaacd/Makefile index 1e59021a8ed..53ee961124f 100644 --- a/distrib/special/slaacd/Makefile +++ b/distrib/special/slaacd/Makefile @@ -1,12 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2021/03/20 16:36:52 kn Exp $ +# $OpenBSD: Makefile,v 1.4 2023/08/14 08:56:21 kn Exp $ PROG= slaacd COPTS+= -DSMALL .PATH: ${.CURDIR}/../../../sbin/slaacd SRCS= engine.c frontend.c slaacd.c -MAN= - YFLAGS= LDADD+= -levent -lutil DPADD+= ${LIBEVENT} ${LIBUTIL} diff --git a/distrib/special/sync/Makefile b/distrib/special/sync/Makefile index bbc68ab8656..4911f5a83f3 100644 --- a/distrib/special/sync/Makefile +++ b/distrib/special/sync/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:03 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= sync -MAN= sync.8 .PATH: ${.CURDIR}/../../../bin/sync .include <bsd.prog.mk> diff --git a/distrib/special/umount/Makefile b/distrib/special/umount/Makefile index bb81f0a670b..0207d72dc12 100644 --- a/distrib/special/umount/Makefile +++ b/distrib/special/umount/Makefile @@ -1,7 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2014/02/21 19:01:02 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 2023/08/14 08:56:21 kn Exp $ PROG= umount -MAN= umount.8 CFLAGS+= -DNO_NFS DPADD+= ${LIBUTIL} |