Set the default manual section for usr.sbin/ to 8.

sbin/setkey/Makefile

@@ -56,7 +56,6 @@ DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 CLEANFILES+=	scriptdump y.tab.h
 
-MAN8=	setkey.8
 LOCALPREFIX=	/usr/local
 
 scriptdump: scriptdump.pl

usr.sbin/IPXrouted/Makefile

@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	IPXrouted
-MAN8=	IPXrouted.8
 SRCS=	af.c if.c input.c main.c output.c startup.c tables.c timer.c trace.c
 SRCS+=  sap_input.c sap_tables.c sap_output.c
 DPADD=	${LIBCOMPAT} ${LIBIPX}

usr.sbin/Makefile.inc

@@ -1,3 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 BINDIR?=	/usr/sbin
+MANSECT?=	8

usr.sbin/ac/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	ac
-MAN8=	ac.8
 
 # If "CONSOLE_TTY" is not defined, this program is compatible with the
 # traditional implementation (using SunOS 4.x as the sample traditional

usr.sbin/accton/Makefile

@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	accton
-MAN8=	accton.8
 
 .include <bsd.prog.mk>

usr.sbin/acpi/Makefile.inc

@@ -1,5 +1,7 @@
 # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
 # $FreeBSD$
 
-CFLAGS+= -Wall -static -I${.CURDIR}/../../../sys
+NOSHARED?=	YES
-BINDIR?= /usr/sbin
+CFLAGS+=	-Wall -I${.CURDIR}/../../../sys
+
+.include "../Makefile.inc"

usr.sbin/acpi/acpiconf/Makefile

@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	acpiconf
-MAN8=	acpiconf.8
 
 .include <bsd.prog.mk>

usr.sbin/acpi/acpidump/Makefile

@@ -3,7 +3,6 @@
 
 PROG=	acpidump
 SRCS=	acpi.c acpi_user.c asl_dump.c aml_dump.c acpidump.c
-MAN8=	acpidump.8
 #DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>

usr.sbin/acpi/amldb/Makefile

@@ -4,7 +4,6 @@
 PROG=	amldb
 SRCS=	amldb.c debug.c region.c
 SRCS+=	aml_parse.c aml_name.c aml_amlmem.c aml_memman.c aml_store.c aml_obj.c aml_evalobj.c aml_common.c
-MAN8=	amldb.8
 #DEBUG_FLAGS= -g
 CFLAGS+= -I${.CURDIR}
 

usr.sbin/amd/amd/Makefile

@@ -9,7 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/amd
 
 PROG=		amd
-MAN8=		amd.8
 
 SRCS=		conf_parse.y conf_tok.l
 SRCS+=		am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c

usr.sbin/amd/amq/Makefile

@@ -9,7 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
 
 PROG=		amq
-MAN8=		amq.8
 
 SRCS=		amq.c amq_clnt.c amq_xdr.c
 

usr.sbin/amd/fixmount/Makefile

@@ -10,7 +10,6 @@
 		${.CURDIR}/../../../contrib/amd/conf/checkmount
 
 PROG=		fixmount
-MAN8=		fixmount.8
 
 SRCS=		fixmount.c 
 

usr.sbin/amd/fsinfo/Makefile

@@ -9,7 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/fsinfo
 
 PROG=		fsinfo
-MAN8=		fsinfo.8
 
 SRCS=		fsi_gram.y fsi_lex.l
 SRCS+=		fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 

usr.sbin/amd/hlfsd/Makefile

@@ -9,7 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/hlfsd
 
 PROG=		hlfsd
-MAN8=		hlfsd.8
 
 SRCS=		hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 

usr.sbin/amd/mk-amd-map/Makefile

@@ -9,8 +9,5 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/mk-amd-map
 
 PROG=		mk-amd-map
-MAN8=		mk-amd-map.8
-
-SRCS=		mk-amd-map.c
 
 .include <bsd.prog.mk>

usr.sbin/amd/wire-test/Makefile

@@ -9,9 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/wire-test
 
 PROG=		wire-test
-MAN8=		wire-test.8
-
-SRCS=		wire-test.c
 
 DPADD+=		${LIBAMU}
 LDADD+=		${LIBAMU}

usr.sbin/ancontrol/Makefile

@@ -1,9 +1,6 @@
 # $FreeBSD$
 
 PROG=	ancontrol
