- Backout botched attempt to introduce MANSECT feature.

- MAN[1-9] -> MAN.
ScoobiFreeBSD · Mar 26, 2001 · afd5064 · afd5064
1 parent 86642a4
commit afd5064
Show file tree

Hide file tree

Showing 215 changed files with 199 additions and 95 deletions.
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile
@@ -56,6 +56,7 @@ DPADD+=	${LIBIPSEC}
 LDADD+=	-lipsec
 CLEANFILES+=	scriptdump y.tab.h
 
+MAN=	setkey.8
 LOCALPREFIX=	/usr/local
 
 scriptdump: scriptdump.pl

diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	IPXrouted
+MAN=	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}

diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc
@@ -2,4 +2,3 @@
 # $FreeBSD$
 
 BINDIR?=	/usr/sbin
-MANSECT?=	8
diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ac
+MAN=	ac.8
 
 # If "CONSOLE_TTY" is not defined, this program is compatible with the
 # traditional implementation (using SunOS 4.x as the sample traditional

diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	accton
+MAN=	accton.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	acpiconf
+MAN=	acpiconf.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile
@@ -3,6 +3,7 @@
 
 PROG=	acpidump
 SRCS=	acpi.c acpi_user.c asl_dump.c aml_dump.c acpidump.c
+MAN=	acpidump.8
 #DEBUG_FLAGS= -g
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/acpi/amldb/Makefile b/usr.sbin/acpi/amldb/Makefile
@@ -4,6 +4,7 @@
 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
+MAN=	amldb.8
 #DEBUG_FLAGS= -g
 CFLAGS+= -I${.CURDIR}
 

diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile
@@ -3,7 +3,7 @@
 MAINTAINER= wosch
 
 SCRIPTS= adduser.perl rmuser.perl
-MAN8=	 adduser.8    rmuser.8
+MAN=	 adduser.8    rmuser.8
 
 beforeinstall:
 .for script in ${SCRIPTS}

diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile
@@ -9,6 +9,7 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/amd
 
 PROG=		amd
+MAN=		amd.8
 
 SRCS=		conf_parse.y conf_tok.l
 SRCS+=		am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c

diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile
@@ -9,6 +9,7 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/amq
 
 PROG=		amq
+MAN=		amq.8
 
 SRCS=		amq.c amq_clnt.c amq_xdr.c
 

diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile
@@ -10,6 +10,7 @@
 		${.CURDIR}/../../../contrib/amd/conf/checkmount
 
 PROG=		fixmount
+MAN=		fixmount.8
 
 SRCS=		fixmount.c 
 

diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile
@@ -9,6 +9,7 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/fsinfo
 
 PROG=		fsinfo
+MAN=		fsinfo.8
 
 SRCS=		fsi_gram.y fsi_lex.l
 SRCS+=		fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c 

diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile
@@ -9,6 +9,7 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/hlfsd
 
 PROG=		hlfsd
+MAN=		hlfsd.8
 
 SRCS=		hlfsd.c homedir.c nfs_prot_svc.c stubs.c
 

diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile
@@ -9,5 +9,6 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/mk-amd-map
 
 PROG=		mk-amd-map
+MAN=		mk-amd-map.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/pawd/Makefile b/usr.sbin/amd/pawd/Makefile
@@ -11,8 +11,6 @@
 BINDIR=		/usr/bin
 
 PROG=		pawd
-MAN1=		pawd.1
-
 SRCS=		pawd.c amq_clnt.c amq_xdr.c
 
 CFLAGS+=	-I${.CURDIR}/../../../contrib/amd/amq

diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile
@@ -2,6 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../contrib/amd/scripts
 
-MAN5=		amd.conf.5
+MAN=		amd.conf.5
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile
@@ -9,6 +9,7 @@
 .PATH:		${.CURDIR}/../../../contrib/amd/wire-test
 
 PROG=		wire-test
+MAN=		wire-test.8
 
 DPADD+=		${LIBAMU}
 LDADD+=		${LIBAMU}

diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	ancontrol
+MAN=	ancontrol.8
 
 CFLAGS+= 	-I${.CURDIR}/../../sys -DANCACHE -Wall
 

diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
@@ -2,6 +2,7 @@
 
 PROG=		apm
 LINKS=		${BINDIR}/apm ${BINDIR}/zzz
+MAN=		apm.8
 MLINKS=		apm.8 apmconf.8 apm.8 zzz.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
@@ -6,6 +6,8 @@ SRCS=	apmd.c apmdlex.l apmdparse.y y.tab.h
 DPADD=	${LIBL}
 LDADD=	-ll
 
+MAN=	apmd.8
+
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR} -Wall #-DYY_STACK_USED
 # for debug:

diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile
@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/18/94
+# $FreeBSD$
 
 PROG=	arp
