The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=23401aeb15cec75fc215550b032aa898d2e62455
commit 23401aeb15cec75fc215550b032aa898d2e62455
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-07-26 10:00:02 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-07-26 10:00:02 +0000
Replace last few remaining MAN[1-8] with MAN
Reviewed by: ivy
Differential Revision: https://reviews.freebsd.org/D51530
---
libexec/dma/dmagent/Makefile | 2 +-
sbin/mount_fusefs/Makefile | 2 +-
tools/tools/vt/mkkfont/Makefile | 2 +-
usr.bin/bmake/Makefile | 2 --
usr.bin/fstat/Makefile | 2 +-
usr.bin/grep/Makefile | 2 +-
usr.bin/sdiff/Makefile | 2 +-
usr.bin/vtfontcvt/Makefile | 2 +-
usr.sbin/mfiutil/Makefile | 2 +-
usr.sbin/spi/Makefile | 2 +-
10 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
index c8a3bd44a53c..f707cfa3264f 100644
--- a/libexec/dma/dmagent/Makefile
+++ b/libexec/dma/dmagent/Makefile
@@ -15,7 +15,7 @@ SRCS= aliases_parse.y \
net.c \
spool.c \
util.c
-MAN8= dma.8
+MAN= dma.8
MLINKS= dma.8 dma.conf.5
CONFSMODE= 0640
CONFSGRP= mail
diff --git a/sbin/mount_fusefs/Makefile b/sbin/mount_fusefs/Makefile
index e683b35f0c8a..a237ba99eb6b 100644
--- a/sbin/mount_fusefs/Makefile
+++ b/sbin/mount_fusefs/Makefile
@@ -20,7 +20,7 @@ DEBUG_FLAGS+= -DFUSE4BSD_VERSION="\"${F4BVERS}\""
PACKAGE=runtime
PROG= mount_fusefs
-MAN8= mount_fusefs.8
+MAN= mount_fusefs.8
LIBADD= util
.include <bsd.prog.mk>
diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile
index f9758be0ef15..1e8a9bcdafd7 100644
--- a/tools/tools/vt/mkkfont/Makefile
+++ b/tools/tools/vt/mkkfont/Makefile
@@ -1,4 +1,4 @@
PROG= mkkfont
-MAN1=
+MAN=
.include <bsd.prog.mk>
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index a8bcdfd9f859..bbceea3ae8c2 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -99,8 +99,6 @@ COPTS.filemon_ktrace.c+= -Wno-error=unused-parameter
SUBDIR.${MK_TESTS}+= unit-tests
.endif
-MAN1= ${MAN}
-
.if ${MK_GEN_MAN:Uno} == "yes"
# we use this to generate ${MAN}
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index fa51a92eb52f..f8617fd0c6a4 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -3,6 +3,6 @@ SRCS= fstat.c fuser.c main.c
LINKS= ${BINDIR}/fstat ${BINDIR}/fuser
LIBADD= procstat
-MAN1= fuser.1 fstat.1
+MAN= fuser.1 fstat.1
.include <bsd.prog.mk>
diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile
index 2204758ece5a..c72b86656148 100644
--- a/usr.bin/grep/Makefile
+++ b/usr.bin/grep/Makefile
@@ -6,7 +6,7 @@
PACKAGE= runtime
PROG= grep
-MAN1= grep.1 zgrep.1
+MAN= grep.1 zgrep.1
SRCS= file.c grep.c queue.c util.c
diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile
index 03587f373098..af9a037e9a58 100644
--- a/usr.bin/sdiff/Makefile
+++ b/usr.bin/sdiff/Makefile
@@ -3,7 +3,7 @@
PROG= sdiff
SRCS= edit.c sdiff.c
-MAN1= sdiff.1
+MAN= sdiff.1
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
diff --git a/usr.bin/vtfontcvt/Makefile b/usr.bin/vtfontcvt/Makefile
index de011660ca28..13e60c406b26 100644
--- a/usr.bin/vtfontcvt/Makefile
+++ b/usr.bin/vtfontcvt/Makefile
@@ -1,6 +1,6 @@
PROG= vtfontcvt
SRCS= vtfontcvt.c lz4.c
-MAN8= vtfontcvt.8
+MAN= vtfontcvt.8
# lz4 compression functionality
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/lz4
diff --git a/usr.sbin/mfiutil/Makefile b/usr.sbin/mfiutil/Makefile
index 85b66d4b6f49..49c0e688e8e2 100644
--- a/usr.sbin/mfiutil/Makefile
+++ b/usr.sbin/mfiutil/Makefile
@@ -4,7 +4,7 @@ LINKS= ${BINDIR}/mfiutil ${BINDIR}/mrsasutil
SRCS= mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \
mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c \
mfi_properties.c
-MAN8= mfiutil.8
+MAN= mfiutil.8
MLINKS= mfiutil.8 mrsasutil.8
CFLAGS.gcc+= -fno-builtin-strftime
diff --git a/usr.sbin/spi/Makefile b/usr.sbin/spi/Makefile
index 73f5af6fc3cc..fee967f6a234 100644
--- a/usr.sbin/spi/Makefile
+++ b/usr.sbin/spi/Makefile
@@ -2,6 +2,6 @@
PROG= spi
-MAN8= spi.8
+MAN= spi.8
.include <bsd.prog.mk>