-SRCS=	ancontrol.c
-
-MAN8=	ancontrol.8
 
 CFLAGS+= 	-I${.CURDIR}/../../sys -DANCACHE -Wall
 

usr.sbin/apm/Makefile

@@ -2,7 +2,6 @@
 
 PROG=		apm
 LINKS=		${BINDIR}/apm ${BINDIR}/zzz
-MAN8=		apm.8
 MLINKS=		apm.8 apmconf.8 apm.8 zzz.8
 
 .include <bsd.prog.mk>

usr.sbin/apmd/Makefile

@@ -6,8 +6,6 @@ SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 DPADD=	${LIBL}
 LDADD=	-ll
 
-MAN8=	apmd.8
-
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR} -Wall #-DYY_STACK_USED
 # for debug:

usr.sbin/atm/Makefile.inc

@@ -27,4 +27,4 @@
 #
 #
 
-BINDIR?=	/usr/sbin
+.include "../Makefile.inc"

usr.sbin/atm/atmarpd/Makefile

@@ -30,7 +30,6 @@
 PROG=	atmarpd
 SRCS=	atmarpd.c atmarp_config.c atmarp_log.c atmarp_scsp.c \
 	atmarp_subr.c atmarp_timer.c
-MAN8=	atmarpd.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
 LDADD+=		-latm -lmd

usr.sbin/atm/scspd/Makefile

@@ -33,7 +33,6 @@ SRCS=	scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \
 	scsp_hfsm.c scsp_if.c scsp_input.c scsp_log.c scsp_msg.c \
 	scsp_output.c scsp_print.c scsp_socket.c scsp_subr.c \
 	scsp_timer.c
-MAN8=	scspd.8
 
 CFLAGS+=	-I. -I${.CURDIR}/../../../sys -I${.CURDIR}
 LDADD+=		-latm -lmd

usr.sbin/boot0cfg/Makefile

@@ -3,6 +3,5 @@
 MAINTAINER=	rnordier
 
 PROG=	boot0cfg
-MAN8=	boot0cfg.8
 
 .include <bsd.prog.mk>

usr.sbin/boot98cfg/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	boot98cfg
-MAN8=	boot98cfg.8
 
 .include <bsd.prog.mk>

usr.sbin/btxld/Makefile

@@ -4,7 +4,6 @@ MAINTAINER=	rnordier
 
 PROG=	btxld
 SRCS=	btxld.c elfh.c
-MAN8=	btxld.8
 
 CFLAGS+=	-Wall
 

usr.sbin/burncd/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	burncd
-MAN8=	burncd.8
 
 .include <bsd.prog.mk>

usr.sbin/cdcontrol/Makefile

@@ -1,4 +1,7 @@
+# $FreeBSD$
+
 PROG= cdcontrol
+MAN1=	${PROG}.1
 CFLAGS+= -Wall
 
 DPADD += ${LIBEDIT} ${LIBTERMCAP}

usr.sbin/chkgrp/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	chkgrp
-MAN8=	chkgrp.8
 
 .include <bsd.prog.mk>

usr.sbin/chroot/Makefile

@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	chroot
-MAN8=	chroot.8
 
 .include <bsd.prog.mk>

usr.sbin/ckdist/Makefile

@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ckdist
+MAN1=	${PROG}.1
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 

usr.sbin/config/Makefile

@@ -6,7 +6,6 @@ CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=${BDECFLAGS}
 SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
 	mkoptions.c y.tab.h
-MAN8=	config.8
 DPADD=	${LIBL}
 LDADD=	-ll
 

usr.sbin/cron/cron/Makefile

@@ -5,6 +5,5 @@ SRCS=	cron.c database.c do_command.c job.c user.c popen.c
 CFLAGS+=-DLOGIN_CAP
 DPADD=	${LIBCRON} ${LIBUTIL}
 LDADD=	${LIBCRON} -lutil
-MAN8=	cron.8
 
 .include <bsd.prog.mk>

usr.sbin/ctm/ctm_rmail/Makefile

@@ -1,5 +1,8 @@
+# $FreeBSD$
+
 PROG=           ctm_rmail
 SRCS=           ctm_rmail.c error.c
