Makefile.inc sets NOMAN=1 and MAN= to the empty string, so all
definitions in program Makefiles are useless and misleading.
disklabel and fdisk certainly won't embed the manual in size constrained
install media, so also remove the logic around NOMAN.
No functional change.
OK?
Index: dhcpleased/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/dhcpleased/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- dhcpleased/Makefile 18 Jun 2021 11:46:06 -0000 1.2
+++ dhcpleased/Makefile 24 Aug 2022 21:18:47 -0000
@@ -5,8 +5,6 @@ COPTS+= -DSMALL
.PATH: ${.CURDIR}/../../../sbin/dhcpleased
SRCS= bpf.c checksum.c dhcpleased.c engine.c frontend.c
-MAN=
-
LDADD+= -levent -lutil
DPADD+= ${LIBEVENT} ${LIBUTIL}
Index: resolvd/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/resolvd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- resolvd/Makefile 18 Jun 2021 11:43:38 -0000 1.3
+++ resolvd/Makefile 24 Aug 2022 21:18:56 -0000
@@ -5,6 +5,4 @@ COPTS+= -DSMALL
.PATH: ${.CURDIR}/../../../sbin/resolvd
SRCS= resolvd.c
-MAN=
-
.include <bsd.prog.mk>
Index: umount/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/umount/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- umount/Makefile 21 Feb 2014 19:01:02 -0000 1.1
+++ umount/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/02/21 19:01:02 deraadt Exp $
PROG= umount
-MAN= umount.8
CFLAGS+= -DNO_NFS
DPADD+= ${LIBUTIL}
Index: sync/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/sync/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- sync/Makefile 23 Dec 2014 17:16:03 -0000 1.1
+++ sync/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:03 deraadt Exp $
PROG= sync
-MAN= sync.8
.PATH: ${.CURDIR}/../../../bin/sync
.include <bsd.prog.mk>
Index: slaacd/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/slaacd/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- slaacd/Makefile 20 Mar 2021 16:36:52 -0000 1.3
+++ slaacd/Makefile 24 Aug 2022 21:19:16 -0000
@@ -5,8 +5,6 @@ COPTS+= -DSMALL
.PATH: ${.CURDIR}/../../../sbin/slaacd
SRCS= engine.c frontend.c slaacd.c
-MAN=
-
YFLAGS=
LDADD+= -levent -lutil
DPADD+= ${LIBEVENT} ${LIBUTIL}
Index: route/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/route/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- route/Makefile 17 Oct 2017 19:31:56 -0000 1.4
+++ route/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2017/10/17 19:31:56 naddy Exp $
PROG= route
-MAN= route.8
SRCS= route.c show.c
CFLAGS+= -Wall -DSMALL
Index: reboot/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/reboot/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- reboot/Makefile 30 Mar 2016 06:38:40 -0000 1.2
+++ reboot/Makefile 24 Aug 2022 21:15:48 -0000
@@ -3,7 +3,6 @@
PROG= reboot
DPADD= ${LIBUTIL}
LDADD= -lutil
-MAN= reboot.8
LINKS= ${BINDIR}/reboot ${BINDIR}/halt
.PATH: ${.CURDIR}/../../../sbin/reboot
Index: pdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/pdisk/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- pdisk/Makefile 27 Jan 2016 14:19:59 -0000 1.10
+++ pdisk/Makefile 24 Aug 2022 21:23:41 -0000
@@ -12,8 +12,5 @@ SRCS= dump.c file_media.c io.c partition
NOPROG=yes
.endif
-MAN= pdisk.8
-MANSUBDIR=macppc
-
.PATH: ${.CURDIR}/../../../sbin/pdisk
.include <bsd.prog.mk>
Index: newfs_msdos/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/newfs_msdos/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- newfs_msdos/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ newfs_msdos/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
# $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
Index: newfs_ext2fs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/newfs_ext2fs/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- newfs_ext2fs/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ newfs_ext2fs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $
PROG= newfs_ext2fs
SRCS= newfs_ext2fs.c mke2fs.c ext2fs_bswap.c
-MAN= newfs_ext2fs.8
.PATH: ${.CURDIR}/../../../sys/ufs/ext2fs
DPADD+= ${LIBUTIL}
Index: mount_udf/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_udf/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_udf/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_udf/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_udf
SRCS= mount_udf.c getmntopts.c
-MAN= mount_udf.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${MOUNT}
Index: mount_nfs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_nfs/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_nfs/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_nfs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_nfs
SRCS= mount_nfs.c getmntopts.c
-MAN= mount_nfs.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -DNFS -I${MOUNT}
Index: mount_msdos/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_msdos/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_msdos/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_msdos/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_msdos
SRCS= mount_msdos.c getmntopts.c
-MAN= mount_msdos.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${MOUNT}
Index: mount_ffs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_ffs/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_ffs/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_ffs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_ffs
SRCS= mount_ffs.c getmntopts.c
-MAN= mount_ffs.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${MOUNT}
Index: mount_cd9660/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_cd9660/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_cd9660/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_cd9660/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_cd9660
SRCS= mount_cd9660.c getmntopts.c
-MAN= mount_cd9660.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${MOUNT}
Index: mount_ext2fs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount_ext2fs/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount_ext2fs/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount_ext2fs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= mount_ext2fs
SRCS= mount_ext2fs.c getmntopts.c
-MAN= mount_ext2fs.8
MOUNT= ${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${MOUNT}
Index: mknod/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mknod/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mknod/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mknod/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $
PROG= mknod
-MAN= mknod.8 mkfifo.1
LINKS= ${BINDIR}/mknod ${BINDIR}/mkfifo
.PATH: ${.CURDIR}/../../../sbin/mknod
Index: mount/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/mount/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- mount/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ mount/Makefile 24 Aug 2022 21:15:48 -0000
@@ -4,7 +4,6 @@ PROG= mount
SRCS= mount.c
DPADD= ${LIBUTIL}
LDADD= -lutil
-MAN= mount.8
.PATH: ${.CURDIR}/../../../sbin/mount
.include <bsd.prog.mk>
Index: ln/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/ln/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- ln/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ ln/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt Exp $
PROG= ln
-MAN= ln.1 symlink.7
.PATH: ${.CURDIR}/../../../bin/ln
.include <bsd.prog.mk>
Index: ksh/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/ksh/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- ksh/Makefile 1 Aug 2017 14:30:07 -0000 1.5
+++ ksh/Makefile 24 Aug 2022 21:15:48 -0000
@@ -8,7 +8,6 @@ SRCS= alloc.c c_ksh.c c_sh.c c_test.c 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
Index: installboot/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/installboot/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- installboot/Makefile 3 Feb 2022 10:27:33 -0000 1.16
+++ installboot/Makefile 24 Aug 2022 21:15:48 -0000
@@ -4,7 +4,6 @@
PROG= installboot
SRCS= installboot.c util.c
-MAN= installboot.8
CPPFLAGS= -I${.CURDIR}/../../../usr.sbin/installboot
LDADD= -lutil
Index: fsck_msdos/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fsck_msdos/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- fsck_msdos/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ fsck_msdos/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.1 2014/12/23 17:16:02 deraadt 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
Index: fsck_ffs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fsck_ffs/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- fsck_ffs/Makefile 25 Jun 2018 16:29:00 -0000 1.3
+++ fsck_ffs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2018/06/25 16:29:00 deraadt 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
Index: fsck_ext2fs/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fsck_ext2fs/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- fsck_ext2fs/Makefile 15 Oct 2015 15:11:10 -0000 1.2
+++ fsck_ext2fs/Makefile 24 Aug 2022 21:15:48 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.2 2015/10/15 15:11:10 semarie 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
Index: fsck/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fsck/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- fsck/Makefile 23 Dec 2014 17:16:02 -0000 1.1
+++ fsck/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= fsck
SRCS= fsck.c fsutil.c preen.c
-MAN= fsck.8
DPADD= ${LIBUTIL}
LDADD= -lutil
Index: fdisk/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/fdisk/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- fdisk/Makefile 23 May 2022 16:58:11 -0000 1.6
+++ fdisk/Makefile 24 Aug 2022 21:20:19 -0000
@@ -19,26 +19,14 @@ PROG= fdisk
SRCS= fdisk.c user.c misc.c disk.c mbr.c part.c cmd.c manual.c gpt.c
DPADD= ${LIBUTIL}
LDADD= -lutil
-CLEANFILES += fdisk.cat8 manual.c
+CLEANFILES += manual.c
.include <bsd.own.mk>
-.ifdef NOMAN
manual.c:
(echo 'const unsigned char manpage[] = {'; \
echo 'no manual' | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
-.else
-fdisk.cat8: fdisk.8
- mandoc -Tascii ${.ALLSRC} > ${.TARGET}
-
-manual.c: fdisk.cat8
- (echo 'const unsigned char manpage[] = {'; \
- cat fdisk.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
- echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
-.endif
-
-MAN= fdisk.8
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386" || ${MACHINE} == "landisk"
CFLAGS += -DHAS_MBR
Index: disklabel/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/disklabel/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- disklabel/Makefile 21 Sep 2021 18:36:09 -0000 1.13
+++ disklabel/Makefile 24 Aug 2022 21:17:45 -0000
@@ -4,26 +4,15 @@ 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
+CLEANFILES += manual.c
.include <bsd.own.mk>
-.ifdef NOMAN
manual.c:
(echo 'const unsigned char manpage[] = {'; \
echo 'no manual' | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
-.else
-disklabel.cat8: disklabel.8
- mandoc -Tascii ${.ALLSRC} > ${.TARGET}
-
-manual.c: disklabel.cat8
- (echo 'const unsigned char manpage[] = {'; \
- cat disklabel.cat8 | gzip -9c | hexdump -ve '"0x" 1/1 "%02x,"'; \
- echo '};'; echo 'const int manpage_sz = sizeof(manpage);') > manual.c
-.endif
.if ${MACHINE} == "sparc64"
CFLAGS+= -DSUN_CYLCHECK -DSUN_AAT0
Index: chmod/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/chmod/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- chmod/Makefile 23 Dec 2014 17:16:01 -0000 1.1
+++ chmod/Makefile 24 Aug 2022 21:15:48 -0000
@@ -2,7 +2,6 @@
PROG= chmod
CFLAGS+=-DSUPPORT_DOT
-MAN= chmod.1 chgrp.1 chown.8 chflags.1
LINKS= ${BINDIR}/chmod ${BINDIR}/chgrp \
${BINDIR}/chmod /sbin/chown
Index: bioctl/Makefile
===================================================================
RCS file: /cvs/src/distrib/special/bioctl/Makefile,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile
--- bioctl/Makefile 23 Dec 2014 17:16:01 -0000 1.1
+++ bioctl/Makefile 24 Aug 2022 21:20:43 -0000
@@ -15,7 +15,5 @@ CDIAGFLAGS+= -Wunused
CDIAGFLAGS+= -Wsign-compare
CDIAGFLAGS+= -Wshadow
-MAN= bioctl.8
-
.PATH: ${.CURDIR}/../../../sbin/bioctl
.include <bsd.prog.mk>
