aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2014-04-13 05:21:56 +0000
committerWarner Losh <imp@FreeBSD.org>2014-04-13 05:21:56 +0000
commit3bdf775801b218aa5a89564839405b122f4b233e (patch)
treee8b079688238ae81d3122ea197d8ddb379b45059
parente0919954d519767b541c28965dbd862787eb84cf (diff)
downloadsrc-3bdf775801b218aa5a89564839405b122f4b233e.tar.gz
src-3bdf775801b218aa5a89564839405b122f4b233e.zip
NO_MAN= has been deprecated in favor of MAN= for some time, go ahead
and finish the job. ncurses is now the only Makefile in the tree that uses it since it wasn't a simple mechanical change, and will be addressed in a future commit.
Notes
Notes: svn path=/head/; revision=264400
-rw-r--r--cddl/usr.bin/sgsmsg/Makefile2
-rw-r--r--cddl/usr.bin/zinject/Makefile2
-rw-r--r--cddl/usr.bin/zlook/Makefile2
-rw-r--r--cddl/usr.bin/ztest/Makefile2
-rw-r--r--cddl/usr.sbin/zhack/Makefile2
-rw-r--r--contrib/libucl/Makefile.am2
-rw-r--r--contrib/libucl/doc/Makefile.am2
-rw-r--r--contrib/libucl/tests/Makefile.am2
-rw-r--r--contrib/libucl/utils/Makefile.am2
-rw-r--r--contrib/ofed/usr.bin/ibsendtrap/Makefile2
-rw-r--r--contrib/ofed/usr.lib/libsdp/Makefile2
-rw-r--r--crypto/heimdal/appl/Makefile.am2
-rw-r--r--crypto/heimdal/appl/ftp/Makefile.am2
-rw-r--r--crypto/heimdal/appl/ftp/common/Makefile.am2
-rw-r--r--crypto/heimdal/lib/Makefile.am2
-rw-r--r--crypto/heimdal/lib/ipc/Makefile.am2
-rw-r--r--games/fortune/unstr/Makefile2
-rw-r--r--games/ppt/Makefile2
-rw-r--r--games/primes/Makefile2
-rw-r--r--gnu/usr.bin/cc/c++/Makefile2
-rw-r--r--gnu/usr.bin/cc/c++filt/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1/Makefile2
-rw-r--r--gnu/usr.bin/cc/cc1plus/Makefile2
-rw-r--r--gnu/usr.bin/cc/collect2/Makefile2
-rw-r--r--gnu/usr.bin/cc/protoize/Makefile2
-rw-r--r--gnu/usr.bin/gdb/Makefile.inc2
-rw-r--r--gnu/usr.bin/gdb/gdbtui/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/devices/grohtml/Makefile2
-rw-r--r--gnu/usr.bin/groff/src/preproc/html/Makefile2
-rw-r--r--kerberos5/libexec/digest-service/Makefile2
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile2
-rw-r--r--kerberos5/tools/asn1_compile/Makefile2
-rw-r--r--kerberos5/tools/make-roken/Makefile2
-rw-r--r--kerberos5/tools/slc/Makefile2
-rw-r--r--kerberos5/usr.bin/hxtool/Makefile2
-rw-r--r--kerberos5/usr.bin/ksu/Makefile2
-rw-r--r--lib/libarchive/test/Makefile2
-rw-r--r--lib/libauditd/Makefile2
-rw-r--r--lib/libproc/Makefile2
-rw-r--r--lib/libproc/test/t1-bkpt/Makefile2
-rw-r--r--lib/libproc/test/t2-name2map/Makefile2
-rw-r--r--lib/libproc/test/t3-name2sym/Makefile2
-rw-r--r--lib/ncurses/form/Makefile2
-rw-r--r--lib/ncurses/menu/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile6
-rw-r--r--lib/ncurses/panel/Makefile2
-rw-r--r--libexec/bootpd/bootpgw/Makefile2
-rw-r--r--libexec/casper/dns/Makefile2
-rw-r--r--libexec/casper/grp/Makefile2
-rw-r--r--libexec/casper/pwd/Makefile2
-rw-r--r--libexec/casper/random/Makefile2
-rw-r--r--libexec/casper/sysctl/Makefile2
-rw-r--r--libexec/dma-mbox-create/Makefile2
-rw-r--r--libexec/ulog-helper/Makefile2
-rw-r--r--release/picobsd/tinyware/aps/Makefile2
-rw-r--r--release/picobsd/tinyware/help/Makefile2
-rw-r--r--release/picobsd/tinyware/msg/Makefile2
-rw-r--r--release/picobsd/tinyware/ns/Makefile2
-rw-r--r--release/picobsd/tinyware/oinit/Makefile2
-rw-r--r--release/picobsd/tinyware/simple_httpd/Makefile2
-rw-r--r--release/picobsd/tinyware/sps/Makefile2
-rw-r--r--release/picobsd/tinyware/view/Makefile2
-rw-r--r--release/picobsd/tinyware/vm/Makefile2
-rw-r--r--rescue/rescue/Makefile2
-rw-r--r--sbin/geom/Makefile2
-rw-r--r--sbin/rtsol/Makefile2
-rw-r--r--secure/lib/libcrypto/engines/lib4758cca/Makefile2
-rw-r--r--share/examples/FreeBSD_version/Makefile2
-rw-r--r--share/examples/autofs/driver/Makefile2
-rw-r--r--share/examples/find_interface/Makefile2
-rw-r--r--share/examples/kld/cdev/test/Makefile2
-rw-r--r--share/examples/kld/syscall/test/Makefile2
-rw-r--r--share/examples/libvgl/Makefile2
-rw-r--r--share/examples/perfmon/Makefile2
-rw-r--r--share/examples/ppi/Makefile2
-rw-r--r--share/mk/bsd.README2
-rw-r--r--sys/boot/amd64/efi/Makefile2
-rw-r--r--sys/boot/arm/at91/boot0/Makefile2
-rw-r--r--sys/boot/arm/at91/boot0iic/Makefile2
-rw-r--r--sys/boot/arm/at91/boot0spi/Makefile2
-rw-r--r--sys/boot/arm/at91/boot2/Makefile2
-rw-r--r--sys/boot/arm/at91/bootiic/Makefile2
-rw-r--r--sys/boot/arm/at91/bootspi/Makefile2
-rw-r--r--sys/boot/arm/at91/libat91/Makefile2
-rw-r--r--sys/boot/arm/ixp425/boot2/Makefile2
-rw-r--r--sys/boot/i386/boot0/Makefile2
-rw-r--r--sys/boot/i386/btx/btx/Makefile2
-rw-r--r--sys/boot/i386/btx/btxldr/Makefile2
-rw-r--r--sys/boot/i386/btx/lib/Makefile2
-rw-r--r--sys/boot/i386/cdboot/Makefile2
-rw-r--r--sys/boot/i386/kgzldr/Makefile2
-rw-r--r--sys/boot/i386/mbr/Makefile2
-rw-r--r--sys/boot/i386/pmbr/Makefile2
-rw-r--r--sys/boot/i386/zfsloader/Makefile2
-rw-r--r--sys/boot/ia64/efi/Makefile2
-rw-r--r--sys/boot/ia64/ski/Makefile2
-rw-r--r--sys/boot/libstand32/Makefile2
-rw-r--r--sys/boot/mips/beri/boot2/Makefile2
-rw-r--r--sys/boot/pc98/boot0.5/Makefile2
-rw-r--r--sys/boot/pc98/boot0/Makefile2
-rw-r--r--sys/boot/pc98/btx/btx/Makefile2
-rw-r--r--sys/boot/pc98/btx/btxldr/Makefile2
-rw-r--r--sys/boot/pc98/btx/lib/Makefile2
-rw-r--r--sys/boot/pc98/cdboot/Makefile2
-rw-r--r--sys/boot/pc98/kgzldr/Makefile2
-rw-r--r--sys/boot/powerpc/boot1.chrp/Makefile2
-rw-r--r--sys/boot/powerpc/uboot/Makefile2
-rw-r--r--sys/boot/sparc64/boot1/Makefile2
-rw-r--r--sys/boot/userboot/libstand/Makefile2
-rw-r--r--sys/boot/userboot/test/Makefile2
-rw-r--r--sys/boot/userboot/userboot/Makefile2
-rw-r--r--sys/crypto/rijndael/Makefile2
-rw-r--r--sys/dev/aic7xxx/aicasm/Makefile2
-rw-r--r--sys/dev/patm/genrtab/Makefile2
-rw-r--r--tools/KSE/ksetest/Makefile2
-rw-r--r--tools/KSE/rr/Makefile2
-rw-r--r--tools/bsdbox/Makefile2
-rw-r--r--tools/diag/dumpvfscache/Makefile2
-rw-r--r--tools/diag/localeck/Makefile2
-rw-r--r--tools/regression/acct/Makefile2
-rw-r--r--tools/regression/aio/aiop/Makefile2
-rw-r--r--tools/regression/aio/aiotest/Makefile2
-rw-r--r--tools/regression/aio/kqueue/Makefile2
-rw-r--r--tools/regression/aio/kqueue/lio/Makefile2
-rw-r--r--tools/regression/audit/audit_pipe_ioctl/Makefile2
-rw-r--r--tools/regression/doat/Makefile2
-rw-r--r--tools/regression/environ/Makefile.envctl2
-rw-r--r--tools/regression/environ/Makefile.retention2
-rw-r--r--tools/regression/environ/Makefile.timings2
-rw-r--r--tools/regression/ethernet/ethermulti/Makefile2
-rw-r--r--tools/regression/execve/Makefile2
-rw-r--r--tools/regression/fifo/fifo_create/Makefile2
-rw-r--r--tools/regression/fifo/fifo_io/Makefile2
-rw-r--r--tools/regression/fifo/fifo_misc/Makefile2
-rw-r--r--tools/regression/fifo/fifo_open/Makefile2
-rw-r--r--tools/regression/file/dup/Makefile2
-rw-r--r--tools/regression/file/flock/Makefile2
-rw-r--r--tools/regression/file/ftruncate/Makefile2
-rw-r--r--tools/regression/file/newfileops_on_fork/Makefile2
-rw-r--r--tools/regression/filemon/Makefile2
-rw-r--r--tools/regression/fsx/Makefile2
-rw-r--r--tools/regression/gaithrstress/Makefile2
-rw-r--r--tools/regression/geom/ConfCmp/Makefile2
-rw-r--r--tools/regression/geom/MdLoad/Makefile2
-rw-r--r--tools/regression/include/stdatomic/Makefile2
-rw-r--r--tools/regression/include/tgmath/Makefile2
-rw-r--r--tools/regression/kgssapi/Makefile2
-rw-r--r--tools/regression/kqueue/Makefile2
-rw-r--r--tools/regression/kthread/kld/Makefile2
-rw-r--r--tools/regression/lib/libc/resolv/Makefile2
-rw-r--r--tools/regression/mac/mac_bsdextended/Makefile2
-rw-r--r--tools/regression/mlock/Makefile2
-rw-r--r--tools/regression/mmap/Makefile2
-rw-r--r--tools/regression/mqueue/mqtest1/Makefile2
-rw-r--r--tools/regression/mqueue/mqtest2/Makefile2
-rw-r--r--tools/regression/mqueue/mqtest3/Makefile2
-rw-r--r--tools/regression/mqueue/mqtest4/Makefile2
-rw-r--r--tools/regression/mqueue/mqtest5/Makefile2
-rw-r--r--tools/regression/netinet/arphold/Makefile2
-rw-r--r--tools/regression/netinet/ipbroadcast/Makefile2
-rw-r--r--tools/regression/netinet/ipdivert/Makefile2
-rw-r--r--tools/regression/netinet/ipmulticast/Makefile2
-rw-r--r--tools/regression/netinet/ipsockopt/Makefile2
-rw-r--r--tools/regression/netinet/msocket/Makefile2
-rw-r--r--tools/regression/netinet/msocket_ifnet_remove/Makefile2
-rw-r--r--tools/regression/netinet/rawconnect/Makefile2
-rw-r--r--tools/regression/netinet/tcpconnect/Makefile2
-rw-r--r--tools/regression/netinet/tcpdrop/Makefile2
-rw-r--r--tools/regression/netinet/tcpfullwindowrst/Makefile2
-rw-r--r--tools/regression/netinet/tcpsockclosebeforeaccept/Makefile2
-rw-r--r--tools/regression/netinet/tcpsocktimewait/Makefile2
-rw-r--r--tools/regression/netinet/tcpstream/Makefile2
-rw-r--r--tools/regression/netinet/udpconnectjail/Makefile2
-rw-r--r--tools/regression/netinet/udpzerobyte/Makefile2
-rw-r--r--tools/regression/netinet6/icmp6_filter/Makefile2
-rw-r--r--tools/regression/netinet6/inet6_rth/Makefile2
-rw-r--r--tools/regression/netinet6/ip6_sockets/Makefile2
-rw-r--r--tools/regression/nfsmmap/test1/Makefile2
-rw-r--r--tools/regression/nfsmmap/test2/Makefile2
-rw-r--r--tools/regression/p1003_1b/Makefile2
-rw-r--r--tools/regression/pipe/Makefile2
-rw-r--r--tools/regression/posixsem/Makefile2
-rw-r--r--tools/regression/posixsem2/Makefile2
-rw-r--r--tools/regression/posixshm/Makefile2
-rw-r--r--tools/regression/pthread/cv_cancel1/Makefile2
-rw-r--r--tools/regression/pthread/mutex_isowned_np/Makefile2
-rw-r--r--tools/regression/rpcsec_gss/Makefile2
-rw-r--r--tools/regression/security/access/Makefile2
-rw-r--r--tools/regression/security/cap_test/Makefile2
-rw-r--r--tools/regression/security/open_to_operation/Makefile2
-rw-r--r--tools/regression/security/proc_to_proc/Makefile2
-rw-r--r--tools/regression/sigqueue/sigqtest1/Makefile2
-rw-r--r--tools/regression/sigqueue/sigqtest2/Makefile2
-rw-r--r--tools/regression/sockets/accept_fd_leak/Makefile2
-rw-r--r--tools/regression/sockets/accf_data_attach/Makefile2
-rw-r--r--tools/regression/sockets/fstat/Makefile2
-rw-r--r--tools/regression/sockets/kqueue/Makefile2
-rw-r--r--tools/regression/sockets/listen_backlog/Makefile2
-rw-r--r--tools/regression/sockets/listenclose/Makefile2
-rw-r--r--tools/regression/sockets/pr_atomic/Makefile2
-rw-r--r--tools/regression/sockets/reconnect/Makefile2
-rw-r--r--tools/regression/sockets/rtsocket/Makefile2
-rw-r--r--tools/regression/sockets/sblock/Makefile2
-rw-r--r--tools/regression/sockets/sendfile/Makefile2
-rw-r--r--tools/regression/sockets/shutdown/Makefile2
-rw-r--r--tools/regression/sockets/sigpipe/Makefile2
-rw-r--r--tools/regression/sockets/so_setfib/Makefile2
-rw-r--r--tools/regression/sockets/socketpair/Makefile2
-rw-r--r--tools/regression/sockets/unix_bindconnect/Makefile2
-rw-r--r--tools/regression/sockets/unix_close_race/Makefile2
-rw-r--r--tools/regression/sockets/unix_cmsg/Makefile2
-rw-r--r--tools/regression/sockets/unix_gc/Makefile2
-rw-r--r--tools/regression/sockets/unix_passfd/Makefile2
-rw-r--r--tools/regression/sockets/unix_sendtorace/Makefile2
-rw-r--r--tools/regression/sockets/unix_socket/Makefile2
-rw-r--r--tools/regression/sockets/unix_sorflush/Makefile2
-rw-r--r--tools/regression/sockets/zerosend/Makefile2
-rw-r--r--tools/regression/sysvmsg/Makefile2
-rw-r--r--tools/regression/sysvsem/Makefile2
-rw-r--r--tools/regression/sysvshm/Makefile2
-rw-r--r--tools/regression/tls/ttls1/Makefile2
-rw-r--r--tools/regression/tls/ttls2/Makefile2
-rw-r--r--tools/regression/tls/ttls4/Makefile2
-rw-r--r--tools/regression/tmpfs/Makefile2
-rw-r--r--tools/regression/ufs/uprintf/Makefile2
-rw-r--r--tools/test/auxinfo/Makefile2
-rw-r--r--tools/test/iconv/gnu/Makefile2
-rw-r--r--tools/test/iconv/posix/Makefile2
-rw-r--r--tools/test/iconv/refgen/Makefile2
-rw-r--r--tools/test/iconv/tablegen/Makefile2
-rw-r--r--tools/test/malloc/Makefile2
-rw-r--r--tools/test/netfibs/Makefile2
-rw-r--r--tools/test/ppsapi/Makefile2
-rw-r--r--tools/test/ptrace/Makefile2
-rw-r--r--tools/test/upsdl/Makefile2
-rw-r--r--tools/tools/aac/Makefile2
-rw-r--r--tools/tools/ath/Makefile.inc2
-rw-r--r--tools/tools/ath/ath_ee_9287_print/Makefile2
-rw-r--r--tools/tools/ath/ath_ee_9300_print/Makefile2
-rw-r--r--tools/tools/ath/ath_ee_v14_print/Makefile2
-rw-r--r--tools/tools/ath/ath_ee_v4k_print/Makefile2
-rw-r--r--tools/tools/ath/athstats/Makefile2
-rw-r--r--tools/tools/atsectl/Makefile2
-rw-r--r--tools/tools/bootparttest/Makefile2
-rw-r--r--tools/tools/cfi/Makefile2
-rw-r--r--tools/tools/cxgbetool/Makefile2
-rw-r--r--tools/tools/cxgbtool/Makefile2
-rw-r--r--tools/tools/drm/radeon/mkregtable/Makefile2
-rw-r--r--tools/tools/find-sb/Makefile2
-rw-r--r--tools/tools/gdb_regofs/Makefile2
-rw-r--r--tools/tools/ifinfo/Makefile2
-rw-r--r--tools/tools/ifpifa/Makefile2
-rw-r--r--tools/tools/ipw/Makefile2
-rw-r--r--tools/tools/iwi/Makefile2
-rw-r--r--tools/tools/iwn/iwnstats/Makefile2
-rw-r--r--tools/tools/mfi/Makefile2
-rw-r--r--tools/tools/mwl/mwldebug/Makefile2
-rw-r--r--tools/tools/mwl/mwlstats/Makefile2
-rw-r--r--tools/tools/ncpus/Makefile2
-rw-r--r--tools/tools/net80211/stumbler/Makefile2
-rw-r--r--tools/tools/net80211/w00t/Makefile.inc2
-rw-r--r--tools/tools/net80211/wesside/dics/Makefile2
-rw-r--r--tools/tools/net80211/wesside/udps/Makefile2
-rw-r--r--tools/tools/net80211/wesside/wesside/Makefile2
-rw-r--r--tools/tools/net80211/wlaninject/Makefile2
-rw-r--r--tools/tools/net80211/wlanstats/Makefile2
-rw-r--r--tools/tools/net80211/wlantxtime/Makefile2
-rw-r--r--tools/tools/net80211/wlanwatch/Makefile2
-rw-r--r--tools/tools/net80211/wlanwds/Makefile2
-rw-r--r--tools/tools/netmap/Makefile2
-rw-r--r--tools/tools/netrate/http/Makefile2
-rw-r--r--tools/tools/netrate/httpd/Makefile2
-rw-r--r--tools/tools/netrate/juggle/Makefile2
-rw-r--r--tools/tools/netrate/netblast/Makefile2
-rw-r--r--tools/tools/netrate/netreceive/Makefile2
-rw-r--r--tools/tools/netrate/netsend/Makefile2
-rw-r--r--tools/tools/netrate/tcpconnect/Makefile2
-rw-r--r--tools/tools/netrate/tcpp/Makefile2
-rw-r--r--tools/tools/netrate/tcpreceive/Makefile2
-rw-r--r--tools/tools/npe/npestats/Makefile2
-rw-r--r--tools/tools/nxge/Makefile2
-rw-r--r--tools/tools/pciroms/Makefile2
-rw-r--r--tools/tools/pirtool/Makefile2
-rw-r--r--tools/tools/syscall_timing/Makefile2
-rw-r--r--tools/tools/tionxcl/Makefile2
-rw-r--r--tools/tools/umastat/Makefile2
-rw-r--r--tools/tools/vxge/Makefile2
-rw-r--r--tools/tools/wtap/vis_map/Makefile2
-rw-r--r--tools/tools/wtap/wtap/Makefile2
-rw-r--r--tools/tools/zfsboottest/Makefile2
-rw-r--r--usr.bin/bzip2recover/Makefile2
-rw-r--r--usr.bin/clang/clang-tblgen/Makefile2
-rw-r--r--usr.bin/clang/llvm-mc/Makefile2
-rw-r--r--usr.bin/clang/llvm-objdump/Makefile2
-rw-r--r--usr.bin/clang/llvm-rtdyld/Makefile2
-rw-r--r--usr.bin/clang/macho-dump/Makefile2
-rw-r--r--usr.bin/cpio/test/Makefile2
-rw-r--r--usr.bin/dirname/Makefile2
-rw-r--r--usr.bin/locate/bigram/Makefile2
-rw-r--r--usr.bin/locate/code/Makefile2
-rw-r--r--usr.bin/mkcsmapper_static/Makefile2
-rw-r--r--usr.bin/mkesdb_static/Makefile2
-rw-r--r--usr.bin/svn/svn/Makefile2
-rw-r--r--usr.bin/svn/svnadmin/Makefile2
-rw-r--r--usr.bin/svn/svndumpfilter/Makefile2
-rw-r--r--usr.bin/svn/svnlook/Makefile2
-rw-r--r--usr.bin/svn/svnmucc/Makefile2
-rw-r--r--usr.bin/svn/svnrdump/Makefile2
-rw-r--r--usr.bin/svn/svnserve/Makefile2
-rw-r--r--usr.bin/svn/svnsync/Makefile2
-rw-r--r--usr.bin/svn/svnversion/Makefile2
-rw-r--r--usr.bin/tar/test/Makefile2
-rw-r--r--usr.bin/unexpand/Makefile2
-rw-r--r--usr.bin/uudecode/Makefile2
-rw-r--r--usr.bin/vgrind/RETEST/Makefile2
-rw-r--r--usr.bin/xlint/lint2/Makefile2
-rw-r--r--usr.sbin/bhyvectl/Makefile2
-rw-r--r--usr.sbin/bootparamd/callbootd/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distextract/Makefile2
-rw-r--r--usr.sbin/bsdinstall/distfetch/Makefile2
-rw-r--r--usr.sbin/bsdinstall/scripts/Makefile2
-rw-r--r--usr.sbin/crunch/examples/Makefile2
-rw-r--r--usr.sbin/ctm/ctm_dequeue/Makefile2
-rw-r--r--usr.sbin/ctm/ctm_smail/Makefile2
-rw-r--r--usr.sbin/ctm/mkCTM/Makefile2
-rw-r--r--usr.sbin/fifolog/fifolog_reader/Makefile2
-rw-r--r--usr.sbin/fifolog/fifolog_writer/Makefile2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2855/Makefile2
-rw-r--r--usr.sbin/lpr/filters.ru/koi2alt/Makefile2
-rw-r--r--usr.sbin/lpr/filters/Makefile2
-rw-r--r--usr.sbin/ntp/ntp-keygen/Makefile2
-rw-r--r--usr.sbin/ntp/ntpd/Makefile2
-rw-r--r--usr.sbin/ntp/ntpdate/Makefile2
-rw-r--r--usr.sbin/ntp/ntpdc/Makefile2
-rw-r--r--usr.sbin/ntp/ntpq/Makefile2
-rw-r--r--usr.sbin/ntp/ntptime/Makefile2
-rw-r--r--usr.sbin/portsnap/make_index/Makefile2
-rw-r--r--usr.sbin/portsnap/phttpget/Makefile2
-rw-r--r--usr.sbin/rpc.ypupdated/Makefile2
339 files changed, 341 insertions, 341 deletions
diff --git a/cddl/usr.bin/sgsmsg/Makefile b/cddl/usr.bin/sgsmsg/Makefile
index 8d1f70fceed4..e1b318c6473c 100644
--- a/cddl/usr.bin/sgsmsg/Makefile
+++ b/cddl/usr.bin/sgsmsg/Makefile
@@ -5,7 +5,7 @@
# This program is required as a bootstrap tool for 'make buildworld'
PROG= sgsmsg
-NO_MAN=
+MAN=
SRCS= avl.c sgsmsg.c string_table.c findprime.c
WARNS?= 0
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index 56251490bbda..adb5023a6e51 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -4,7 +4,7 @@
PROG= zinject
SRCS= zinject.c translate.c
-NO_MAN=
+MAN=
WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
diff --git a/cddl/usr.bin/zlook/Makefile b/cddl/usr.bin/zlook/Makefile
index 0251f57bca63..eae2fd034537 100644
--- a/cddl/usr.bin/zlook/Makefile
+++ b/cddl/usr.bin/zlook/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook
PROG= zlook
-NO_MAN=
+MAN=
WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 370eacb57246..0865226bd7b8 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest
PROG= ztest
-NO_MAN=
+MAN=
WARNS?= 0
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
index f09d2d827674..9ae33951d63f 100644
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack
PROG= zhack
-NO_MAN=
+MAN=
WARNS?= 0
CSTD= c99
diff --git a/contrib/libucl/Makefile.am b/contrib/libucl/Makefile.am
index 4668b3681849..558c5a5b546a 100644
--- a/contrib/libucl/Makefile.am
+++ b/contrib/libucl/Makefile.am
@@ -4,4 +4,4 @@ EXTRA_DIST = uthash README.md
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libucl.pc
-SUBDIRS = src tests utils doc \ No newline at end of file
+SUBDIRS = src tests utils doc
diff --git a/contrib/libucl/doc/Makefile.am b/contrib/libucl/doc/Makefile.am
index 7e57a829f807..c6223ecf24fd 100644
--- a/contrib/libucl/doc/Makefile.am
+++ b/contrib/libucl/doc/Makefile.am
@@ -5,4 +5,4 @@ dist_man_MANS = libucl.3
gen-man: @PANDOC@
tail -n +$$(grep -n '# Synopsis' api.md | cut -d':' -f1) api.md | \
cat pandoc.template - | sed -e 's/^# \(.*\)/# \U\1/' | \
- @PANDOC@ -s -f markdown -t man -o libucl.3 \ No newline at end of file
+ @PANDOC@ -s -f markdown -t man -o libucl.3
diff --git a/contrib/libucl/tests/Makefile.am b/contrib/libucl/tests/Makefile.am
index 880036d900f5..efc93506c1ed 100644
--- a/contrib/libucl/tests/Makefile.am
+++ b/contrib/libucl/tests/Makefile.am
@@ -30,4 +30,4 @@ test_schema_SOURCES = test_schema.c
test_schema_LDADD = $(common_test_ldadd)
test_schema_CFLAGS = $(common_test_cflags)
-check_PROGRAMS = test_basic test_speed test_generate test_schema \ No newline at end of file
+check_PROGRAMS = test_basic test_speed test_generate test_schema
diff --git a/contrib/libucl/utils/Makefile.am b/contrib/libucl/utils/Makefile.am
index 61e06a7cc0a2..23eeeac8032b 100644
--- a/contrib/libucl/utils/Makefile.am
+++ b/contrib/libucl/utils/Makefile.am
@@ -16,4 +16,4 @@ UTL = ucl_chargen ucl_objdump
else
UTL =
endif
-bin_PROGRAMS = $(UTL) \ No newline at end of file
+bin_PROGRAMS = $(UTL)
diff --git a/contrib/ofed/usr.bin/ibsendtrap/Makefile b/contrib/ofed/usr.bin/ibsendtrap/Makefile
index 183e58d488f3..854883863794 100644
--- a/contrib/ofed/usr.bin/ibsendtrap/Makefile
+++ b/contrib/ofed/usr.bin/ibsendtrap/Makefile
@@ -7,7 +7,7 @@ PROG= ibsendtrap
SRCS= ibsendtrap.c ibdiag_common.c
LDADD= -libumad -libcommon -libmad
CFLAGS+= -I${DIAGPATH}/include
-NO_MAN= true
+MAN=
WARNS?= 1
diff --git a/contrib/ofed/usr.lib/libsdp/Makefile b/contrib/ofed/usr.lib/libsdp/Makefile
index e65b515060f5..7886284619d5 100644
--- a/contrib/ofed/usr.lib/libsdp/Makefile
+++ b/contrib/ofed/usr.lib/libsdp/Makefile
@@ -11,7 +11,7 @@ SDPDIR= ${.CURDIR}/../../libsdp/src
LIB= ibsdp
SHLIB_MAJOR= 1
NO_PROFILE=
-NO_MAN=
+MAN=
SRCS= log.c match.c port.c config_parser.c config_scanner.c
diff --git a/crypto/heimdal/appl/Makefile.am b/crypto/heimdal/appl/Makefile.am
index 5e4e320bcbae..8274b40ee06a 100644
--- a/crypto/heimdal/appl/Makefile.am
+++ b/crypto/heimdal/appl/Makefile.am
@@ -26,4 +26,4 @@ SUBDIRS = \
kf \
$(dir_dce)
-EXTRA_DIST = NTMakefile \ No newline at end of file
+EXTRA_DIST = NTMakefile
diff --git a/crypto/heimdal/appl/ftp/Makefile.am b/crypto/heimdal/appl/ftp/Makefile.am
index efea85d0e59e..e38b444ad395 100644
--- a/crypto/heimdal/appl/ftp/Makefile.am
+++ b/crypto/heimdal/appl/ftp/Makefile.am
@@ -4,4 +4,4 @@ include $(top_srcdir)/Makefile.am.common
SUBDIRS = common ftp ftpd
-EXTRA_DIST = NTMakefile \ No newline at end of file
+EXTRA_DIST = NTMakefile
diff --git a/crypto/heimdal/appl/ftp/common/Makefile.am b/crypto/heimdal/appl/ftp/common/Makefile.am
index 1b0ebf2bfcb2..a7bf33159fbb 100644
--- a/crypto/heimdal/appl/ftp/common/Makefile.am
+++ b/crypto/heimdal/appl/ftp/common/Makefile.am
@@ -11,4 +11,4 @@ libcommon_a_SOURCES = \
buffer.c \
common.h
-EXTRA_DIST = NTMakefile \ No newline at end of file
+EXTRA_DIST = NTMakefile
diff --git a/crypto/heimdal/lib/Makefile.am b/crypto/heimdal/lib/Makefile.am
index bed19304addf..a1895751b1d2 100644
--- a/crypto/heimdal/lib/Makefile.am
+++ b/crypto/heimdal/lib/Makefile.am
@@ -42,4 +42,4 @@ SUBDIRS = \
$(dir_otp) \
$(dir_dce)
-EXTRA_DIST = NTMakefile heimdal \ No newline at end of file
+EXTRA_DIST = NTMakefile heimdal
diff --git a/crypto/heimdal/lib/ipc/Makefile.am b/crypto/heimdal/lib/ipc/Makefile.am
index fc3ba469d481..f3791fded901 100644
--- a/crypto/heimdal/lib/ipc/Makefile.am
+++ b/crypto/heimdal/lib/ipc/Makefile.am
@@ -64,4 +64,4 @@ CLEANFILES = $(built_ipcc) $(built_ipcs)
$(srcdir)/client.c: $(built_ipcc)
$(srcdir)/server.c: $(built_ipcs)
-endif \ No newline at end of file
+endif
diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile
index 428b10922737..e943d976eac6 100644
--- a/games/fortune/unstr/Makefile
+++ b/games/fortune/unstr/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= unstr
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../strfile
.include <bsd.prog.mk>
diff --git a/games/ppt/Makefile b/games/ppt/Makefile
index c5ac6a8b2f3c..4a3629f94cb9 100644
--- a/games/ppt/Makefile
+++ b/games/ppt/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= ppt
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/games/primes/Makefile b/games/primes/Makefile
index 5e111e7baf10..13c9048a91cf 100644
--- a/games/primes/Makefile
+++ b/games/primes/Makefile
@@ -3,7 +3,7 @@
PROG= primes
SRCS= pattern.c pr_tbl.c primes.c
-NO_MAN=
+MAN=
DPADD= ${LIBM}
LDADD= -lm
diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile
index 98e1ea3ed75c..1e7f33959f36 100644
--- a/gnu/usr.bin/cc/c++/Makefile
+++ b/gnu/usr.bin/cc/c++/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile
index 53797955d1d7..b9daaf0f1287 100644
--- a/gnu/usr.bin/cc/c++filt/Makefile
+++ b/gnu/usr.bin/cc/c++filt/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 3c0d8fa6afaa..e73b2c991194 100644
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 83b0abbc0c95..742d7c6d41f2 100644
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
.include "../Makefile.inc"
diff --git a/gnu/usr.bin/cc/collect2/Makefile b/gnu/usr.bin/cc/collect2/Makefile
index 5aa9e35f4e0b..0b07b857a444 100644
--- a/gnu/usr.bin/cc/collect2/Makefile
+++ b/gnu/usr.bin/cc/collect2/Makefile
@@ -6,6 +6,6 @@
PROG= collect2
SRCS= collect2.c tlink.c version.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/cc/protoize/Makefile b/gnu/usr.bin/cc/protoize/Makefile
index acd970058d63..b851bed18b2f 100644
--- a/gnu/usr.bin/cc/protoize/Makefile
+++ b/gnu/usr.bin/cc/protoize/Makefile
@@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/../cc_tools ${GCCDIR}
PROG= protoize
-NO_MAN=
+MAN=
# things are rather hard-coded, we work around that here
CFLAGS+= -DDEFAULT_TARGET_VERSION=\"\"
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index e4b5a1db5a20..6679022a1bde 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -52,7 +52,7 @@ GENSRCS+= nm.h tm.h
.if defined(GDB_CROSS_DEBUGGER)
CFLAGS+= -DCROSS_DEBUGGER -I${BMAKE_ROOT}/../..
GDB_SUFFIX= -${TARGET_ARCH}
-NO_MAN=
+MAN=
.endif
.include "${TARGET_SUBDIR}/Makefile"
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile
index 4a01eae71ce5..94dbb4babd52 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@@ -2,7 +2,7 @@
PROG= gdbtui${GDB_SUFFIX}
SRCS= tui-main.c
-NO_MAN=
+MAN=
BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
${OBJ_BU}/libiberty/libiberty.a
diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
index 0a1a08636f2f..321f1c87c822 100644
--- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile
+++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile
@@ -4,6 +4,6 @@ PROG_CXX= post-grohtml
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile
index 2a3fb4952e4f..d46626b4cbfb 100644
--- a/gnu/usr.bin/groff/src/preproc/html/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/html/Makefile
@@ -4,6 +4,6 @@ PROG_CXX= pre-grohtml
SRCS= pre-html.cpp pushback.cpp
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile
index 79a7c8b50177..72f7125fa2f3 100644
--- a/kerberos5/libexec/digest-service/Makefile
+++ b/kerberos5/libexec/digest-service/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= digest-service
-NO_MAN= 1
+MAN=
CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index e2141e739191..8a72d9e8b2e2 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ipropd-slave
-NO_MAN=
+MAN=
SRCS= ipropd_common.c ipropd_slave.c kadm5_err.h
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I. ${LDAPCFLAGS}
diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile
index 194642136a0d..88224da89eff 100644
--- a/kerberos5/tools/asn1_compile/Makefile
+++ b/kerberos5/tools/asn1_compile/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= asn1_compile
-NO_MAN=
+MAN=
LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a
LDADD= ${LIBROKEN_A} ${LIBVERS}
DPADD= ${LIBROKEN_A} ${LIBVERS}
diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile
index a039943ad5e8..fb7487016c65 100644
--- a/kerberos5/tools/make-roken/Makefile
+++ b/kerberos5/tools/make-roken/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= make-roken
-NO_MAN=
+MAN=
CLEANFILES= make-roken.c
diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile
index d1b752f46405..1a26e7cd7959 100644
--- a/kerberos5/tools/slc/Makefile
+++ b/kerberos5/tools/slc/Makefile
@@ -4,7 +4,7 @@ PROG= slc
LIBROKEN_A= ${.OBJDIR}/../../lib/libroken/libroken.a
LDADD= ${LIBROKEN_A} ${LIBVERS}
DPADD= ${LIBROKEN_A} ${LIBVERS}
-NO_MAN=
+MAN=
SRCS= roken.h \
slc-gram.y \
diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile
index c8ebf9a8951f..3946484b78a1 100644
--- a/kerberos5/usr.bin/hxtool/Makefile
+++ b/kerberos5/usr.bin/hxtool/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= hxtool
-NO_MAN= 1
+MAN=
CFLAGS+= -I${KRB5DIR}/lib/hx509 \
-I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index c6a029090cfc..9e2786577ff8 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -5,7 +5,7 @@ PROG= ksu
BINMODE=4555
PRECIOUSPROG=
.endif
-NO_MAN=
+MAN=
SRCS= su.c
CFLAGS+=-I${KRB5DIR}/lib/roken
DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
diff --git a/lib/libarchive/test/Makefile b/lib/libarchive/test/Makefile
index 4ec21f9e8ea8..16a485ae2c44 100644
--- a/lib/libarchive/test/Makefile
+++ b/lib/libarchive/test/Makefile
@@ -2,7 +2,7 @@
LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive
-NO_MAN=yes
+MAN=
PROG=libarchive_test
INTERNALPROG=yes # Don't install this; it's just for testing
diff --git a/lib/libauditd/Makefile b/lib/libauditd/Makefile
index 24873836394b..cee1850ac9c2 100644
--- a/lib/libauditd/Makefile
+++ b/lib/libauditd/Makefile
@@ -19,6 +19,6 @@ CFLAGS+= -I${OPENBSMDIR} -I${LIBBSMDIR}
WARNS?= 3
-NO_MAN=
+MAN=
.include <bsd.lib.mk>
diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile
index 03992c07c304..fea6569438ad 100644
--- a/lib/libproc/Makefile
+++ b/lib/libproc/Makefile
@@ -25,6 +25,6 @@ DPADD+= ${LIBSTDCPLUSPLUS}
SHLIB_MAJOR= 2
-NO_MAN=
+MAN=
.include <bsd.lib.mk>
diff --git a/lib/libproc/test/t1-bkpt/Makefile b/lib/libproc/test/t1-bkpt/Makefile
index a1c05e1d2724..eb5b37f94936 100644
--- a/lib/libproc/test/t1-bkpt/Makefile
+++ b/lib/libproc/test/t1-bkpt/Makefile
@@ -7,6 +7,6 @@ SRCS= t1-bkpt.c
LDADD= -lproc -lelf -lrtld_db -lutil
DPADD= ${LIBPROC} ${LIBELF}
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/lib/libproc/test/t2-name2map/Makefile b/lib/libproc/test/t2-name2map/Makefile
index 087df81a9ff7..9002accf6904 100644
--- a/lib/libproc/test/t2-name2map/Makefile
+++ b/lib/libproc/test/t2-name2map/Makefile
@@ -7,6 +7,6 @@ SRCS= t2-name2map.c
LDADD= -lproc -lelf -lrtld_db -lutil
DPADD= ${LIBPROC} ${LIBELF}
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/lib/libproc/test/t3-name2sym/Makefile b/lib/libproc/test/t3-name2sym/Makefile
index 55468c0496d4..68e23c6199d9 100644
--- a/lib/libproc/test/t3-name2sym/Makefile
+++ b/lib/libproc/test/t3-name2sym/Makefile
@@ -7,6 +7,6 @@ SRCS= t3-name2sym.c
LDADD= -lproc -lelf -lrtld_db -lutil
DPADD= ${LIBPROC} ${LIBELF}
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index 4abac432481b..dd903b05c626 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -158,7 +158,7 @@ MLINKS= form_cursor.3 pos_form_cursor.3 \
form_win.3 set_form_sub.3 \
form_win.3 set_form_win.3
.else
-NO_MAN=
+MAN=
.endif
.include <bsd.lib.mk>
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index 46bc023e4d83..3aac08170623 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -130,7 +130,7 @@ MLINKS= menu_attributes.3 menu_back.3 \
mitem_value.3 set_item_value.3 \
mitem_visible.3 item_visible.3
.else
-NO_MAN=
+MAN=
.endif
.include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index b3242f0b6a8a..e674cf23bbe1 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -549,12 +549,12 @@ MAN+= \
curs_ins_wstr.3 \
curs_printw.3 \
curs_scanw.3
-.endif
-
-CLEANFILES+= ${MAN:M*.3}
MAN+= term.5 terminfo.5
MAN+= term.7
+.endif
+
+CLEANFILES+= ${MAN:M*.3}
MLINKS= ncurses.3 curses.3 \
curs_addch.3 addch.3 \
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index 8e997675dd6c..7929aed4d025 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -58,7 +58,7 @@ MLINKS= panel.3 bottom_panel.3 \
panel.3 top_panel.3 \
panel.3 update_panels.3
.else
-NO_MAN=
+MAN=
.endif
.include <bsd.lib.mk>
diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile
index 93a982c2d384..b7adadf3d514 100644
--- a/libexec/bootpd/bootpgw/Makefile
+++ b/libexec/bootpd/bootpgw/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= bootpgw
-NO_MAN=
+MAN=
SRCS= bootpgw.c getif.c hwaddr.c report.c rtmsg.c
SRCDIR= ${.CURDIR}/..
diff --git a/libexec/casper/dns/Makefile b/libexec/casper/dns/Makefile
index 82bd4c045bc8..245493e9c6f0 100644
--- a/libexec/casper/dns/Makefile
+++ b/libexec/casper/dns/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
CFLAGS+=-I${.CURDIR}/../../../sbin/casper
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/libexec/casper/grp/Makefile b/libexec/casper/grp/Makefile
index 6f166b8ae6cc..502cd261f595 100644
--- a/libexec/casper/grp/Makefile
+++ b/libexec/casper/grp/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
CFLAGS+=-I${.CURDIR}/../../../sbin/casper
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/libexec/casper/pwd/Makefile b/libexec/casper/pwd/Makefile
index b2dcfec341eb..ebf6cac9e121 100644
--- a/libexec/casper/pwd/Makefile
+++ b/libexec/casper/pwd/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
CFLAGS+=-I${.CURDIR}/../../../sbin/casper
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/libexec/casper/random/Makefile b/libexec/casper/random/Makefile
index 87efe212c363..46c97393335b 100644
--- a/libexec/casper/random/Makefile
+++ b/libexec/casper/random/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
CFLAGS+=-I${.CURDIR}/../../../sbin/casper
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/libexec/casper/sysctl/Makefile b/libexec/casper/sysctl/Makefile
index dc15099bc1fa..432008e01e75 100644
--- a/libexec/casper/sysctl/Makefile
+++ b/libexec/casper/sysctl/Makefile
@@ -17,6 +17,6 @@ CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
CFLAGS+=-I${.CURDIR}/../../../sbin/casper
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/libexec/dma-mbox-create/Makefile b/libexec/dma-mbox-create/Makefile
index 956e4edfa746..f0a2341a916a 100644
--- a/libexec/dma-mbox-create/Makefile
+++ b/libexec/dma-mbox-create/Makefile
@@ -7,7 +7,7 @@ CFLAGS= -I${.CURDIR}/../../contrib/dma \
-DCONF_PATH='"/etc/dma"' \
-DLIBEXEC_PATH='"/usr/libexec"' -DDMA_VERSION='"v0.9+"'
-NO_MAN=
+MAN=
WARNS= 2
diff --git a/libexec/ulog-helper/Makefile b/libexec/ulog-helper/Makefile
index c1697c8fd12c..764f0dece164 100644
--- a/libexec/ulog-helper/Makefile
+++ b/libexec/ulog-helper/Makefile
@@ -3,7 +3,7 @@
PROG= ulog-helper
BINOWN= root
BINMODE=4555
-NO_MAN=
+MAN=
DPADD= ${LIBULOG}
LDADD= -lulog
diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile
index f2b481a11f54..d3e4792ff40f 100644
--- a/release/picobsd/tinyware/aps/Makefile
+++ b/release/picobsd/tinyware/aps/Makefile
@@ -2,7 +2,7 @@
#
PROG=ps
SRCS+=main.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile
index f7a90e8de490..5c0753654eb3 100644
--- a/release/picobsd/tinyware/help/Makefile
+++ b/release/picobsd/tinyware/help/Makefile
@@ -2,7 +2,7 @@
#
PROG=help
SRCS+=help.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile
index db07e7808b4c..ab0ad2bf9614 100644
--- a/release/picobsd/tinyware/msg/Makefile
+++ b/release/picobsd/tinyware/msg/Makefile
@@ -2,7 +2,7 @@
#
PROG=msg
SRCS= msg.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile
index 46f5e2413c6d..bf8a27096c77 100644
--- a/release/picobsd/tinyware/ns/Makefile
+++ b/release/picobsd/tinyware/ns/Makefile
@@ -4,6 +4,6 @@ PROG= ns
SRCS= ns.c
CFLAGS+= -DBRIDGING
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile
index c5fc1f3f0e61..74044afa779e 100644
--- a/release/picobsd/tinyware/oinit/Makefile
+++ b/release/picobsd/tinyware/oinit/Makefile
@@ -15,7 +15,7 @@ CFLAGS= -DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \
#LDADD= -lutil -ledit -ltermcap
LDADD=-lutil
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile
index abd4bd89872a..7b797acfe04d 100644
--- a/release/picobsd/tinyware/simple_httpd/Makefile
+++ b/release/picobsd/tinyware/simple_httpd/Makefile
@@ -2,7 +2,7 @@
#
PROG=simple_httpd
SRCS= simple_httpd.c
-NO_MAN=
+MAN=
WARNS?=6
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile
index 348ea32b5140..a1bcf457e3ba 100644
--- a/release/picobsd/tinyware/sps/Makefile
+++ b/release/picobsd/tinyware/sps/Makefile
@@ -2,7 +2,7 @@
#
PROG=sps
SRCS= sps.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile
index e49baa191adc..b668613a5248 100644
--- a/release/picobsd/tinyware/view/Makefile
+++ b/release/picobsd/tinyware/view/Makefile
@@ -4,6 +4,6 @@ PROG=view
SRCS=view.c
CFLAGS+=-I/usr/local/include
LDADD+=-L/usr/local/lib -lpng -lvgl -lz -lm
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile
index b1d662913d41..193710e1bc1c 100644
--- a/release/picobsd/tinyware/vm/Makefile
+++ b/release/picobsd/tinyware/vm/Makefile
@@ -3,7 +3,7 @@
PROG=vm
#CFLAGS+=
SRCS= vm.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 2fadb723598f..ea0d1370d80c 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -1,7 +1,7 @@
#$FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/2/93
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 88b82404e107..ced58425c657 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -9,7 +9,7 @@
PROG= geom
SRCS= geom.c geom_label.c geom_part.c subr.c
-NO_MAN=
+MAN=
WARNS?= 2
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile
index 39ef258461dc..d7380084cd66 100644
--- a/sbin/rtsol/Makefile
+++ b/sbin/rtsol/Makefile
@@ -20,7 +20,7 @@ SRCDIR= ${.CURDIR}/../../usr.sbin/rtsold
PROG= rtsol
SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c
-NO_MAN=
+MAN=
WARNS?= 3
CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL
diff --git a/secure/lib/libcrypto/engines/lib4758cca/Makefile b/secure/lib/libcrypto/engines/lib4758cca/Makefile
index 4144034cc024..3606c459bfeb 100644
--- a/secure/lib/libcrypto/engines/lib4758cca/Makefile
+++ b/secure/lib/libcrypto/engines/lib4758cca/Makefile
@@ -2,6 +2,6 @@
SHLIB_NAME?= lib4758cca.so
SRCS= e_4758cca.c
-NO_MAN= # For now
+MAN=
.include <bsd.lib.mk>
diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile
index fcfc6b314506..834d925a6fe2 100644
--- a/share/examples/FreeBSD_version/Makefile
+++ b/share/examples/FreeBSD_version/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= FreeBSD_version
-NO_MAN=
+MAN=
install:
diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile
index d577668dc4e7..3e158837b59f 100644
--- a/share/examples/autofs/driver/Makefile
+++ b/share/examples/autofs/driver/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= autodriver
-NO_MAN=
+MAN=
SRCS= autodriver.c
WARNS?= 4
diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile
index ac6de9cf7f05..425d5d3fa106 100644
--- a/share/examples/find_interface/Makefile
+++ b/share/examples/find_interface/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= find_interface
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/share/examples/kld/cdev/test/Makefile b/share/examples/kld/cdev/test/Makefile
index ad0c0fcd08d0..eebf54d7cb6a 100644
--- a/share/examples/kld/cdev/test/Makefile
+++ b/share/examples/kld/cdev/test/Makefile
@@ -67,7 +67,7 @@
# $FreeBSD$
#
PROG= testcdev
-NO_MAN=
+MAN=
WARNS?= 5
MODSTAT= /sbin/kldstat
diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile
index 09d535bf686c..6cc6907d1f4c 100644
--- a/share/examples/kld/syscall/test/Makefile
+++ b/share/examples/kld/syscall/test/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= call
-NO_MAN=
+MAN=
WARNS?= 5
.include <bsd.prog.mk>
diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile
index 6b4e916851da..f78584ed3888 100644
--- a/share/examples/libvgl/Makefile
+++ b/share/examples/libvgl/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= demo
-NO_MAN=
+MAN=
DPADD= ${LIBVGL}
LDADD= -lvgl
diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile
index de59b9effcf0..51ecf4dd74db 100644
--- a/share/examples/perfmon/Makefile
+++ b/share/examples/perfmon/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= perfmon
-NO_MAN=
+MAN=
install:
diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile
index 9b0d0d59c3d3..09a98cdc8963 100644
--- a/share/examples/ppi/Makefile
+++ b/share/examples/ppi/Makefile
@@ -3,6 +3,6 @@
# $FreeBSD$
PROG= ppilcd
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/share/mk/bsd.README b/share/mk/bsd.README
index ba6210036b59..9740dac629ce 100644
--- a/share/mk/bsd.README
+++ b/share/mk/bsd.README
@@ -309,7 +309,7 @@ To build foo from foo.c with a manual page foo.2, add the line:
If foo does not have a manual page at all, add the line:
- NO_MAN=
+ MAN=
If foo has multiple source files, add the line:
diff --git a/sys/boot/amd64/efi/Makefile b/sys/boot/amd64/efi/Makefile
index 880260553f69..f4138c937052 100644
--- a/sys/boot/amd64/efi/Makefile
+++ b/sys/boot/amd64/efi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/sys/boot/arm/at91/boot0/Makefile b/sys/boot/arm/at91/boot0/Makefile
index a13a620bba49..8c22cc9967a5 100644
--- a/sys/boot/arm/at91/boot0/Makefile
+++ b/sys/boot/arm/at91/boot0/Makefile
@@ -5,7 +5,7 @@
P=boot0
FILES=${P}
SRCS=arm_init.S main.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/boot0iic/Makefile b/sys/boot/arm/at91/boot0iic/Makefile
index 44f447088398..af93ce2e488d 100644
--- a/sys/boot/arm/at91/boot0iic/Makefile
+++ b/sys/boot/arm/at91/boot0iic/Makefile
@@ -5,7 +5,7 @@
P=boot0iic
FILES=${P}
SRCS=arm_init.S main.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/boot0spi/Makefile b/sys/boot/arm/at91/boot0spi/Makefile
index eb6c5b52f593..207d6204cd3b 100644
--- a/sys/boot/arm/at91/boot0spi/Makefile
+++ b/sys/boot/arm/at91/boot0spi/Makefile
@@ -5,7 +5,7 @@
P=boot0spi
FILES=${P}
SRCS=arm_init.S main.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/boot2/Makefile b/sys/boot/arm/at91/boot2/Makefile
index ea02b8e5de1d..1150969bc4de 100644
--- a/sys/boot/arm/at91/boot2/Makefile
+++ b/sys/boot/arm/at91/boot2/Makefile
@@ -5,7 +5,7 @@
P=boot2
FILES=${P}
SRCS=arm_init.S boot2.c ${BOOT_FLAVOR:tl}_board.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/bootiic/Makefile b/sys/boot/arm/at91/bootiic/Makefile
index 3983d2ba45b5..13f2482e6260 100644
--- a/sys/boot/arm/at91/bootiic/Makefile
+++ b/sys/boot/arm/at91/bootiic/Makefile
@@ -5,7 +5,7 @@
P=bootiic
FILES=${P}
SRCS=arm_init.S main.c loader_prompt.c env_vars.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/bootspi/Makefile b/sys/boot/arm/at91/bootspi/Makefile
index bd7217dd8ec6..04c4fbb51592 100644
--- a/sys/boot/arm/at91/bootspi/Makefile
+++ b/sys/boot/arm/at91/bootspi/Makefile
@@ -5,7 +5,7 @@
P=bootspi
FILES=${P}
SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c
-NO_MAN=
+MAN=
LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
diff --git a/sys/boot/arm/at91/libat91/Makefile b/sys/boot/arm/at91/libat91/Makefile
index a7fe96ff0d26..7ab9a1f3bb47 100644
--- a/sys/boot/arm/at91/libat91/Makefile
+++ b/sys/boot/arm/at91/libat91/Makefile
@@ -11,7 +11,7 @@ SRCS=${SOC}_lowlevel.c delay.c eeprom.c emac.c emac_init.c getc.c \
sd-card.c strcvt.c strlen.c strcmp.c memcpy.c strcpy.c \
memset.c memcmp.c
SRCS+=ashldi3.c divsi3.S
-NO_MAN=
+MAN=
.if ${MK_TAG_LIST} != "no"
CFLAGS += -I${.CURDIR}/.. -DSUPPORT_TAG_LIST
diff --git a/sys/boot/arm/ixp425/boot2/Makefile b/sys/boot/arm/ixp425/boot2/Makefile
index 9a96d3bc4567..14e87d1cea63 100644
--- a/sys/boot/arm/ixp425/boot2/Makefile
+++ b/sys/boot/arm/ixp425/boot2/Makefile
@@ -20,7 +20,7 @@ SRCS+=strlen.c ashldi3.c divsi3.S muldi3.c
.if ${MK_ARM_EABI} != "no"
SRCS+=aeabi_unwind.c
.endif
-NO_MAN=
+MAN=
KERNPHYSADDR=0x180000
KERNVIRTADDR=${KERNPHYSADDR}
diff --git a/sys/boot/i386/boot0/Makefile b/sys/boot/i386/boot0/Makefile
index 38281a1d510a..1e696dec80bd 100644
--- a/sys/boot/i386/boot0/Makefile
+++ b/sys/boot/i386/boot0/Makefile
@@ -3,7 +3,7 @@
PROG?= boot0
STRIP=
BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
SRCS= ${PROG}.S
# Additional options that you can specify with make OPTS="..."
diff --git a/sys/boot/i386/btx/btx/Makefile b/sys/boot/i386/btx/btx/Makefile
index 236d2693e1e1..0f5a468ba62e 100644
--- a/sys/boot/i386/btx/btx/Makefile
+++ b/sys/boot/i386/btx/btx/Makefile
@@ -2,7 +2,7 @@
PROG= btx
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btx.S
.if defined(BOOT_BTX_NOHANG)
diff --git a/sys/boot/i386/btx/btxldr/Makefile b/sys/boot/i386/btx/btxldr/Makefile
index b76468be018d..7e57ca3fc6a2 100644
--- a/sys/boot/i386/btx/btxldr/Makefile
+++ b/sys/boot/i386/btx/btxldr/Makefile
@@ -2,7 +2,7 @@
PROG= btxldr
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btxldr.S
CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
diff --git a/sys/boot/i386/btx/lib/Makefile b/sys/boot/i386/btx/lib/Makefile
index 856d86806bcd..c66f0fcc5169 100644
--- a/sys/boot/i386/btx/lib/Makefile
+++ b/sys/boot/i386/btx/lib/Makefile
@@ -2,7 +2,7 @@
PROG= crt0.o
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btxcsu.S btxsys.s btxv86.s
CFLAGS+=-I${.CURDIR}/../../common
LDFLAGS=-Wl,-r
diff --git a/sys/boot/i386/cdboot/Makefile b/sys/boot/i386/cdboot/Makefile
index f352d693b658..a3dc2517e20f 100644
--- a/sys/boot/i386/cdboot/Makefile
+++ b/sys/boot/i386/cdboot/Makefile
@@ -3,7 +3,7 @@
PROG= cdboot
STRIP=
BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
SRCS= ${PROG}.S
CFLAGS+=-I${.CURDIR}/../common
diff --git a/sys/boot/i386/kgzldr/Makefile b/sys/boot/i386/kgzldr/Makefile
index a124474da4e5..f396ae90a0f4 100644
--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@@ -4,7 +4,7 @@ PROG= kgzldr.o
STRIP=
BINMODE=${LIBMODE}
BINDIR= ${LIBDIR}
-NO_MAN=
+MAN=
SRCS= start.s boot.c inflate.c lib.c crt.s sio.s
CFLAGS= -Os
diff --git a/sys/boot/i386/mbr/Makefile b/sys/boot/i386/mbr/Makefile
index ac6d415842dd..d1a652cbeaeb 100644
--- a/sys/boot/i386/mbr/Makefile
+++ b/sys/boot/i386/mbr/Makefile
@@ -3,7 +3,7 @@
PROG= mbr
STRIP=
BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
SRCS= ${PROG}.s
# MBR flags: 0x80 -- try packet interface (also known as EDD or LBA)
diff --git a/sys/boot/i386/pmbr/Makefile b/sys/boot/i386/pmbr/Makefile
index 7ae942d70c8a..cc12f4919ca8 100644
--- a/sys/boot/i386/pmbr/Makefile
+++ b/sys/boot/i386/pmbr/Makefile
@@ -3,7 +3,7 @@
PROG= pmbr
STRIP=
BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
SRCS= ${PROG}.s
ORG= 0x600
diff --git a/sys/boot/i386/zfsloader/Makefile b/sys/boot/i386/zfsloader/Makefile
index 926d69d05480..1825367363d6 100644
--- a/sys/boot/i386/zfsloader/Makefile
+++ b/sys/boot/i386/zfsloader/Makefile
@@ -6,7 +6,7 @@ LOADER= zfsloader
NEWVERSWHAT= "ZFS enabled bootstrap loader" x86
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY= yes
-NO_MAN= yes
+MAN=
.include "${.CURDIR}/../loader/Makefile"
diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile
index 27e81b996ab5..6bb53b587123 100644
--- a/sys/boot/ia64/efi/Makefile
+++ b/sys/boot/ia64/efi/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index 5151435b94c0..31af84e3450f 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libstand32/Makefile
index da978f97b0a3..a364980a7c64 100644
--- a/sys/boot/libstand32/Makefile
+++ b/sys/boot/libstand32/Makefile
@@ -6,7 +6,7 @@
# quite large.
#
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/boot/mips/beri/boot2/Makefile b/sys/boot/mips/beri/boot2/Makefile
index c97838328843..325edbcdbe5f 100644
--- a/sys/boot/mips/beri/boot2/Makefile
+++ b/sys/boot/mips/beri/boot2/Makefile
@@ -42,7 +42,7 @@ SRCS= relocate.S \
cfi.c \
sdcard.c
-NO_MAN=
+MAN=
AFLAGS= -G0
diff --git a/sys/boot/pc98/boot0.5/Makefile b/sys/boot/pc98/boot0.5/Makefile
index 51774171ea73..4ce3e0705003 100644
--- a/sys/boot/pc98/boot0.5/Makefile
+++ b/sys/boot/pc98/boot0.5/Makefile
@@ -3,7 +3,7 @@
PROG= ${BOOT}.out
INTERNALPROG=
FILES= ${BOOT}
-NO_MAN=
+MAN=
SRCS= start.s boot.s boot0.5.s disk.s selector.s support.s syscons.s \
putssjis.s
CLEANFILES= ${BOOT} ${BOOT}.bin
diff --git a/sys/boot/pc98/boot0/Makefile b/sys/boot/pc98/boot0/Makefile
index a929525db8fd..8c903e8359da 100644
--- a/sys/boot/pc98/boot0/Makefile
+++ b/sys/boot/pc98/boot0/Makefile
@@ -3,7 +3,7 @@
PROG= ${BOOT}.out
INTERNALPROG=
FILES= ${BOOT}
-NO_MAN=
+MAN=
SRCS= ${BOOT}.s
CLEANFILES= ${BOOT}
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile
index 22cd5d67866b..905908f95680 100644
--- a/sys/boot/pc98/btx/btx/Makefile
+++ b/sys/boot/pc98/btx/btx/Makefile
@@ -2,7 +2,7 @@
PROG= btx
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btx.S
.if defined(BOOT_BTX_NOHANG)
diff --git a/sys/boot/pc98/btx/btxldr/Makefile b/sys/boot/pc98/btx/btxldr/Makefile
index aef1685ebf25..7d34e9e04289 100644
--- a/sys/boot/pc98/btx/btxldr/Makefile
+++ b/sys/boot/pc98/btx/btxldr/Makefile
@@ -2,7 +2,7 @@
PROG= btxldr
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btxldr.S
CFLAGS+=-DLOADER_ADDRESS=${LOADER_ADDRESS}
diff --git a/sys/boot/pc98/btx/lib/Makefile b/sys/boot/pc98/btx/lib/Makefile
index 151fc8fc8a12..e5876bc1371d 100644
--- a/sys/boot/pc98/btx/lib/Makefile
+++ b/sys/boot/pc98/btx/lib/Makefile
@@ -2,7 +2,7 @@
PROG= crt0.o
INTERNALPROG=
-NO_MAN=
+MAN=
SRCS= btxcsu.S btxsys.s btxv86.s
CFLAGS+=-I${.CURDIR}/../../../i386/common
LDFLAGS=-Wl,-r
diff --git a/sys/boot/pc98/cdboot/Makefile b/sys/boot/pc98/cdboot/Makefile
index bcce0efe135d..23543d4c2f3e 100644
--- a/sys/boot/pc98/cdboot/Makefile
+++ b/sys/boot/pc98/cdboot/Makefile
@@ -3,7 +3,7 @@
PROG= cdboot
STRIP=
BINMODE=${NOBINMODE}
-NO_MAN=
+MAN=
SRCS= ${PROG}.S
CFLAGS+=-I${.CURDIR}/../../i386/common
diff --git a/sys/boot/pc98/kgzldr/Makefile b/sys/boot/pc98/kgzldr/Makefile
index 2303fd9663b4..0070d70204a5 100644
--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@@ -4,7 +4,7 @@ PROG= kgzldr.o
STRIP=
BINMODE=${LIBMODE}
BINDIR= ${LIBDIR}
-NO_MAN=
+MAN=
SRCS= start.s boot.c inflate.c lib.c crt.s sio.s
CFLAGS= -Os
diff --git a/sys/boot/powerpc/boot1.chrp/Makefile b/sys/boot/powerpc/boot1.chrp/Makefile
index 10e6368dd123..4255cdb1deeb 100644
--- a/sys/boot/powerpc/boot1.chrp/Makefile
+++ b/sys/boot/powerpc/boot1.chrp/Makefile
@@ -10,7 +10,7 @@ INSTALLFLAGS= -b
FILES= boot1.hfs
SRCS= boot1.c ashldi3.c syncicache.c
-NO_MAN=
+MAN=
CFLAGS= -ffreestanding -msoft-float -Os \
-I${.CURDIR}/../../common -I${.CURDIR}/../../../ \
diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile
index c941c13a078e..c4180cbf2579 100644
--- a/sys/boot/powerpc/uboot/Makefile
+++ b/sys/boot/powerpc/uboot/Makefile
@@ -6,7 +6,7 @@ PROG= ubldr
NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH}
BINDIR?= /boot
INSTALLFLAGS= -b
-NO_MAN=
+MAN=
# Architecture-specific loader code
SRCS= start.S conf.c vers.c
diff --git a/sys/boot/sparc64/boot1/Makefile b/sys/boot/sparc64/boot1/Makefile
index f8986ade4e3e..5150c3b5f85b 100644
--- a/sys/boot/sparc64/boot1/Makefile
+++ b/sys/boot/sparc64/boot1/Makefile
@@ -2,7 +2,7 @@
PROG= boot1.elf
INTERNALPROG=
-NO_MAN=
+MAN=
FILES?= boot1
SRCS= _start.s boot1.c
CLEANFILES=${FILES} boot1.aout
diff --git a/sys/boot/userboot/libstand/Makefile b/sys/boot/userboot/libstand/Makefile
index d312ee46c5da..4ef62f34d99b 100644
--- a/sys/boot/userboot/libstand/Makefile
+++ b/sys/boot/userboot/libstand/Makefile
@@ -6,7 +6,7 @@
# quite large.
#
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/boot/userboot/test/Makefile b/sys/boot/userboot/test/Makefile
index 69674613ce08..e9ecf58c77a7 100644
--- a/sys/boot/userboot/test/Makefile
+++ b/sys/boot/userboot/test/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/boot/userboot/userboot/Makefile b/sys/boot/userboot/userboot/Makefile
index aad2e0f83c34..cc528b35a738 100644
--- a/sys/boot/userboot/userboot/Makefile
+++ b/sys/boot/userboot/userboot/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile
index d2dc35ea94bf..e262b4d764b5 100644
--- a/sys/crypto/rijndael/Makefile
+++ b/sys/crypto/rijndael/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG=test00
-NO_MAN=
+MAN=
SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c
CFLAGS += -I${.CURDIR}/../.. -g -static
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index f31a774e76c8..a3adbe90ef04 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -28,7 +28,7 @@ CFLAGS+= -I${.CURDIR}
.ifdef MAKESRCPATH
CFLAGS+= -I${MAKESRCPATH}
.endif
-NO_MAN=
+MAN=
YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d
LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/}
diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile
index a4f50329795b..721fe0a81968 100644
--- a/sys/dev/patm/genrtab/Makefile
+++ b/sys/dev/patm/genrtab/Makefile
@@ -6,7 +6,7 @@
PROG= genrtab
INTERNALPROG=
WARNS?= 5
-NO_MAN=
+MAN=
DPADD= ${LIBM}
LDADD= -lm
diff --git a/tools/KSE/ksetest/Makefile b/tools/KSE/ksetest/Makefile
index 885d06993c7b..24d4a8201830 100644
--- a/tools/KSE/ksetest/Makefile
+++ b/tools/KSE/ksetest/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ksetest
-NO_MAN=
+MAN=
CFLAGS+= -g -Wall
SRCS= kse_asm.S kse_threads_test.c
diff --git a/tools/KSE/rr/Makefile b/tools/KSE/rr/Makefile
index 45e1dbb7923a..2a953567c9c6 100644
--- a/tools/KSE/rr/Makefile
+++ b/tools/KSE/rr/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= rr
-NO_MAN=
+MAN=
CFLAGS+= -g -Wall
SRCS= kse_asm.S rr.c
diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile
index 40fb8b9eede3..2e3d6a3b4926 100644
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -1,7 +1,7 @@
#$FreeBSD$
# @(#)Makefile 8.1 (Berkeley) 6/2/93
-NO_MAN=
+MAN=
.include <bsd.own.mk>
MK_SSP= no
diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile
index 167bf8aa8245..fe81d5cc70ae 100644
--- a/tools/diag/dumpvfscache/Makefile
+++ b/tools/diag/dumpvfscache/Makefile
@@ -4,7 +4,7 @@ PROG= dumpvfscache
DPADD= ${LIBKVM}
LDADD= -lkvm
-NO_MAN=
+MAN=
test: ${PROG}
./${PROG} > a
diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile
index da4fe7fa1515..0dc7b0fe19b3 100644
--- a/tools/diag/localeck/Makefile
+++ b/tools/diag/localeck/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= localeck
-NO_MAN=
+MAN=
WARNS?= 4
LOCALEDIR?= /usr/share/locale
diff --git a/tools/regression/acct/Makefile b/tools/regression/acct/Makefile
index 6da91b6a9140..581cc5fbddf4 100644
--- a/tools/regression/acct/Makefile
+++ b/tools/regression/acct/Makefile
@@ -6,7 +6,7 @@
PROG= pack
SRCS= pack.c
-NO_MAN=
+MAN=
CFLAGS+= -I${.OBJDIR}
pack.o: convert.c
diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile
index 3d9615c91884..aac9a3b89e45 100644
--- a/tools/regression/aio/aiop/Makefile
+++ b/tools/regression/aio/aiop/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= aiop
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/aio/aiotest/Makefile b/tools/regression/aio/aiotest/Makefile
index bc8add23339a..6e59f42833f4 100644
--- a/tools/regression/aio/aiotest/Makefile
+++ b/tools/regression/aio/aiotest/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= aiotest
-NO_MAN=
+MAN=
DPADD= ${LIBUTIL}
LDADD= -lutil
diff --git a/tools/regression/aio/kqueue/Makefile b/tools/regression/aio/kqueue/Makefile
index ba0fd68ef810..00e24d6bcb6e 100644
--- a/tools/regression/aio/kqueue/Makefile
+++ b/tools/regression/aio/kqueue/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= aio_kqueue
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/aio/kqueue/lio/Makefile b/tools/regression/aio/kqueue/lio/Makefile
index 77377e5b24cf..4d64a0ced00c 100644
--- a/tools/regression/aio/kqueue/lio/Makefile
+++ b/tools/regression/aio/kqueue/lio/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= lio_kqueue
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/audit/audit_pipe_ioctl/Makefile b/tools/regression/audit/audit_pipe_ioctl/Makefile
index 9ba9e74faf78..083e25d35d9f 100644
--- a/tools/regression/audit/audit_pipe_ioctl/Makefile
+++ b/tools/regression/audit/audit_pipe_ioctl/Makefile
@@ -3,7 +3,7 @@
#
PROG= audit_pipe_ioctl
-NO_MAN= yes
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile
index 705a44d20800..c04223bbfec8 100644
--- a/tools/regression/doat/Makefile
+++ b/tools/regression/doat/Makefile
@@ -2,7 +2,7 @@
PROG= doat
-NO_MAN=
+MAN=
WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/regression/environ/Makefile.envctl b/tools/regression/environ/Makefile.envctl
index fc90499b5342..16b42414371f 100644
--- a/tools/regression/environ/Makefile.envctl
+++ b/tools/regression/environ/Makefile.envctl
@@ -8,7 +8,7 @@ CFLAGS+=-Wall -I../../../include
CLEANFILES= ${PROG}.core
-NO_MAN= yes
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/environ/Makefile.retention b/tools/regression/environ/Makefile.retention
index 9e0687f484fe..a69abe72dfdc 100644
--- a/tools/regression/environ/Makefile.retention
+++ b/tools/regression/environ/Makefile.retention
@@ -8,7 +8,7 @@ CFLAGS+=-Wall -I../../../include
CLEANFILES= *~ ${PROG}.core
-NO_MAN= yes
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/environ/Makefile.timings b/tools/regression/environ/Makefile.timings
index 88c4f7c7280b..adc2a987d534 100644
--- a/tools/regression/environ/Makefile.timings
+++ b/tools/regression/environ/Makefile.timings
@@ -8,7 +8,7 @@ CFLAGS+=-Wall -I../../../include
CLEANFILES= ${PROG}.core
-NO_MAN= yes
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/ethernet/ethermulti/Makefile b/tools/regression/ethernet/ethermulti/Makefile
index e0770b6a638c..0b179518999a 100644
--- a/tools/regression/ethernet/ethermulti/Makefile
+++ b/tools/regression/ethernet/ethermulti/Makefile
@@ -2,6 +2,6 @@
PROG= ethermulti
SRCS+= ethermulti.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/execve/Makefile b/tools/regression/execve/Makefile
index b553b33a1a94..edb05efff729 100644
--- a/tools/regression/execve/Makefile
+++ b/tools/regression/execve/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= doexec
-NO_MAN=
+MAN=
RP= ./${PROG}
TD= ${.CURDIR}/tests
diff --git a/tools/regression/fifo/fifo_create/Makefile b/tools/regression/fifo/fifo_create/Makefile
index f398b23e9de2..10e2b14f3bad 100644
--- a/tools/regression/fifo/fifo_create/Makefile
+++ b/tools/regression/fifo/fifo_create/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= fifo_create
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/fifo/fifo_io/Makefile b/tools/regression/fifo/fifo_io/Makefile
index c7d2ffba6819..49bf5bd6d225 100644
--- a/tools/regression/fifo/fifo_io/Makefile
+++ b/tools/regression/fifo/fifo_io/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= fifo_io
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/fifo/fifo_misc/Makefile b/tools/regression/fifo/fifo_misc/Makefile
index 976bce847a9e..97f85ec9aa91 100644
--- a/tools/regression/fifo/fifo_misc/Makefile
+++ b/tools/regression/fifo/fifo_misc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= fifo_misc
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/fifo/fifo_open/Makefile b/tools/regression/fifo/fifo_open/Makefile
index 43bdbaed0ef9..d90811ce9222 100644
--- a/tools/regression/fifo/fifo_open/Makefile
+++ b/tools/regression/fifo/fifo_open/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= fifo_open
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/file/dup/Makefile b/tools/regression/file/dup/Makefile
index 4de081568429..225c2e270cbf 100644
--- a/tools/regression/file/dup/Makefile
+++ b/tools/regression/file/dup/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= dup
-NO_MAN=
+MAN=
WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/regression/file/flock/Makefile b/tools/regression/file/flock/Makefile
index 1c9e6cca4244..cd1a46d8171b 100644
--- a/tools/regression/file/flock/Makefile
+++ b/tools/regression/file/flock/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= flock
-NO_MAN=
+MAN=
WARNS?= 6
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/regression/file/ftruncate/Makefile b/tools/regression/file/ftruncate/Makefile
index c3285ef5a83c..40b753e2314d 100644
--- a/tools/regression/file/ftruncate/Makefile
+++ b/tools/regression/file/ftruncate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ftruncate
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/file/newfileops_on_fork/Makefile b/tools/regression/file/newfileops_on_fork/Makefile
index 6ea44429e92f..be0c5feb0c42 100644
--- a/tools/regression/file/newfileops_on_fork/Makefile
+++ b/tools/regression/file/newfileops_on_fork/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= newfileops_on_fork
-NO_MAN=
+MAN=
WARNS?= 6
LDFLAGS= -lpthread
diff --git a/tools/regression/filemon/Makefile b/tools/regression/filemon/Makefile
index 62a529693004..027f13179a80 100644
--- a/tools/regression/filemon/Makefile
+++ b/tools/regression/filemon/Makefile
@@ -17,7 +17,7 @@ BINS+= ${_BINS:C/$/32/g}
bins: ${BINS}
all: bins
-NO_MAN=
+MAN=
WARNS?= 6
CFLAGS+= -I${.CURDIR}/../../../sys
diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile
index 687e7dda9a16..e1ee651b0851 100644
--- a/tools/regression/fsx/Makefile
+++ b/tools/regression/fsx/Makefile
@@ -2,6 +2,6 @@
PROG= fsx
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile
index f3b8b004fd84..187c973b34a9 100644
--- a/tools/regression/gaithrstress/Makefile
+++ b/tools/regression/gaithrstress/Makefile
@@ -4,5 +4,5 @@ PROG= gaithrstress
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile
index 3be5e70f1dfe..f550db3198f4 100644
--- a/tools/regression/geom/ConfCmp/Makefile
+++ b/tools/regression/geom/ConfCmp/Makefile
@@ -15,7 +15,7 @@ CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -
DPADD += ${LIBBSDXML}
LDADD += -lbsdxml
-NO_MAN=
+MAN=
CLEANFILES += _*
.include <bsd.prog.mk>
diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile
index 7bf18af772e2..eab3f89b239e 100644
--- a/tools/regression/geom/MdLoad/Makefile
+++ b/tools/regression/geom/MdLoad/Makefile
@@ -4,7 +4,7 @@ PROG= MdLoad
DPADD= ${LIBSBUF} ${LIBBSDXML}
LDADD= -lsbuf -lbsdxml
-NO_MAN=
+MAN=
WARNS?= 4
diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile
index 1ddd01ab8064..ae9982ac1418 100644
--- a/tools/regression/include/stdatomic/Makefile
+++ b/tools/regression/include/stdatomic/Makefile
@@ -2,6 +2,6 @@
PROG= logic
WARNS=6
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile
index 53e3b9a36a1b..04116c0fa3a3 100644
--- a/tools/regression/include/tgmath/Makefile
+++ b/tools/regression/include/tgmath/Makefile
@@ -3,6 +3,6 @@
PROG= tgmath
CSTD= c99
CFLAGS+= -fno-builtin
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile
index e033e28db481..751604f58f94 100644
--- a/tools/regression/kgssapi/Makefile
+++ b/tools/regression/kgssapi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= gsstest
-NO_MAN=
+MAN=
WARNS?= 2
DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
LDADD= -lgssapi -lgssapi_krb5
diff --git a/tools/regression/kqueue/Makefile b/tools/regression/kqueue/Makefile
index 45372493c6fc..12b7527525b3 100644
--- a/tools/regression/kqueue/Makefile
+++ b/tools/regression/kqueue/Makefile
@@ -15,7 +15,7 @@ SRCS= \
proc.c \
signal.c \
user.c
-NO_MAN=
+MAN=
WARNS?= 2
.include "bsd.prog.mk"
diff --git a/tools/regression/kthread/kld/Makefile b/tools/regression/kthread/kld/Makefile
index df1f76374ada..b21848183abb 100644
--- a/tools/regression/kthread/kld/Makefile
+++ b/tools/regression/kthread/kld/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}
KMOD= kthrdlk
-NO_MAN=
+MAN=
SRCS= kthrdlk.c
WARNS?= 2
diff --git a/tools/regression/lib/libc/resolv/Makefile b/tools/regression/lib/libc/resolv/Makefile
index 9b4e6b1c3461..fa91ac399314 100644
--- a/tools/regression/lib/libc/resolv/Makefile
+++ b/tools/regression/lib/libc/resolv/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= resolv
-NO_MAN=
+MAN=
# Note: this test relies on being dynamically linked. You will get a
# spurious PASS for a statically linked test.
diff --git a/tools/regression/mac/mac_bsdextended/Makefile b/tools/regression/mac/mac_bsdextended/Makefile
index e19d62d989e3..36464bae1d51 100644
--- a/tools/regression/mac/mac_bsdextended/Makefile
+++ b/tools/regression/mac/mac_bsdextended/Makefile
@@ -3,6 +3,6 @@
PROG= test_ugidfw
DPADD= ${LIBUGIDFW}
LDADD= -lugidfw
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/mlock/Makefile b/tools/regression/mlock/Makefile
index a4617888d2e6..69fe099466e8 100644
--- a/tools/regression/mlock/Makefile
+++ b/tools/regression/mlock/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= mlock
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/mmap/Makefile b/tools/regression/mmap/Makefile
index eb4d66c83549..c9bb5c482795 100644
--- a/tools/regression/mmap/Makefile
+++ b/tools/regression/mmap/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= mmap
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest1/Makefile b/tools/regression/mqueue/mqtest1/Makefile
index 370b5c9bd35a..3a50cee8ffea 100644
--- a/tools/regression/mqueue/mqtest1/Makefile
+++ b/tools/regression/mqueue/mqtest1/Makefile
@@ -3,7 +3,7 @@
PROG=mqtest1
DPADD= ${LIBRT}
LDADD= -lrt
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest2/Makefile b/tools/regression/mqueue/mqtest2/Makefile
index 07a5577d4ec4..07098543cc15 100644
--- a/tools/regression/mqueue/mqtest2/Makefile
+++ b/tools/regression/mqueue/mqtest2/Makefile
@@ -3,7 +3,7 @@
PROG=mqtest2
DPADD= ${LIBRT}
LDADD= -lrt
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest3/Makefile b/tools/regression/mqueue/mqtest3/Makefile
index 543948041b07..514cbacb1708 100644
--- a/tools/regression/mqueue/mqtest3/Makefile
+++ b/tools/regression/mqueue/mqtest3/Makefile
@@ -3,7 +3,7 @@
PROG=mqtest3
DPADD= ${LIBRT}
LDADD= -lrt
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest4/Makefile b/tools/regression/mqueue/mqtest4/Makefile
index d0476b27476e..781d76da220b 100644
--- a/tools/regression/mqueue/mqtest4/Makefile
+++ b/tools/regression/mqueue/mqtest4/Makefile
@@ -3,7 +3,7 @@
PROG=mqtest4
DPADD= ${LIBRT}
LDADD= -lrt
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/mqueue/mqtest5/Makefile b/tools/regression/mqueue/mqtest5/Makefile
index b2f3aad69815..d94e541f81f3 100644
--- a/tools/regression/mqueue/mqtest5/Makefile
+++ b/tools/regression/mqueue/mqtest5/Makefile
@@ -3,7 +3,7 @@
PROG=mqtest5
DPADD= ${LIBRT}
LDADD= -lrt
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/arphold/Makefile b/tools/regression/netinet/arphold/Makefile
index 37abefb57ddc..6b679d39815a 100644
--- a/tools/regression/netinet/arphold/Makefile
+++ b/tools/regression/netinet/arphold/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= arphold
-NO_MAN=
+MAN=
CFLAGS+= -Wall
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/ipbroadcast/Makefile b/tools/regression/netinet/ipbroadcast/Makefile
index 5be8aa81ccb8..a1b497ae145c 100644
--- a/tools/regression/netinet/ipbroadcast/Makefile
+++ b/tools/regression/netinet/ipbroadcast/Makefile
@@ -3,7 +3,7 @@
#
PROG= ipbroadcast
-NO_MAN=
+MAN=
WARNS?= 6
diff --git a/tools/regression/netinet/ipdivert/Makefile b/tools/regression/netinet/ipdivert/Makefile
index 385620bd4e6c..59a0bc909f70 100644
--- a/tools/regression/netinet/ipdivert/Makefile
+++ b/tools/regression/netinet/ipdivert/Makefile
@@ -4,7 +4,7 @@
PROG= ipdivert
SRCS= ipdivert.c
-NO_MAN=
+MAN=
WARNS?= 2
diff --git a/tools/regression/netinet/ipmulticast/Makefile b/tools/regression/netinet/ipmulticast/Makefile
index a7cd29dbb2f0..c0291e7072eb 100644
--- a/tools/regression/netinet/ipmulticast/Makefile
+++ b/tools/regression/netinet/ipmulticast/Makefile
@@ -4,7 +4,7 @@
PROG= ipmulticast
SRCS= ipmulticast.c
-NO_MAN=
+MAN=
WARNS?= 2
diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile
index c49ee6cbd8f7..f142412c74ba 100644
--- a/tools/regression/netinet/ipsockopt/Makefile
+++ b/tools/regression/netinet/ipsockopt/Makefile
@@ -3,6 +3,6 @@
#
PROG= ipsockopt
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/msocket/Makefile b/tools/regression/netinet/msocket/Makefile
index 17c5b80a284a..21dd84f0c185 100644
--- a/tools/regression/netinet/msocket/Makefile
+++ b/tools/regression/netinet/msocket/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= msocket
-NO_MAN=
+MAN=
CFLAGS+= -Wall
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/msocket_ifnet_remove/Makefile b/tools/regression/netinet/msocket_ifnet_remove/Makefile
index 07c38160117a..0c35c6906dac 100644
--- a/tools/regression/netinet/msocket_ifnet_remove/Makefile
+++ b/tools/regression/netinet/msocket_ifnet_remove/Makefile
@@ -2,6 +2,6 @@
PROG= msocket_ifnet_remove
WARNS?= 3
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/rawconnect/Makefile b/tools/regression/netinet/rawconnect/Makefile
index 2ab64936c24b..4f8ba1b4edfd 100644
--- a/tools/regression/netinet/rawconnect/Makefile
+++ b/tools/regression/netinet/rawconnect/Makefile
@@ -3,6 +3,6 @@
#
PROG= rawconnect
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile
index 3456ff52ffda..a6b9d71de224 100644
--- a/tools/regression/netinet/tcpconnect/Makefile
+++ b/tools/regression/netinet/tcpconnect/Makefile
@@ -3,6 +3,6 @@
#
PROG= tcpconnect
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpdrop/Makefile b/tools/regression/netinet/tcpdrop/Makefile
index 1707dad23a5b..1bd01aa0e07d 100644
--- a/tools/regression/netinet/tcpdrop/Makefile
+++ b/tools/regression/netinet/tcpdrop/Makefile
@@ -3,7 +3,7 @@
#
PROG= tcpdrop
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile
index b24f94081b5f..52333897f6fb 100644
--- a/tools/regression/netinet/tcpfullwindowrst/Makefile
+++ b/tools/regression/netinet/tcpfullwindowrst/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= tcpfullwindowrsttest
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile b/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
index 2ac338a85d2f..dfc0691f37ef 100644
--- a/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
+++ b/tools/regression/netinet/tcpsockclosebeforeaccept/Makefile
@@ -3,7 +3,7 @@
#
PROG= tcpsockclosebeforeaccept
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpsocktimewait/Makefile b/tools/regression/netinet/tcpsocktimewait/Makefile
index f86fefcf1295..63cb6359c32b 100644
--- a/tools/regression/netinet/tcpsocktimewait/Makefile
+++ b/tools/regression/netinet/tcpsocktimewait/Makefile
@@ -3,7 +3,7 @@
#
PROG= tcpsocktimewait
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile
index 6f6491aedd08..37cbcc030c88 100644
--- a/tools/regression/netinet/tcpstream/Makefile
+++ b/tools/regression/netinet/tcpstream/Makefile
@@ -4,6 +4,6 @@
CFLAGS+= -Wall
PROG= tcpstream
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/udpconnectjail/Makefile b/tools/regression/netinet/udpconnectjail/Makefile
index bd5d0b1cba92..10688691c322 100644
--- a/tools/regression/netinet/udpconnectjail/Makefile
+++ b/tools/regression/netinet/udpconnectjail/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= udpconnectjail
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet/udpzerobyte/Makefile b/tools/regression/netinet/udpzerobyte/Makefile
index 818c17278ca0..35bd4c12e545 100644
--- a/tools/regression/netinet/udpzerobyte/Makefile
+++ b/tools/regression/netinet/udpzerobyte/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= udpzerobyte
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet6/icmp6_filter/Makefile b/tools/regression/netinet6/icmp6_filter/Makefile
index 0e1bc3b6c136..a28ad743cebe 100644
--- a/tools/regression/netinet6/icmp6_filter/Makefile
+++ b/tools/regression/netinet6/icmp6_filter/Makefile
@@ -3,7 +3,7 @@
#
PROG= icmp6_filter
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/netinet6/inet6_rth/Makefile b/tools/regression/netinet6/inet6_rth/Makefile
index ac284d3465fe..6a3c04b01c76 100644
--- a/tools/regression/netinet6/inet6_rth/Makefile
+++ b/tools/regression/netinet6/inet6_rth/Makefile
@@ -2,7 +2,7 @@
#
PROG= inet6_rth-segments
SRCS= test_subr.c inet6_rth-segments.c
-NO_MAN=
+MAN=
CFLAGS+= -Wall
DEBUG_FLAGS= -g
diff --git a/tools/regression/netinet6/ip6_sockets/Makefile b/tools/regression/netinet6/ip6_sockets/Makefile
index 4f6bc78cc3ed..bf9b740794ef 100644
--- a/tools/regression/netinet6/ip6_sockets/Makefile
+++ b/tools/regression/netinet6/ip6_sockets/Makefile
@@ -3,7 +3,7 @@
#
PROG= ip6_sockets
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile
index 07c3445fe7c4..5802538d2ced 100644
--- a/tools/regression/nfsmmap/test1/Makefile
+++ b/tools/regression/nfsmmap/test1/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= test1
-NO_MAN=
+MAN=
NFSSERVER?= herring.nlsystems.com
CLEANFILES= test1.zeros test1.good test1.data test1.scratch
diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile
index 113a3b32defa..5f09d02ce588 100644
--- a/tools/regression/nfsmmap/test2/Makefile
+++ b/tools/regression/nfsmmap/test2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= test2
-NO_MAN=
+MAN=
NFSSERVER?= herring.nlsystems.com
CLEANFILES= test2.zeros test2.good test2.data test2.scratch
diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile
index 85db354b944d..8cf7d5a6d783 100644
--- a/tools/regression/p1003_1b/Makefile
+++ b/tools/regression/p1003_1b/Makefile
@@ -11,7 +11,7 @@ SRCS=\
sched.c \
yield.c
-NO_MAN=
+MAN=
CFLAGS+=-DNO_MEMLOCK
.include <bsd.prog.mk>
diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile
index cf732538b255..8a5f83af364e 100644
--- a/tools/regression/pipe/Makefile
+++ b/tools/regression/pipe/Makefile
@@ -4,7 +4,7 @@
# "make" then "make regress".
#
PROG= bigpipetest
-NO_MAN=
+MAN=
regress:
@if ./bigpipetest; then \
diff --git a/tools/regression/posixsem/Makefile b/tools/regression/posixsem/Makefile
index f7568f40781b..312031323f6a 100644
--- a/tools/regression/posixsem/Makefile
+++ b/tools/regression/posixsem/Makefile
@@ -4,7 +4,7 @@ PROG= posixsem
SRCS= posixsem.c test.c
DPADD= ${LIBKVM}
LDADD= -lkvm
-NO_MAN=
+MAN=
WARNS?= 3
diff --git a/tools/regression/posixsem2/Makefile b/tools/regression/posixsem2/Makefile
index 84f96174e6ed..d9859087b94e 100644
--- a/tools/regression/posixsem2/Makefile
+++ b/tools/regression/posixsem2/Makefile
@@ -2,7 +2,7 @@
PROG= semtest
SRCS= semtest.c
-NO_MAN=
+MAN=
WARNS?= 3
diff --git a/tools/regression/posixshm/Makefile b/tools/regression/posixshm/Makefile
index 1737b5b95d09..5ef70c93bbdb 100644
--- a/tools/regression/posixshm/Makefile
+++ b/tools/regression/posixshm/Makefile
@@ -2,7 +2,7 @@
PROG= posixshm
SRCS= posixshm.c test.c
-NO_MAN=
+MAN=
WARNS?= 3
diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile
index bb238255f93c..bedca5627185 100644
--- a/tools/regression/pthread/cv_cancel1/Makefile
+++ b/tools/regression/pthread/cv_cancel1/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= cv_cancel1
-NO_MAN=
+MAN=
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile
index a234fbc5eb6e..f7a8984f7e3c 100644
--- a/tools/regression/pthread/mutex_isowned_np/Makefile
+++ b/tools/regression/pthread/mutex_isowned_np/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= mutex_isowned_np
-NO_MAN=
+MAN=
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile
index d1f894bfea17..5db4b7915237 100644
--- a/tools/regression/rpcsec_gss/Makefile
+++ b/tools/regression/rpcsec_gss/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= rpctest
-NO_MAN=
+MAN=
WARNS?= 6
DPADD= ${LIBRPCSEC_GSS}
LDADD= -lrpcsec_gss
diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile
index 7ec39999dff6..70437110ceeb 100644
--- a/tools/regression/security/access/Makefile
+++ b/tools/regression/security/access/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= testaccess
-NO_MAN=
+MAN=
SRCS= testaccess.c
CFLAGS += -Wall
diff --git a/tools/regression/security/cap_test/Makefile b/tools/regression/security/cap_test/Makefile
index b36c4133336e..344effae0460 100644
--- a/tools/regression/security/cap_test/Makefile
+++ b/tools/regression/security/cap_test/Makefile
@@ -11,7 +11,7 @@ SRCS= cap_test.c \
cap_test_sysctl.c \
WARNS= 3
-NO_MAN=
+MAN=
# Use headers and libc from the build, if available.
KERNCONF?= GENERIC
diff --git a/tools/regression/security/open_to_operation/Makefile b/tools/regression/security/open_to_operation/Makefile
index 6ac2cc997d8a..462626f0cb0e 100644
--- a/tools/regression/security/open_to_operation/Makefile
+++ b/tools/regression/security/open_to_operation/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= open_to_operation
-NO_MAN=
+MAN=
#WARNS= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile
index ad09f7a696f3..aa0770227c92 100644
--- a/tools/regression/security/proc_to_proc/Makefile
+++ b/tools/regression/security/proc_to_proc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= testuid
-NO_MAN=
+MAN=
ADDITIONAL_FLAGS=-DSETSUGID_SUPPORTED
#ADDITIONAL_FLAGS= -DSETSUGID_SUPPORTED_BUT_NO_LIBC_STUB
diff --git a/tools/regression/sigqueue/sigqtest1/Makefile b/tools/regression/sigqueue/sigqtest1/Makefile
index 86f7206cc009..66ad799895cb 100644
--- a/tools/regression/sigqueue/sigqtest1/Makefile
+++ b/tools/regression/sigqueue/sigqtest1/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG=sigqtest1
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/sigqueue/sigqtest2/Makefile b/tools/regression/sigqueue/sigqtest2/Makefile
index e7033f7b21e0..30ae7840ebc5 100644
--- a/tools/regression/sigqueue/sigqtest2/Makefile
+++ b/tools/regression/sigqueue/sigqtest2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG=sigqtest2
-NO_MAN=
+MAN=
DEBUG_FLAGS=-g
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile
index efcaa16c8e37..208df0d8befb 100644
--- a/tools/regression/sockets/accept_fd_leak/Makefile
+++ b/tools/regression/sockets/accept_fd_leak/Makefile
@@ -3,7 +3,7 @@
#
PROG= accept_fd_leak
-NO_MAN=
+MAN=
regress:
./accept_fd_leak
diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile
index 736c796861fd..75ed46b40163 100644
--- a/tools/regression/sockets/accf_data_attach/Makefile
+++ b/tools/regression/sockets/accf_data_attach/Makefile
@@ -3,7 +3,7 @@
#
PROG= accf_data_attach
-NO_MAN=
+MAN=
accf_data_attach: accf_data_attach.c
gcc -Wall -o accf_data_attach accf_data_attach.c
diff --git a/tools/regression/sockets/fstat/Makefile b/tools/regression/sockets/fstat/Makefile
index fd4fb10a81ef..28282ca94407 100644
--- a/tools/regression/sockets/fstat/Makefile
+++ b/tools/regression/sockets/fstat/Makefile
@@ -3,7 +3,7 @@
#
PROG= fstat
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/kqueue/Makefile b/tools/regression/sockets/kqueue/Makefile
index 53d34a91da17..e37eadfbb203 100644
--- a/tools/regression/sockets/kqueue/Makefile
+++ b/tools/regression/sockets/kqueue/Makefile
@@ -3,6 +3,6 @@
#
PROG= kqueue
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile
index aff40e414932..c7171ec8452f 100644
--- a/tools/regression/sockets/listen_backlog/Makefile
+++ b/tools/regression/sockets/listen_backlog/Makefile
@@ -2,6 +2,6 @@
PROG= listen_backlog
WARNS?= 3
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/listenclose/Makefile b/tools/regression/sockets/listenclose/Makefile
index 4ca3ddf8273f..1e146dcb30dd 100644
--- a/tools/regression/sockets/listenclose/Makefile
+++ b/tools/regression/sockets/listenclose/Makefile
@@ -3,7 +3,7 @@
#
PROG= listenclose
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile
index b825c80fcabe..b7ed9a635058 100644
--- a/tools/regression/sockets/pr_atomic/Makefile
+++ b/tools/regression/sockets/pr_atomic/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= pr_atomic
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/reconnect/Makefile b/tools/regression/sockets/reconnect/Makefile
index 21babc6a0124..edd6b47669e7 100644
--- a/tools/regression/sockets/reconnect/Makefile
+++ b/tools/regression/sockets/reconnect/Makefile
@@ -3,7 +3,7 @@
#
PROG= reconnect
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile
index 51a945211486..13a1238db47f 100644
--- a/tools/regression/sockets/rtsocket/Makefile
+++ b/tools/regression/sockets/rtsocket/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= rtsocket
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sblock/Makefile b/tools/regression/sockets/sblock/Makefile
index 97343fc50f45..af8d0e451482 100644
--- a/tools/regression/sockets/sblock/Makefile
+++ b/tools/regression/sockets/sblock/Makefile
@@ -3,7 +3,7 @@
#
PROG= sblock
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sendfile/Makefile b/tools/regression/sockets/sendfile/Makefile
index 2930363820a9..9d6f1854eb8a 100644
--- a/tools/regression/sockets/sendfile/Makefile
+++ b/tools/regression/sockets/sendfile/Makefile
@@ -3,7 +3,7 @@
#
PROG= sendfile
-NO_MAN=
+MAN=
WARNS?= 6
DPADD= ${LIBMD}
LDADD= -lmd
diff --git a/tools/regression/sockets/shutdown/Makefile b/tools/regression/sockets/shutdown/Makefile
index 775e6e5e1007..07ba65dd3e40 100644
--- a/tools/regression/sockets/shutdown/Makefile
+++ b/tools/regression/sockets/shutdown/Makefile
@@ -3,7 +3,7 @@
#
PROG= shutdown
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/sigpipe/Makefile b/tools/regression/sockets/sigpipe/Makefile
index 2130154edf9d..030703e60f50 100644
--- a/tools/regression/sockets/sigpipe/Makefile
+++ b/tools/regression/sockets/sigpipe/Makefile
@@ -3,7 +3,7 @@
#
PROG= sigpipe
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile
index b4fe2ca8bb62..fc12745e0c58 100644
--- a/tools/regression/sockets/so_setfib/Makefile
+++ b/tools/regression/sockets/so_setfib/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= so_setfib
-NO_MAN=
+MAN=
WARNS?= 6
.ifdef INET6
diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile
index 549e219ddfaa..ae71b17985a9 100644
--- a/tools/regression/sockets/socketpair/Makefile
+++ b/tools/regression/sockets/socketpair/Makefile
@@ -3,7 +3,7 @@
#
PROG= socketpair
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile
index ec1dfd0e2edf..2c4edfd470c1 100644
--- a/tools/regression/sockets/unix_bindconnect/Makefile
+++ b/tools/regression/sockets/unix_bindconnect/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_bindconnect
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile
index 4847bce00f3a..8b9f7928e3df 100644
--- a/tools/regression/sockets/unix_close_race/Makefile
+++ b/tools/regression/sockets/unix_close_race/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_close_race
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_cmsg/Makefile b/tools/regression/sockets/unix_cmsg/Makefile
index d09cb79d2973..9ccab6d2bd03 100644
--- a/tools/regression/sockets/unix_cmsg/Makefile
+++ b/tools/regression/sockets/unix_cmsg/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_cmsg
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile
index d791494e44b8..0c66493fa823 100644
--- a/tools/regression/sockets/unix_gc/Makefile
+++ b/tools/regression/sockets/unix_gc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_gc
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_passfd/Makefile b/tools/regression/sockets/unix_passfd/Makefile
index 8d2ddb9c8efb..77c6b034ef08 100644
--- a/tools/regression/sockets/unix_passfd/Makefile
+++ b/tools/regression/sockets/unix_passfd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_passfd
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile
index 6c92f242f737..0b183760bb1b 100644
--- a/tools/regression/sockets/unix_sendtorace/Makefile
+++ b/tools/regression/sockets/unix_sendtorace/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_sendtorace
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile
index 8549efc9b3d5..40f6b92e952e 100644
--- a/tools/regression/sockets/unix_socket/Makefile
+++ b/tools/regression/sockets/unix_socket/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_socket
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile
index 96e48cf837d9..237eb3d64bac 100644
--- a/tools/regression/sockets/unix_sorflush/Makefile
+++ b/tools/regression/sockets/unix_sorflush/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= unix_sorflush
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile
index 2bd05014f488..1562acc9d6f7 100644
--- a/tools/regression/sockets/zerosend/Makefile
+++ b/tools/regression/sockets/zerosend/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= zerosend
-NO_MAN=
+MAN=
WARNS?= 2
.include <bsd.prog.mk>
diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile
index 6892abb8b24d..c4c09e991cb0 100644
--- a/tools/regression/sysvmsg/Makefile
+++ b/tools/regression/sysvmsg/Makefile
@@ -3,7 +3,7 @@
# Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $
PROG= msgtest
-NO_MAN=
+MAN=
regress:
@if ./msgtest ./msgtest; then \
diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile
index 5546b62a471b..d5c3e9fe4b7c 100644
--- a/tools/regression/sysvsem/Makefile
+++ b/tools/regression/sysvsem/Makefile
@@ -3,7 +3,7 @@
# Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
PROG= semtest
-NO_MAN=
+MAN=
regress:
@if ./semtest ./semtest; then \
diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile
index f26b4a7bfa32..382de0370d2f 100644
--- a/tools/regression/sysvshm/Makefile
+++ b/tools/regression/sysvshm/Makefile
@@ -3,7 +3,7 @@
# Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $
PROG= shmtest
-NO_MAN=
+MAN=
regress:
@if ./shmtest ./shmtest; then \
diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile
index f4da549c7e51..a4535e0213d1 100644
--- a/tools/regression/tls/ttls1/Makefile
+++ b/tools/regression/tls/ttls1/Makefile
@@ -3,7 +3,7 @@
PROG= ttls1
LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx
LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy
-NO_MAN=
+MAN=
DEBUG_FLAGS= -g
.include <bsd.prog.mk>
diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile
index 043b9cad15a2..643040f10c17 100644
--- a/tools/regression/tls/ttls2/Makefile
+++ b/tools/regression/tls/ttls2/Makefile
@@ -3,7 +3,7 @@
PROG= ttls2
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
-NO_MAN=
+MAN=
DEBUG_FLAGS= -g
.include <bsd.prog.mk>
diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile
index 9a38a58e6343..2d1e501c073c 100644
--- a/tools/regression/tls/ttls4/Makefile
+++ b/tools/regression/tls/ttls4/Makefile
@@ -3,7 +3,7 @@
PROG= ttls4
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
-NO_MAN=
+MAN=
DEBUG_FLAGS= -g
.include <bsd.prog.mk>
diff --git a/tools/regression/tmpfs/Makefile b/tools/regression/tmpfs/Makefile
index f96ba1878a4d..49f7b8c8941e 100644
--- a/tools/regression/tmpfs/Makefile
+++ b/tools/regression/tmpfs/Makefile
@@ -30,7 +30,7 @@ regress: ${tests}
.endfor
PROG= h_tools
-NO_MAN= # defined
+MAN=
WARNS?= 4
t_sizes t_sockets t_statvfs: h_tools
diff --git a/tools/regression/ufs/uprintf/Makefile b/tools/regression/ufs/uprintf/Makefile
index c21ad70933e5..a798971f7984 100644
--- a/tools/regression/ufs/uprintf/Makefile
+++ b/tools/regression/ufs/uprintf/Makefile
@@ -2,6 +2,6 @@
PROG= ufs_uprintf
WARNS?= 3
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/test/auxinfo/Makefile b/tools/test/auxinfo/Makefile
index e6e57685db69..0e6d80992ad8 100644
--- a/tools/test/auxinfo/Makefile
+++ b/tools/test/auxinfo/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= auxinfo
-NO_MAN=
+MAN=
WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/iconv/gnu/Makefile b/tools/test/iconv/gnu/Makefile
index f5fea7b36db9..d52876e3aa18 100644
--- a/tools/test/iconv/gnu/Makefile
+++ b/tools/test/iconv/gnu/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= gnu
-NO_MAN= yes
+MAN=
WARNS?= 3
CFLAGS+= -L/usr/local/lib -I/usr/local/include
diff --git a/tools/test/iconv/posix/Makefile b/tools/test/iconv/posix/Makefile
index 0244779d0fc0..891142412df8 100644
--- a/tools/test/iconv/posix/Makefile
+++ b/tools/test/iconv/posix/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= posix
-NO_MAN= yes
+MAN=
WARNS?= 6
diff --git a/tools/test/iconv/refgen/Makefile b/tools/test/iconv/refgen/Makefile
index 59fb548a039e..6ac215101de3 100644
--- a/tools/test/iconv/refgen/Makefile
+++ b/tools/test/iconv/refgen/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../tablegen
PROG= refgen
-NO_MAN= yes
+MAN=
SRCS= tablegen.c
WARNS?= 3
diff --git a/tools/test/iconv/tablegen/Makefile b/tools/test/iconv/tablegen/Makefile
index 9605640b00af..cdac44f5b585 100644
--- a/tools/test/iconv/tablegen/Makefile
+++ b/tools/test/iconv/tablegen/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tablegen
-NO_MAN= yes
+MAN=
WARNS?= 3
diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile
index 2f00c341fa0a..455dec39920b 100644
--- a/tools/test/malloc/Makefile
+++ b/tools/test/malloc/Makefile
@@ -3,7 +3,7 @@ PROG= malloc
SRCS= main.c
.PATH: ${.CURDIR}/../../../lib/libc/stdlib
-NO_MAN=
+MAN=
WARNS?=6
test: malloc
diff --git a/tools/test/netfibs/Makefile b/tools/test/netfibs/Makefile
index 290f4f8454d6..689d613616e1 100644
--- a/tools/test/netfibs/Makefile
+++ b/tools/test/netfibs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= reflect
-NO_MAN=
+MAN=
WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile
index b4f43ce94fa0..0474b9979363 100644
--- a/tools/test/ppsapi/Makefile
+++ b/tools/test/ppsapi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ppsapitest
-NO_MAN=
+MAN=
WARNS?= 5
diff --git a/tools/test/ptrace/Makefile b/tools/test/ptrace/Makefile
index 681aee574385..a11b0a16a846 100644
--- a/tools/test/ptrace/Makefile
+++ b/tools/test/ptrace/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= scescx
-NO_MAN=
+MAN=
WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/test/upsdl/Makefile b/tools/test/upsdl/Makefile
index b45d5d80c50b..448cb7a02b4f 100644
--- a/tools/test/upsdl/Makefile
+++ b/tools/test/upsdl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= upsdl
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile
index 7a472321a039..03c5dcda9ed9 100644
--- a/tools/tools/aac/Makefile
+++ b/tools/tools/aac/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= aac_checkq
-NO_MAN=
+MAN=
WARNS?=6
BINDIR?=/usr/local/bin
diff --git a/tools/tools/ath/Makefile.inc b/tools/tools/ath/Makefile.inc
index 85953f2bdd0d..d0ed24b041f4 100644
--- a/tools/tools/ath/Makefile.inc
+++ b/tools/tools/ath/Makefile.inc
@@ -1,7 +1,7 @@
# $FreeBSD$
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
ATH_DEFAULT= ath0
diff --git a/tools/tools/ath/ath_ee_9287_print/Makefile b/tools/tools/ath/ath_ee_9287_print/Makefile
index b25172bfead5..00b631613958 100644
--- a/tools/tools/ath/ath_ee_9287_print/Makefile
+++ b/tools/tools/ath/ath_ee_9287_print/Makefile
@@ -5,7 +5,7 @@
PROG= ath_ee_9287_print
SRCS= main.c eeprom.c 9287.c
NOMAN= yes
-NO_MAN= yes
+MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile b/tools/tools/ath/ath_ee_9300_print/Makefile
index 8f37eefcb28b..797f6326c399 100644
--- a/tools/tools/ath/ath_ee_9300_print/Makefile
+++ b/tools/tools/ath/ath_ee_9300_print/Makefile
@@ -4,7 +4,7 @@
PROG= ath_ee_9300_print
NOMAN= yes
-NO_MAN= yes
+MAN=
SRCS= main.c
SRCS+= opt_ah.h
CLEANFILES+= opt_ah.h
diff --git a/tools/tools/ath/ath_ee_v14_print/Makefile b/tools/tools/ath/ath_ee_v14_print/Makefile
index 552aaa0313f7..d126c5e8c87e 100644
--- a/tools/tools/ath/ath_ee_v14_print/Makefile
+++ b/tools/tools/ath/ath_ee_v14_print/Makefile
@@ -4,7 +4,7 @@
PROG= ath_ee_v14_print
NOMAN= yes
-NO_MAN= yes
+MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/ath_ee_v4k_print/Makefile b/tools/tools/ath/ath_ee_v4k_print/Makefile
index 4bb3225b80b6..7bd737f7ef49 100644
--- a/tools/tools/ath/ath_ee_v4k_print/Makefile
+++ b/tools/tools/ath/ath_ee_v4k_print/Makefile
@@ -5,7 +5,7 @@
PROG= ath_ee_v4k_print
SRCS= main.c eeprom.c v4k.c
NOMAN= yes
-NO_MAN= yes
+MAN=
.include <../Makefile.inc>
diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile
index 5a9a43ed7dc2..13093f548c91 100644
--- a/tools/tools/ath/athstats/Makefile
+++ b/tools/tools/ath/athstats/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=1
+MAN=
.include <bsd.own.mk>
diff --git a/tools/tools/atsectl/Makefile b/tools/tools/atsectl/Makefile
index 3171561c81fb..3f3a8c479ec5 100644
--- a/tools/tools/atsectl/Makefile
+++ b/tools/tools/atsectl/Makefile
@@ -7,6 +7,6 @@ LDADD= -lmd
BINDIR?= /usr/sbin
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile
index 217a9e12b6e6..46a8d70764b3 100644
--- a/tools/tools/bootparttest/Makefile
+++ b/tools/tools/bootparttest/Makefile
@@ -5,7 +5,7 @@
BINDIR?= /usr/bin
PROG= bootparttest
-NO_MAN=
+MAN=
SRCS= bootparttest.c crc32.c malloc.c part.c
diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile
index 34a95b6adb74..5a49f2d38438 100644
--- a/tools/tools/cfi/Makefile
+++ b/tools/tools/cfi/Makefile
@@ -2,7 +2,7 @@
PROG= cfi
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/tools/cxgbetool/Makefile b/tools/tools/cxgbetool/Makefile
index 21f128374160..1c7adff28b72 100644
--- a/tools/tools/cxgbetool/Makefile
+++ b/tools/tools/cxgbetool/Makefile
@@ -2,7 +2,7 @@
PROG= cxgbetool
SRCS= cxgbetool.c
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgbe -I${.CURDIR}/../../../sys -I.
BINDIR?= /usr/sbin
diff --git a/tools/tools/cxgbtool/Makefile b/tools/tools/cxgbtool/Makefile
index 507bee085fc0..5aa08f121961 100644
--- a/tools/tools/cxgbtool/Makefile
+++ b/tools/tools/cxgbtool/Makefile
@@ -2,7 +2,7 @@
PROG= cxgbtool
SRCS= cxgbtool.c
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgb -I.
CFLAGS+= -DCONFIG_T3_REGS -DCHELSIO_INTERNAL
BINDIR?= /usr/sbin
diff --git a/tools/tools/drm/radeon/mkregtable/Makefile b/tools/tools/drm/radeon/mkregtable/Makefile
index b83cf5ca7747..49bc2ec16e3c 100644
--- a/tools/tools/drm/radeon/mkregtable/Makefile
+++ b/tools/tools/drm/radeon/mkregtable/Makefile
@@ -6,7 +6,7 @@ PROG= mkregtable
SRCS= mkregtable.c
-NO_MAN=
+MAN=
MKREGTABLE= ${PROG}
KERNSRCDIR= ${.CURDIR}/../../../../../sys
diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile
index 9a55be38d17e..ee6c46b11aa6 100644
--- a/tools/tools/find-sb/Makefile
+++ b/tools/tools/find-sb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= find-sb
-NO_MAN=
+MAN=
WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile
index 5f5a7e36b0d9..a23b171c9740 100644
--- a/tools/tools/gdb_regofs/Makefile
+++ b/tools/tools/gdb_regofs/Makefile
@@ -1,5 +1,5 @@
# $FreeBSD$
PROG=gdb_regofs
SRCS=${MACHINE_ARCH}.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile
index 440c39c693f1..019be92a5fe9 100644
--- a/tools/tools/ifinfo/Makefile
+++ b/tools/tools/ifinfo/Makefile
@@ -2,6 +2,6 @@
PROG= ifinfo
SRCS= ifinfo.c rfc1650.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile
index 2bcf0868fde6..0c09ecc61487 100644
--- a/tools/tools/ifpifa/Makefile
+++ b/tools/tools/ifpifa/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ifpifa
-NO_MAN=
+MAN=
WARNS?=6
BINDIR?=/usr/local/bin
DPADD=${LIBKVM}
diff --git a/tools/tools/ipw/Makefile b/tools/tools/ipw/Makefile
index a33ab234cfb1..f952d8807802 100644
--- a/tools/tools/ipw/Makefile
+++ b/tools/tools/ipw/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= ipwstats
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile
index 9ad0681084e0..49eccd30a0aa 100644
--- a/tools/tools/iwi/Makefile
+++ b/tools/tools/iwi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= iwistats
-NO_MAN=
+MAN=
WARNS?=6
.include <bsd.prog.mk>
diff --git a/tools/tools/iwn/iwnstats/Makefile b/tools/tools/iwn/iwnstats/Makefile
index 06f92acc8a91..b35530c324b0 100644
--- a/tools/tools/iwn/iwnstats/Makefile
+++ b/tools/tools/iwn/iwnstats/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=1
+MAN=
.include <bsd.own.mk>
diff --git a/tools/tools/mfi/Makefile b/tools/tools/mfi/Makefile
index d819a8303bfa..da8bc1b0fb96 100644
--- a/tools/tools/mfi/Makefile
+++ b/tools/tools/mfi/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= mfi_checkq
-NO_MAN=
+MAN=
BINDIR?=/usr/local/bin
.include <bsd.prog.mk>
diff --git a/tools/tools/mwl/mwldebug/Makefile b/tools/tools/mwl/mwldebug/Makefile
index a2caf1a6e415..62514d7fd11e 100644
--- a/tools/tools/mwl/mwldebug/Makefile
+++ b/tools/tools/mwl/mwldebug/Makefile
@@ -2,6 +2,6 @@
PROG= mwldebug
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/mwl/mwlstats/Makefile b/tools/tools/mwl/mwlstats/Makefile
index 144ddcc87bf8..4a3c5d3282fd 100644
--- a/tools/tools/mwl/mwlstats/Makefile
+++ b/tools/tools/mwl/mwlstats/Makefile
@@ -2,7 +2,7 @@
PROG= mwlstats
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
SRCS= main.c mwlstats.c
USEPRIVATELIB=
diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile
index 1852296ad3e5..011f49e231c3 100644
--- a/tools/tools/ncpus/Makefile
+++ b/tools/tools/ncpus/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= ncpus
-NO_MAN=
+MAN=
SRCS= ncpus.c acpi.c
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
SRCS+= biosmptable.c
diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile
index d7236afe95b0..c3970b2f635f 100644
--- a/tools/tools/net80211/stumbler/Makefile
+++ b/tools/tools/net80211/stumbler/Makefile
@@ -5,6 +5,6 @@ BINDIR= /usr/local/bin
DPADD= ${LIBPCAP} ${LIBNCURSES}
LDADD= -lpcap -lncurses
CFLAGS=-g
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc
index ecf5517ac524..11079d3882dc 100644
--- a/tools/tools/net80211/w00t/Makefile.inc
+++ b/tools/tools/net80211/w00t/Makefile.inc
@@ -9,4 +9,4 @@ LDADD= -lw00t -lcrypto -lz
BINDIR= /usr/local/bin
CFLAGS= -g -I${W00T}
-NO_MAN=
+MAN=
diff --git a/tools/tools/net80211/wesside/dics/Makefile b/tools/tools/net80211/wesside/dics/Makefile
index 9765243039d9..4f368e33ed84 100644
--- a/tools/tools/net80211/wesside/dics/Makefile
+++ b/tools/tools/net80211/wesside/dics/Makefile
@@ -5,6 +5,6 @@ BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
CFLAGS=-g
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/wesside/udps/Makefile b/tools/tools/net80211/wesside/udps/Makefile
index 257a181001fc..caa2fc0c4d3a 100644
--- a/tools/tools/net80211/wesside/udps/Makefile
+++ b/tools/tools/net80211/wesside/udps/Makefile
@@ -5,6 +5,6 @@ BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
CFLAGS=-g
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/wesside/wesside/Makefile b/tools/tools/net80211/wesside/wesside/Makefile
index 58f1855255c5..5c394075272d 100644
--- a/tools/tools/net80211/wesside/wesside/Makefile
+++ b/tools/tools/net80211/wesside/wesside/Makefile
@@ -5,7 +5,7 @@ BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
CFLAGS=-g
-NO_MAN=
+MAN=
SRCS=wesside.c aircrack-ptw-lib.c
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/wlaninject/Makefile b/tools/tools/net80211/wlaninject/Makefile
index 6d692a6b485a..b6bbeb5ab701 100644
--- a/tools/tools/net80211/wlaninject/Makefile
+++ b/tools/tools/net80211/wlaninject/Makefile
@@ -3,6 +3,6 @@
PROG= wlaninject
BINDIR= /usr/local/bin
CFLAGS=-g
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile
index bbda2ec83218..39a4b3bf2ecb 100644
--- a/tools/tools/net80211/wlanstats/Makefile
+++ b/tools/tools/net80211/wlanstats/Makefile
@@ -4,7 +4,7 @@
PROG= wlanstats
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
USEPRIVATELIB=
SRCS= wlanstats.c main.c
diff --git a/tools/tools/net80211/wlantxtime/Makefile b/tools/tools/net80211/wlantxtime/Makefile
index a1105f2dce31..87a852e4bd40 100644
--- a/tools/tools/net80211/wlantxtime/Makefile
+++ b/tools/tools/net80211/wlantxtime/Makefile
@@ -2,6 +2,6 @@
PROG= wlantxtime
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile
index 97742a16539e..57f2332dd4e6 100644
--- a/tools/tools/net80211/wlanwatch/Makefile
+++ b/tools/tools/net80211/wlanwatch/Makefile
@@ -2,7 +2,7 @@
PROG= wlanwatch
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/tools/tools/net80211/wlanwds/Makefile b/tools/tools/net80211/wlanwds/Makefile
index 6813f3a3bef4..7a011a980b13 100644
--- a/tools/tools/net80211/wlanwds/Makefile
+++ b/tools/tools/net80211/wlanwds/Makefile
@@ -2,6 +2,6 @@
PROG= wlanwds
BINDIR= /usr/local/bin
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/netmap/Makefile b/tools/tools/netmap/Makefile
index c50247366b5a..7d7c44b1cce1 100644
--- a/tools/tools/netmap/Makefile
+++ b/tools/tools/netmap/Makefile
@@ -6,7 +6,7 @@
PROGS = pkt-gen bridge vale-ctl
CLEANFILES = $(PROGS) *.o
-NO_MAN=
+MAN=
CFLAGS += -Werror -Wall # -nostdinc -I/usr/include -I../../../sys
CFLAGS += -Wextra
diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile
index fb8960bc5700..d501e612dfe9 100644
--- a/tools/tools/netrate/http/Makefile
+++ b/tools/tools/netrate/http/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= http
-NO_MAN=
+MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile
index b66ad191e5d1..2318dae042d0 100644
--- a/tools/tools/netrate/httpd/Makefile
+++ b/tools/tools/netrate/httpd/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= httpd
-NO_MAN=
+MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile
index cd64a079ddb8..751bbb57adae 100644
--- a/tools/tools/netrate/juggle/Makefile
+++ b/tools/tools/netrate/juggle/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= juggle
-NO_MAN=
+MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile
index 7e51860e5c51..5911183355c3 100644
--- a/tools/tools/netrate/netblast/Makefile
+++ b/tools/tools/netrate/netblast/Makefile
@@ -3,6 +3,6 @@
#
PROG= netblast
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile
index 115d1e81d5e3..43489e572242 100644
--- a/tools/tools/netrate/netreceive/Makefile
+++ b/tools/tools/netrate/netreceive/Makefile
@@ -3,7 +3,7 @@
#
PROG= netreceive
-NO_MAN=
+MAN=
LDFLAGS += -lpthread
WARNS?= 3
diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile
index 2b11958898a1..5f11f837b37b 100644
--- a/tools/tools/netrate/netsend/Makefile
+++ b/tools/tools/netrate/netsend/Makefile
@@ -4,6 +4,6 @@
CFLAGS+= -Wall
PROG= netsend
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile
index 624c94a8c81b..59375428c6e0 100644
--- a/tools/tools/netrate/tcpconnect/Makefile
+++ b/tools/tools/netrate/tcpconnect/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tcpconnect
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/tools/netrate/tcpp/Makefile b/tools/tools/netrate/tcpp/Makefile
index a0b271526736..828e799ecebf 100644
--- a/tools/tools/netrate/tcpp/Makefile
+++ b/tools/tools/netrate/tcpp/Makefile
@@ -2,7 +2,7 @@
PROG= tcpp
INCS= tcpp.h
-NO_MAN=
+MAN=
SRCS= tcpp.c tcpp_client.c tcpp_server.c tcpp_util.c
WARNS?= 3
diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile
index f04ea5f0589e..8142a2dea97e 100644
--- a/tools/tools/netrate/tcpreceive/Makefile
+++ b/tools/tools/netrate/tcpreceive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tcpreceive
-NO_MAN=
+MAN=
WARNS?= 3
.include <bsd.prog.mk>
diff --git a/tools/tools/npe/npestats/Makefile b/tools/tools/npe/npestats/Makefile
index 4e0a8ee47c29..a4a404c2d8d2 100644
--- a/tools/tools/npe/npestats/Makefile
+++ b/tools/tools/npe/npestats/Makefile
@@ -3,7 +3,7 @@
PROG= npestats
SRCS= main.c npestats.c
BINDIR= /usr/local/bin
-NO_MAN= true
+MAN=
USEPRIVATELIB=
LDADD= -lbsdstat
diff --git a/tools/tools/nxge/Makefile b/tools/tools/nxge/Makefile
index e311920fa576..cb70a846b977 100644
--- a/tools/tools/nxge/Makefile
+++ b/tools/tools/nxge/Makefile
@@ -2,6 +2,6 @@
PROG= xgeinfo
SRCS= xge_info.c xge_log.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/pciroms/Makefile b/tools/tools/pciroms/Makefile
index 94e7f5fd4a7b..9e30d8510492 100644
--- a/tools/tools/pciroms/Makefile
+++ b/tools/tools/pciroms/Makefile
@@ -3,7 +3,7 @@
#
PROG= pciroms
-NO_MAN=
+MAN=
WARNS?= 6
diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile
index 18e6bb84ef4a..7346d2c6a319 100644
--- a/tools/tools/pirtool/Makefile
+++ b/tools/tools/pirtool/Makefile
@@ -2,6 +2,6 @@
PROG= pirtool
SRCS= pirtool.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile
index 684477bd3d79..190ad0231a8c 100644
--- a/tools/tools/syscall_timing/Makefile
+++ b/tools/tools/syscall_timing/Makefile
@@ -4,6 +4,6 @@
PROG= syscall_timing
CFLAGS+= -static -O
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/tionxcl/Makefile b/tools/tools/tionxcl/Makefile
index 99948fbb9fbc..1f23d67c9529 100644
--- a/tools/tools/tionxcl/Makefile
+++ b/tools/tools/tionxcl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
PROG= tionxcl
-NO_MAN= defined
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile
index 2335673dcba7..816093686d92 100644
--- a/tools/tools/umastat/Makefile
+++ b/tools/tools/umastat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= umastat
-NO_MAN=
+MAN=
WARNS?= 3
DPADD= ${LIBKVM}
diff --git a/tools/tools/vxge/Makefile b/tools/tools/vxge/Makefile
index 061327d8ff1d..11506e4251c3 100644
--- a/tools/tools/vxge/Makefile
+++ b/tools/tools/vxge/Makefile
@@ -2,6 +2,6 @@
PROG= vxge-manage
SRCS= vxge_info.c vxge_log.c
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/tools/tools/wtap/vis_map/Makefile b/tools/tools/wtap/vis_map/Makefile
index 5668dee1b6f7..1e9884f71c68 100644
--- a/tools/tools/wtap/vis_map/Makefile
+++ b/tools/tools/wtap/vis_map/Makefile
@@ -3,7 +3,7 @@
BINDIR?= /usr/local/bin/
PROG= vis_map
SRC= vis_map.c
-NO_MAN= 1
+MAN=
CFLAGS+= -I${.CURDIR}/../../../../sys/dev/wtap/
diff --git a/tools/tools/wtap/wtap/Makefile b/tools/tools/wtap/wtap/Makefile
index a196e2698cf0..85b584b871bf 100644
--- a/tools/tools/wtap/wtap/Makefile
+++ b/tools/tools/wtap/wtap/Makefile
@@ -3,7 +3,7 @@
BINDIR?= /usr/local/bin
PROG= wtap
SRC= wtap.c
-NO_MAN= 1
+MAN=
CFLAGS+= -I${.CURDIR}/../../../../sys/dev/wtap/
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index a194a8384a2c..145e166a40ab 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -8,7 +8,7 @@ SCRIPTSDIR?= /usr/bin
PROG= zfsboottest
SCRIPTS= zfsboottest.sh
SCRIPTSNAME= zfsboottest.sh
-NO_MAN=
+MAN=
CFLAGS= -O1 \
-I${.CURDIR}/../../../sys/boot/zfs \
diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile
index affe91bc0b07..97b9615b05e3 100644
--- a/usr.bin/bzip2recover/Makefile
+++ b/usr.bin/bzip2recover/Makefile
@@ -4,7 +4,7 @@ BZ2DIR= ${.CURDIR}/../../contrib/bzip2
.PATH: ${BZ2DIR}
PROG= bzip2recover
-NO_MAN=
+MAN=
NO_WMISSING_VARIABLE_DECLARATIONS=
diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile
index 00c7582434b3..0f64ad373789 100644
--- a/usr.bin/clang/clang-tblgen/Makefile
+++ b/usr.bin/clang/clang-tblgen/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
PROG_CXX=clang-tblgen
diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile
index 7a2c56af8b76..91590885b010 100644
--- a/usr.bin/clang/llvm-mc/Makefile
+++ b/usr.bin/clang/llvm-mc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
PROG_CXX=llvm-mc
diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile
index f20d33190db9..a12cfd1c3490 100644
--- a/usr.bin/clang/llvm-objdump/Makefile
+++ b/usr.bin/clang/llvm-objdump/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
PROG_CXX=llvm-objdump
diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile
index 01b771b93e68..027902604c9d 100644
--- a/usr.bin/clang/llvm-rtdyld/Makefile
+++ b/usr.bin/clang/llvm-rtdyld/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
PROG_CXX=llvm-rtdyld
diff --git a/usr.bin/clang/macho-dump/Makefile b/usr.bin/clang/macho-dump/Makefile
index bafd15029cda..0452583eed41 100644
--- a/usr.bin/clang/macho-dump/Makefile
+++ b/usr.bin/clang/macho-dump/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
PROG_CXX=macho-dump
diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile
index 4c8a6e54e07f..13293b0b00ee 100644
--- a/usr.bin/cpio/test/Makefile
+++ b/usr.bin/cpio/test/Makefile
@@ -64,7 +64,7 @@ SRCS+= test_utils.c
CLEANFILES+= list.h bsdcpio_test
-NO_MAN=yes
+MAN=
PROG=bsdcpio_test
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile
index 770389799411..fb0e660a5a95 100644
--- a/usr.bin/dirname/Makefile
+++ b/usr.bin/dirname/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
PROG= dirname
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index eb39dd16b51d..0591c4d53a91 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= locate.bigram
-NO_MAN=
+MAN=
BINDIR= ${LIBEXECDIR}
CFLAGS+= -I${.CURDIR}/../locate
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index 20eef8c49212..dc2075fbdcb9 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -3,7 +3,7 @@
PROG= locate.code
CFLAGS+=-I${.CURDIR}/../locate
-NO_MAN=
+MAN=
BINDIR= ${LIBEXECDIR}
.include <bsd.prog.mk>
diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile
index 0c6e10d00daf..b2a1a1368219 100644
--- a/usr.bin/mkcsmapper_static/Makefile
+++ b/usr.bin/mkcsmapper_static/Makefile
@@ -5,7 +5,7 @@
PROG= mkcsmapper_static
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
citrus_lookup_factory.c citrus_pivot_factory.c
-NO_MAN= yes
+MAN=
NO_SHARED= yes
build-tools: mkcsmapper_static
diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile
index 7328efc9bd1c..613b25e70d09 100644
--- a/usr.bin/mkesdb_static/Makefile
+++ b/usr.bin/mkesdb_static/Makefile
@@ -5,7 +5,7 @@
PROG= mkesdb_static
SRCS= citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \
citrus_lookup_factory.c
-NO_MAN= yes
+MAN=
NO_SHARED= yes
build-tools: mkesdb_static
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index 61c62e6a24dc..dfa2e384f116 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svn.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnadmin/Makefile b/usr.bin/svn/svnadmin/Makefile
index 2a0794721ea8..3220cdef3e4a 100644
--- a/usr.bin/svn/svnadmin/Makefile
+++ b/usr.bin/svn/svnadmin/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnadmin.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svndumpfilter/Makefile b/usr.bin/svn/svndumpfilter/Makefile
index 5554dff1736b..864f3767913d 100644
--- a/usr.bin/svn/svndumpfilter/Makefile
+++ b/usr.bin/svn/svndumpfilter/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svndumpfilter.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnlook/Makefile b/usr.bin/svn/svnlook/Makefile
index 618a4736ff98..3d8b1a036c13 100644
--- a/usr.bin/svn/svnlook/Makefile
+++ b/usr.bin/svn/svnlook/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnlook.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnmucc/Makefile b/usr.bin/svn/svnmucc/Makefile
index 8ec8d1f44596..23a98e30ffc3 100644
--- a/usr.bin/svn/svnmucc/Makefile
+++ b/usr.bin/svn/svnmucc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnmucc.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnrdump/Makefile b/usr.bin/svn/svnrdump/Makefile
index 8500f5f5b559..afeae003c994 100644
--- a/usr.bin/svn/svnrdump/Makefile
+++ b/usr.bin/svn/svnrdump/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnrdump.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnserve/Makefile b/usr.bin/svn/svnserve/Makefile
index 6a39d4d8005a..f1fa314e1628 100644
--- a/usr.bin/svn/svnserve/Makefile
+++ b/usr.bin/svn/svnserve/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnserve.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnsync/Makefile b/usr.bin/svn/svnsync/Makefile
index a1f6e2512bab..a8cd3802ad53 100644
--- a/usr.bin/svn/svnsync/Makefile
+++ b/usr.bin/svn/svnsync/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnsync.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/svn/svnversion/Makefile b/usr.bin/svn/svnversion/Makefile
index fb2a7a210b98..ca28ec312126 100644
--- a/usr.bin/svn/svnversion/Makefile
+++ b/usr.bin/svn/svnversion/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN= svnversion.1
+MAN=
.include "${.CURDIR}/../Makefile.inc"
diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile
index 5e849fe44d8d..89d024295586 100644
--- a/usr.bin/tar/test/Makefile
+++ b/usr.bin/tar/test/Makefile
@@ -66,7 +66,7 @@ SRCS+= test_utils.c
CLEANFILES+= list.h
-NO_MAN=yes
+MAN=
PROG=bsdtar_test
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile
index 14014facb7b0..f53af5a9dc85 100644
--- a/usr.bin/unexpand/Makefile
+++ b/usr.bin/unexpand/Makefile
@@ -2,6 +2,6 @@
# $FreeBSD$
PROG= unexpand
-NO_MAN=
+MAN=
.include <bsd.prog.mk>
diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile
index f49bb482beef..7f3dde00e196 100644
--- a/usr.bin/uudecode/Makefile
+++ b/usr.bin/uudecode/Makefile
@@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile
index 8712ebb60585..4d931de27d34 100644
--- a/usr.bin/vgrind/RETEST/Makefile
+++ b/usr.bin/vgrind/RETEST/Makefile
@@ -4,7 +4,7 @@
PROG= retest
SRCS= regexp.c retest.c
.PATH: ${.CURDIR}/..
-NO_MAN=
+MAN=
install:
diff --git a/usr.bin/xlint/lint2/Makefile b/usr.bin/xlint/lint2/Makefile
index eaee12413cf2..8f4a4ad52989 100644
--- a/usr.bin/xlint/lint2/Makefile
+++ b/usr.bin/xlint/lint2/Makefile
@@ -5,7 +5,7 @@
PROG= lint2
SRCS= main2.c hash.c read.c mem.c mem2.c chk.c msg.c emit.c emit2.c inittyp.c
-NO_MAN=
+MAN=
CFLAGS+=-I${.CURDIR}/../lint1
LINTFLAGS=-abehrz
diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile
index df3f19c56c3c..5f879fe79bee 100644
--- a/usr.sbin/bhyvectl/Makefile
+++ b/usr.sbin/bhyvectl/Makefile
@@ -5,7 +5,7 @@
PROG= bhyvectl
SRCS= bhyvectl.c
-NO_MAN=
+MAN=
DPADD= ${LIBVMMAPI} ${LIBUTIL}
LDADD= -lvmmapi -lutil
diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile
index 0137407f818d..28b1e263f4df 100644
--- a/usr.sbin/bootparamd/callbootd/Makefile
+++ b/usr.sbin/bootparamd/callbootd/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PROG= callbootd
-NO_MAN=
+MAN=
SRCS= callbootd.c ${GENSRCS}
GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c
diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile
index 486c99eb2a9b..1910b23d956c 100644
--- a/usr.sbin/bsdinstall/distextract/Makefile
+++ b/usr.sbin/bsdinstall/distextract/Makefile
@@ -6,7 +6,7 @@ DPADD= ${LIBARCHIVE} ${LIBDIALOG} ${LIBM}
LDADD= -larchive -ldialog -lm
WARNS?= 6
-NO_MAN= true
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile
index 9c4becdd22f2..08eb91c07352 100644
--- a/usr.sbin/bsdinstall/distfetch/Makefile
+++ b/usr.sbin/bsdinstall/distfetch/Makefile
@@ -6,7 +6,7 @@ DPADD= ${LIBFETCH} ${LIBDIALOG} ${LIBM}
LDADD= -lfetch -ldialog -lm
WARNS?= 6
-NO_MAN= true
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index 07e3338252a6..efe9700fbfcb 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -5,6 +5,6 @@ SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
rootpass script services time umount wlanconfig zfsboot
BINDIR= /usr/libexec/bsdinstall
-NO_MAN= true
+MAN=
.include <bsd.prog.mk>
diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile
index 120830196c66..01b924226c45 100644
--- a/usr.sbin/crunch/examples/Makefile
+++ b/usr.sbin/crunch/examples/Makefile
@@ -11,7 +11,7 @@ CONF= $(CRUNCHED).conf
OUTMK= $(CRUNCHED).mk
OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache
-NO_MAN=
+MAN=
CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache
CLEANDIRFILES+= $(OUTPUTS)
diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile
index 18dd52557d42..d2f5648869a3 100644
--- a/usr.sbin/ctm/ctm_dequeue/Makefile
+++ b/usr.sbin/ctm/ctm_dequeue/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../ctm_rmail
PROG= ctm_dequeue
-NO_MAN=
+MAN=
SRCS= ctm_dequeue.c error.c
CFLAGS+= -I${.CURDIR}/../ctm_rmail
diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile
index 15209e42b69e..4c98d31e24a5 100644
--- a/usr.sbin/ctm/ctm_smail/Makefile
+++ b/usr.sbin/ctm/ctm_smail/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../ctm_rmail
PROG= ctm_smail
-NO_MAN=
+MAN=
SRCS= ctm_smail.c error.c
CFLAGS+= -I${.CURDIR}/../ctm_rmail
diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile
index cefd70448c68..745956cad61f 100644
--- a/usr.sbin/ctm/mkCTM/Makefile
+++ b/usr.sbin/ctm/mkCTM/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= mkctm
-NO_MAN=
+MAN=
DPADD= ${LIBMD}
LDADD= -lmd
diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile
index 7dcc8c2e2f17..c88f10e95295 100644
--- a/usr.sbin/fifolog/fifolog_reader/Makefile
+++ b/usr.sbin/fifolog/fifolog_reader/Makefile
@@ -4,7 +4,7 @@ PROG= fifolog_reader
CFLAGS+= -I${.CURDIR}/../lib
-NO_MAN= # see ../fifolog_create/fifolog.1
+MAN=
DPADD= ${LIBFIFOLOG} ${LIBUTIL} ${LIBZ}
LDADD= ${LIBFIFOLOG} -lutil -lz
diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile
index b6ceb6312319..9d802c7eb3ee 100644
--- a/usr.sbin/fifolog/fifolog_writer/Makefile
+++ b/usr.sbin/fifolog/fifolog_writer/Makefile
@@ -4,7 +4,7 @@ PROG= fifolog_writer
CFLAGS+= -I${.CURDIR}/../lib
-NO_MAN= # see ../fifolog_create/fifolog.1
+MAN=
DPADD= ${LIBFIFOLOG} ${LIBUTIL} ${LIBZ}
LDADD= ${LIBFIFOLOG} -lutil -lz
diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile
index 361783ed24e4..71ffc09eb3ff 100644
--- a/usr.sbin/lpr/filters.ru/koi2855/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= koi2855
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../../common_source
diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
index e410d9a7cd9b..98f7ffe13e2c 100644
--- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile
+++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= koi2alt
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../../common_source
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index b55b536c1ce6..f1bc58643ebc 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -4,7 +4,7 @@
BINDIR= /usr/libexec/lpr
PROG= lpf
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../common_source
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index a0fee4422d51..26716c2ff001 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 175ad67b227b..1ac4c7249f71 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index 0814e8edda61..f55ec92bc5d9 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate
PROG= ntpdate
-NO_MAN=
+MAN=
SRCS= ntpdate.c version.c
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index 17c5f39b7fce..81d2671078af 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 205a0be736cd..eb4297341d1c 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-NO_MAN=
+MAN=
.include <bsd.own.mk>
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index db5885ddceb3..d3bf7a74cfd9 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../../contrib/ntp/util
PROG= ntptime
-NO_MAN=
+MAN=
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
diff --git a/usr.sbin/portsnap/make_index/Makefile b/usr.sbin/portsnap/make_index/Makefile
index 87768f6035ef..92e91450e4fd 100644
--- a/usr.sbin/portsnap/make_index/Makefile
+++ b/usr.sbin/portsnap/make_index/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= make_index
-NO_MAN=
+MAN=
BINDIR= ${LIBEXECDIR}
diff --git a/usr.sbin/portsnap/phttpget/Makefile b/usr.sbin/portsnap/phttpget/Makefile
index 6f003e3b975a..a43672f6e762 100644
--- a/usr.sbin/portsnap/phttpget/Makefile
+++ b/usr.sbin/portsnap/phttpget/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= phttpget
-NO_MAN=
+MAN=
BINDIR= ${LIBEXECDIR}
diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile
index ffef7d493108..03c1142f5efa 100644
--- a/usr.sbin/rpc.ypupdated/Makefile
+++ b/usr.sbin/rpc.ypupdated/Makefile
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr
PROG= rpc.ypupdated
-NO_MAN=
+MAN=
SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \
yp_error.c update.c ypupdated_server.c \
yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c