+MAN1=		${PROG}.1
 CFLAGS+=        -Wall
 MLINKS+=	ctm_rmail.1 ctm_smail.1
 MLINKS+=	ctm_rmail.1 ctm_dequeue.1

usr.sbin/dev_mkdb/Makefile

@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	dev_mkdb
-MAN8=	dev_mkdb.8
 
 .include <bsd.prog.mk>

usr.sbin/diskpart/Makefile

@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	diskpart
-MAN8=	diskpart.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_ctlinfo/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_ctlinfo
-SRCS=	dpt_ctlinfo.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_ctlinfo.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_ctls/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_ctls
-SRCS=	dpt_ctls.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_ctls.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_dm/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_dm
-SRCS=	dpt_dm.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_dm.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_led/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_led
-SRCS=	dpt_led.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_led.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_sig/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_sig
-SRCS=	dpt_sig.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_sig.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_softc/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_softc
-SRCS=	dpt_softc.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_softc.8
 
 .include <bsd.prog.mk>

usr.sbin/dpt/dpt_sysinfo/Makefile

@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PROG=	dpt_sysinfo
-SRCS=	dpt_sysinfo.c
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500
-MAN8=	dpt_sysinfo.8
 
 .include <bsd.prog.mk>

usr.sbin/edquota/Makefile

@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	edquota
-MAN8=	edquota.8
 
 .include <bsd.prog.mk>

usr.sbin/elf2exe/Makefile

@@ -1,8 +1,6 @@
 # $FreeBSD$
 
 PROG=	elf2exe
-SRCS=	elf2exe.c
-MAN8=	elf2exe.8
 CFLAGS+=	-Wall
 MANSUBDIR=/${MACHINE_ARCH}
 

usr.sbin/extattrctl/Makefile

@@ -1,8 +1,6 @@
 # $FreeBSD$
 PROG=	extattrctl
-SRCS=	extattrctl.c
 LDADD=	${LIBUTIL}
 CFLAGS+=	-g -Wall
-MAN8+=	extattrctl.8
 
 .include <bsd.prog.mk>

usr.sbin/faithd/Makefile

@@ -15,7 +15,6 @@
 
 PROG=	faithd
 SRCS=	faithd.c tcp.c ftp.c rsh.c
-MAN8=	faithd.8
 #CFLAGS+= -DFAITH4
 CFLAGS+= -Wall
 

usr.sbin/fdcontrol/Makefile

@@ -1,4 +1,5 @@
+# $FreeBSD$
+
 PROG = fdcontrol
-MAN8 = fdcontrol.8
 
 .include <bsd.prog.mk>

usr.sbin/fdformat/Makefile

@@ -1,5 +1,7 @@
-#
+# $FreeBSD$
+
 PROG=	fdformat
+MAN1=	${PROG}.1
 
 # the -I's seem to be confusing, but necessery this way
 # (so the right <unistd.h> will be found in /usr/include, and the

usr.sbin/fdwrite/Makefile

@@ -11,6 +11,7 @@
 #
 
 PROG=	fdwrite
+MAN1=	${PROG}.1
 CFLAGS+=-Wall
 
 .include <bsd.prog.mk>

usr.sbin/getextattr/Makefile

@@ -1,8 +1,6 @@
 # $FreeBSD$
 PROG=	getextattr
-SRCS=	getextattr.c
 LDADD=	${LIBUTIL}
 CFLAGS+=	-Wall
-MAN8=	getextattr.8
 
 .include <bsd.prog.mk>

usr.sbin/gifconfig/Makefile

@@ -14,7 +14,6 @@
 # $FreeBSD$
 
 PROG=	gifconfig
-MAN8=	gifconfig.8
 
 CFLAGS+=-DINET6
 

usr.sbin/i4b/isdndebug/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 PROG	 =	isdndebug
 SRCS	 =	main.c
-MAN8	 = 	isdndebug.8
 
 .include <bsd.prog.mk>

usr.sbin/i4b/isdndecode/Makefile

@@ -2,7 +2,6 @@
 PROG	 =	isdndecode
 SRCS	 =	main.c layer1.c layer2.c layer3.c \
 		layer3_subr.c facility.c pcause.c 
-MAN8	 =      isdndecode.8
 
 .include <bsd.prog.mk>
 

usr.sbin/i4b/isdnmonitor/Makefile

@@ -2,7 +2,6 @@
 
 PROG	=	isdnmonitor
 SRCS	=	main.c curses.c