-MAN8=	arp.8
-MAN4=	arp.4
+MAN=	arp.4 arp.8
 COPTS+=	-Wall
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile
@@ -30,6 +30,7 @@
 PROG=	atmarpd
 SRCS=	atmarpd.c atmarp_config.c atmarp_log.c atmarp_scsp.c \
 	atmarp_subr.c atmarp_timer.c
+MAN=	atmarpd.8
 
 CFLAGS+=	-I${.CURDIR}/../../../sys
 LDADD+=		-latm -lmd

diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile
@@ -33,6 +33,7 @@ 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
+MAN=	scspd.8
 
 CFLAGS+=	-I. -I${.CURDIR}/../../../sys -I${.CURDIR}
 LDADD+=		-latm -lmd

diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile
@@ -3,5 +3,6 @@
 MAINTAINER=	rnordier
 
 PROG=	boot0cfg
+MAN=	boot0cfg.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	boot98cfg
+MAN=	boot98cfg.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile
@@ -4,8 +4,7 @@
 PROG=	bootparamd
 SRCS=	bootparamd.c main.c ${GENSRCS}
 GENSRCS=bootparam_prot.h bootparam_prot_svc.c bootparam_prot_xdr.c
-MAN5=	bootparams.5
-MAN8=	bootparamd.8
+MAN=	bootparams.5 bootparamd.8
 CFLAGS+= -DTFTP_DIR=\"/tftpboot\" -I.
 CLEANFILES= ${GENSRCS}
 

diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile
@@ -4,6 +4,7 @@ MAINTAINER=	rnordier
 
 PROG=	btxld
 SRCS=	btxld.c elfh.c
+MAN=	btxld.8
 
 CFLAGS+=	-Wall
 

diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	burncd
+MAN=	burncd.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG= cdcontrol
-MAN1=	${PROG}.1
 CFLAGS+= -Wall
 
 DPADD += ${LIBEDIT} ${LIBTERMCAP}

diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 PROG=	chkgrp
+MAN=	chkgrp.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile
@@ -3,8 +3,7 @@
 
 PROG=	chown
 CFLAGS+=-DSUPPORT_DOT
-MAN1=	chgrp.1
-MAN8=	chown.8
+MAN=	chgrp.1 chown.8
 LINKS=	${BINDIR}/chown /usr/bin/chgrp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	chroot
+MAN=	chroot.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PROG=	ckdist
-MAN1=	${PROG}.1
 
 .PATH: ${.CURDIR}/../../usr.bin/cksum
 

diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
@@ -6,6 +6,7 @@ CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=${BDECFLAGS}
 SRCS=	config.y main.c lang.l mkmakefile.c mkheaders.c \
 	mkoptions.c y.tab.h
+MAN=	config.8
 DPADD=	${LIBL}
 LDADD=	-ll
 

diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile
@@ -5,5 +5,6 @@ SRCS=	cron.c database.c do_command.c job.c user.c popen.c
 CFLAGS+=-DLOGIN_CAP
 DPADD=	${LIBCRON} ${LIBUTIL}
 LDADD=	${LIBCRON} -lutil
+MAN=	cron.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile
@@ -4,8 +4,7 @@ PROG=	crontab
 CFLAGS+=-I${.CURDIR}/../cron
 DPADD=	${LIBCRON} ${LIBUTIL}
 LDADD=	${LIBCRON} -lutil
-MAN1=	crontab.1
-MAN5=	crontab.5
+MAN=	crontab.1 crontab.5
 
 BINDIR=	/usr/bin
 BINOWN=	root

diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile
@@ -15,8 +15,7 @@ SRCS=   	ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \
 		ctm_passb.c ctm_syntax.c ctm_ed.c
 LDADD+=		-lmd
 DPADD+=		${LIBMD}
-MAN1=		ctm.1
-MAN5=		ctm.5
+MAN=		ctm.1 ctm.5
 CFLAGS+=	-Wall
 
 .if exists(${.CURDIR}/../../Makefile.inc)

diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile
@@ -2,7 +2,6 @@
 
 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

diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	dev_mkdb
+MAN=	dev_mkdb.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/diskpart/Makefile b/usr.sbin/diskpart/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	diskpart
+MAN=	diskpart.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_ctlinfo
+MAN=	dpt_ctlinfo.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_ctls
+MAN=	dpt_ctls.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_dm
+MAN=	dpt_dm.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_led
+MAN=	dpt_led.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_sig
+MAN=	dpt_sig.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_softc
+MAN=	dpt_softc.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PROG=	dpt_sysinfo
+MAN=	dpt_sysinfo.8
 
 CFLAGS+=-Wall -I${.CURDIR}/../../../sys
 BINMODE=500

diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile
@@ -2,5 +2,6 @@
 # $FreeBSD$
 
 PROG=	edquota
+MAN=	edquota.8
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PROG=	elf2exe
+MAN=	elf2exe.8
 CFLAGS+=	-Wall
 MANSUBDIR=/${MACHINE_ARCH}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@
		# $FreeBSD$

		BINDIR?= /usr/sbin
		MANSECT?= 8