-MAN8	=	isdnmonitor.8
 
 # compile debug support
 COPTS	+=	-DDEBUG

usr.sbin/i4b/isdnphone/Makefile

@@ -2,7 +2,6 @@
 
 PROG	 =	isdnphone
 SRCS	 =	main.c display.c audio.c isdn.c
-MAN8	 =	isdnphone.8
 
 DPADD	=	${LIBCURSES}
 LDADD	=	-lcurses

usr.sbin/i4b/isdntel/Makefile

@@ -4,6 +4,5 @@ PROG	 =	isdntel
 SRCS	 =	main.c display.c files.c alias.c
 DPADD	 =	${LIBNCURSES}
 LDADD	 =	-lncurses
-MAN8	 =	isdntel.8
 
 .include <bsd.prog.mk>

usr.sbin/i4b/isdntelctl/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 PROG	 =	isdntelctl
 SRCS	 =	main.c
-MAN8	 = 	isdntelctl.8
 
 .include <bsd.prog.mk>

usr.sbin/i4b/isdntest/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 PROG	 =	isdntest
 SRCS	 =	main.c
-MAN8	 =	isdntest.8
 
 install:
 	@echo isdntest is not installed automatically

usr.sbin/i4b/isdntrace/Makefile

@@ -3,7 +3,6 @@ PROG	 =	isdntrace
 SRCS	 =	q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \
 		pcause_1tr6.c pcause_q850.c unknownl3.c
 #CFLAGS	+=	-Wall -g 
-MAN8	 =      isdntrace.8
 
 .include <bsd.prog.mk>
 

usr.sbin/i4b/ispppcontrol/Makefile

@@ -1,7 +1,5 @@
 # $FreeBSD$
 
 PROG	=	ispppcontrol
-SRCS	=	ispppcontrol.c
-MAN8	=	ispppcontrol.8
 
 .include <bsd.prog.mk>

usr.sbin/ifmcstat/Makefile

@@ -2,7 +2,6 @@
 #	$FreeBSD$
 
 PROG=	ifmcstat
-MAN8=	ifmcstat.8
 
 BINGRP=	kmem
 BINMODE=2555

usr.sbin/inetd/Makefile

@@ -5,7 +5,6 @@ MAINTAINER=	dwmalone
 
 PROG=	inetd
 SRCS=	inetd.c builtins.c
-MAN8=	inetd.8
 MLINKS=	inetd.8 inetd.conf.5
 
 COPTS+=	-Wall -DLOGIN_CAP

usr.sbin/iostat/Makefile

@@ -1,11 +1,10 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 MAINTAINER=ken@FreeBSD.ORG
 
 PROG=	iostat
 CFLAGS+=-I${.CURDIR}/../../sys
-SRCS=	iostat.c
-MAN8=	iostat.8
 DPADD=	${LIBKVM} ${LIBDEVSTAT}
 LDADD=	-lkvm -ldevstat
 BINGRP=	kmem

usr.sbin/jail/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=	jail
-MAN8=	jail.8
 
 .include	<bsd.prog.mk>

usr.sbin/kernbb/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	kernbb
-MAN8=	kernbb.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 

usr.sbin/keyadmin/Makefile

@@ -1,6 +1,6 @@
 #	$ANA: Makefile,v 1.2 1996/06/13 20:11:05 wollman Exp $
+# $FreeBSD$
 
 PROG=	keyadmin
-MAN8=	keyadmin.8
 
 .include <bsd.prog.mk>

usr.sbin/keyserv/Makefile

@@ -3,8 +3,6 @@
 PROG=	keyserv
 SRCS=	keyserv.c setkey.c keyserv_uid.c crypt_svc.c crypt_server.c crypt.h
 
-MAN8=	keyserv.8
-
 CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I.
 .if $(OBJFORMAT) == elf
 CFLAGS+= -DOBJFORMAT_ELF

usr.sbin/kgmon/Makefile

@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	kgmon
-MAN8=	kgmon.8
 DPADD=	${LIBKVM}
 LDADD=	-lkvm
 #

usr.sbin/kgzip/Makefile

@@ -4,7 +4,6 @@ MAINTAINER=	rnordier
 
 PROG=	kgzip
 SRCS=	kgzip.c aouthdr.c elfhdr.c kgzcmp.c kgzld.c xio.c
-MAN8=	kgzip.8
 CFLAGS+=-pedantic \
 	-W -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
 	-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \

usr.sbin/lastlogin/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	lastlogin
-MAN8=	lastlogin.8
 CFLAGS+=-Wall
 
 .include <bsd.prog.mk>

usr.sbin/lpr/chkprintcap/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	chkprintcap
-MAN8=	chkprintcap.8
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 .PATH:	${.CURDIR}/../common_source
 DPADD=	${LIBLPR}

usr.sbin/lpr/lpc/Makefile

@@ -3,7 +3,6 @@
 
 PROG=	lpc
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-MAN8=	lpc.8
 SRCS=	lpc.c cmds.c cmdtab.c
 BINGRP=	daemon
 BINMODE=2555

usr.sbin/lpr/lpd/Makefile

@@ -3,7 +3,6 @@
 
 PROG=	lpd
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-MAN8=	lpd.8
 SRCS=	lpd.c printjob.c recvjob.c lpdchar.c modes.c
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}

usr.sbin/lpr/lpq/Makefile

@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	lpq
+MAN1=	${PROG}.1
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}

usr.sbin/lpr/lprm/Makefile

@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	lprm
+MAN1=	${PROG}.1
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
 .PATH:	${.CURDIR}/../common_source
 DPADD=	${LIBLPR}

usr.sbin/lpr/lptest/Makefile

@@ -1,5 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	lptest
+MAN1=	${PROG}.1
 
 .include <bsd.prog.mk>

usr.sbin/lpr/pac/Makefile

@@ -3,7 +3,6 @@
 
 PROG=	pac
 CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS}
-MAN8=	pac.8
 .PATH:	${.CURDIR}/../common_source
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}

usr.sbin/lptcontrol/Makefile

@@ -1,5 +1,6 @@
+# $FreeBSD$
+
 PROG=		lptcontrol
 CFLAGS+=	-Wall
-MAN8=		lptcontrol.8
 
 .include <bsd.prog.mk>

usr.sbin/mailstats/Makefile

@@ -7,8 +7,6 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/mailstats
 
 PROG=	mailstats
-SRCS=	mailstats.c
-MAN8=	mailstats.8
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL
 
 .if exists(${.OBJDIR}/../../lib/libsmutil)

usr.sbin/mailwrapper/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	mailwrapper
-MAN8=	mailwrapper.8
 
 DPADD+=	${LIBUTIL}
 LDADD+=	-lutil

usr.sbin/makemap/Makefile

@@ -7,8 +7,6 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/makemap
 
 PROG=	makemap
-SRCS=	makemap.c
-MAN8=	makemap.8
 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include
 CFLAGS+=-DNEWDB -DNOT_SENDMAIL
 

usr.sbin/memcontrol/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG=		memcontrol
-MAN8=		memcontrol.8
 
 .include <bsd.prog.mk>

usr.sbin/mixer/Makefile

@@ -1,6 +1,5 @@
 # $FreeBSD$
 
 PROG = mixer
-MAN8=	mixer.8
 
 .include <bsd.prog.mk>

usr.sbin/mld6query/Makefile

@@ -11,12 +11,12 @@
 # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
 # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE.
+#
+# $FreeBSD$
 
 PROG=	mld6query
 SRCS=	mld6.c
 
-MAN8=	mld6query.8
-
 CFLAGS+= -DINET6 -DIPSEC
 
 .include <bsd.prog.mk>

usr.sbin/mlxcontrol/Makefile

@@ -2,7 +2,6 @@
 
 PROG=		mlxcontrol
 SRCS=		command.c config.c interface.c util.c
-MAN8=		mlxcontrol.8
 CFLAGS+=	-I${.CURDIR}/../../sys
 
 .include <bsd.prog.mk>

usr.sbin/moused/Makefile

@@ -1,6 +1,6 @@
+# $FreeBSD$
+
 PROG=	moused
-SRCS=	moused.c
-MAN8=	moused.8
 
 #BINMODE=4555
 #INSTALLFLAGS=-fschg

usr.sbin/mrouted/map-mbone/Makefile

@@ -9,6 +9,5 @@ DPADD=	${LIBMROUTED}
 LDADD=	${LIBMROUTED}
 
 SRCS=	mapper.c
-MAN8=	map-mbone.8
 
 .include <bsd.prog.mk>

usr.sbin/mrouted/mrinfo/Makefile

@@ -8,7 +8,6 @@ CFLAGS+=	-I$S
 DPADD=	${LIBMROUTED}
 LDADD=	${LIBMROUTED}
 
-MAN8=	mrinfo.8
 BINMODE=4555
 
 .include <bsd.prog.mk>

usr.sbin/mrouted/mrouted/Makefile

@@ -10,7 +10,6 @@ YFLAGS=
 SRCS=	config.c cfparse.y main.c route.c vif.c prune.c callout.c rsrr.c \
 	ipip.c icmp.c vers.c igmp.c inet.c kern.c
 CLEANFILES+=	vers.c
-MAN8=	mrouted.8
 
 vers.c:	$S/VERSION
 	rm -f vers.c ; \

usr.sbin/mrouted/mtrace/Makefile

@@ -6,7 +6,6 @@ S=	${.CURDIR}/..
 .PATH:	$S
 CFLAGS+=	-I$S
 
-MAN8=	mtrace.8
 BINMODE=4555
 
 .include <bsd.prog.mk>

usr.sbin/mtest/Makefile

@@ -1,4 +1,5 @@
+# $FreeBSD$
+
 PROG=	mtest
-MAN8=	mtest.8
 
 .include <bsd.prog.mk>

usr.sbin/mtree/Makefile

@@ -5,7 +5,6 @@ PROG=	mtree
 SRCS=	compare.c crc.c create.c excludes.c misc.c mtree.c spec.c verify.c \
 	strtofflags.c
 .PATH:	${.CURDIR}/../../usr.bin/cksum ${.CURDIR}/../../lib/libc/gen
-MAN8=	mtree.8
 
 .if !defined(WORLD)
 DPADD+=	${LIBMD}

usr.sbin/ndc/Makefile

@@ -9,6 +9,5 @@ USE_LIBBIND=	true
 PROG=	ndc
 SRCS=	pathnames.h \
 	ndc.c 
-MAN8=	ndc.8
 
 .include <bsd.prog.mk>

usr.sbin/ndp/Makefile

@@ -17,7 +17,6 @@
 
 PROG=	ndp
 SRCS=	ndp.c gmt2local.c
-MAN8=	ndp.8
 
 CFLAGS+=-DINET6
 CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump

usr.sbin/newsyslog/Makefile

@@ -2,6 +2,4 @@
 
 PROG=	newsyslog
 
-MAN8=	newsyslog.8
-
 .include <bsd.prog.mk>

usr.sbin/ngctl/Makefile

@@ -4,7 +4,6 @@
 PROG=		ngctl
 SRCS=		main.c mkpeer.c config.c connect.c name.c show.c list.c \
 		msg.c debug.c shutdown.c rmhook.c status.c types.c
-MAN8=		ngctl.8
 DPADD+=		${LIBNETGRAPH}
 LDADD+=		-lnetgraph
 COPTS+=		-Wall

usr.sbin/nghook/Makefile

@@ -3,7 +3,6 @@
 
 PROG=		nghook
 SRCS=		main.c
-MAN8=		nghook.8
 DPADD=		${LIBNETGRAPH}
 LDADD=		-lnetgraph
 COPTS+=		-Wall

usr.sbin/nslookup/Makefile

@@ -8,7 +8,6 @@ USE_LIBBIND=	yes
 
 PROG=	nslookup
 SRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l
-MAN8=	nslookup.8
 
 CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\"
 CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup

usr.sbin/pccard/Makefile.inc

@@ -1,4 +1,6 @@
 # $FreeBSD$
 
-CFLAGS+= -Wall -static
+CFLAGS+=	-Wall
-BINDIR?= /usr/sbin
+NOSHARED?=	YES
+
+.include "../Makefile.inc"

usr.sbin/pccard/pccardc/Makefile

@@ -6,7 +6,6 @@
 PROG=	pccardc
 SRCS=	beep.c dumpcis.c enabler.c pccardc.c pccardmem.c power.c printcis.c \
 	rdattr.c rdmap.c rdreg.c readcis.c wrattr.c wrreg.c
-MAN8=	pccardc.8
 
 CFLAGS+=	-I${.CURDIR}/../pccardd