diff options
Diffstat (limited to 'usr.sbin')
174 files changed, 81 insertions, 215 deletions
diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile index 8d5c3557ce68..6df3e5ca43c8 100644 --- a/usr.sbin/IPXrouted/Makefile +++ b/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} diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc index fd9286474425..7faec2b08340 100644 --- a/usr.sbin/Makefile.inc +++ b/usr.sbin/Makefile.inc @@ -1,3 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ BINDIR?= /usr/sbin +MANSECT?= 8 diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile index 612b4c29932f..d56a8d734bf8 100644 --- a/usr.sbin/ac/Makefile +++ b/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 diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile index 8e3f3369c380..92ed49d4e73d 100644 --- a/usr.sbin/accton/Makefile +++ b/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> diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc index 206bade99bee..8d94ee33dcfe 100644 --- a/usr.sbin/acpi/Makefile.inc +++ b/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 -BINDIR?= /usr/sbin +NOSHARED?= YES +CFLAGS+= -Wall -I${.CURDIR}/../../../sys + +.include "../Makefile.inc" diff --git a/usr.sbin/acpi/acpiconf/Makefile b/usr.sbin/acpi/acpiconf/Makefile index 26e189e85054..1f8c02f3cb7e 100644 --- a/usr.sbin/acpi/acpiconf/Makefile +++ b/usr.sbin/acpi/acpiconf/Makefile @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= acpiconf -MAN8= acpiconf.8 .include <bsd.prog.mk> diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile index c1355295fd56..73a0e7370c6c 100644 --- a/usr.sbin/acpi/acpidump/Makefile +++ b/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> diff --git a/usr.sbin/acpi/amldb/Makefile b/usr.sbin/acpi/amldb/Makefile index e518eb87672a..e528e44c6225 100644 --- a/usr.sbin/acpi/amldb/Makefile +++ b/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} diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index 164179f7bcdb..a3525e055426 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/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 diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile index 26bd507677d1..87948833b7dd 100644 --- a/usr.sbin/amd/amq/Makefile +++ b/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 diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile index 508064eefb5e..9e7017d4135f 100644 --- a/usr.sbin/amd/fixmount/Makefile +++ b/usr.sbin/amd/fixmount/Makefile @@ -10,7 +10,6 @@ ${.CURDIR}/../../../contrib/amd/conf/checkmount PROG= fixmount -MAN8= fixmount.8 SRCS= fixmount.c diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index 36948404df38..e4d936c8865e 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/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 diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile index 8c65de9e22e9..48fa6f8bbcce 100644 --- a/usr.sbin/amd/hlfsd/Makefile +++ b/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 diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile index 2978087d4133..c50e2979c425 100644 --- a/usr.sbin/amd/mk-amd-map/Makefile +++ b/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> diff --git a/usr.sbin/amd/wire-test/Makefile b/usr.sbin/amd/wire-test/Makefile index f6d68c352f2d..b9d064b9a325 100644 --- a/usr.sbin/amd/wire-test/Makefile +++ b/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} diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile index e8e45ccc2cea..9c2774cb2629 100644 --- a/usr.sbin/ancontrol/Makefile +++ b/usr.sbin/ancontrol/Makefile @@ -1,9 +1,6 @@ # $FreeBSD$ PROG= ancontrol -SRCS= ancontrol.c - -MAN8= ancontrol.8 CFLAGS+= -I${.CURDIR}/../../sys -DANCACHE -Wall diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index 64492474dfbd..14d76e473381 100644 --- a/usr.sbin/apm/Makefile +++ b/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> diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index 1d27dc0afa3f..fad1ddf48131 100644 --- a/usr.sbin/apmd/Makefile +++ b/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: diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc index 2a0f3f62268d..dece1093d7b4 100644 --- a/usr.sbin/atm/Makefile.inc +++ b/usr.sbin/atm/Makefile.inc @@ -27,4 +27,4 @@ # # -BINDIR?= /usr/sbin +.include "../Makefile.inc" diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile index ebe4056a27e4..1f96f75c6dd8 100644 --- a/usr.sbin/atm/atmarpd/Makefile +++ b/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 diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile index 3891c50d701c..1fde8cf4b883 100644 --- a/usr.sbin/atm/scspd/Makefile +++ b/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 diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile index 92368f80465c..af1302b33c79 100644 --- a/usr.sbin/boot0cfg/Makefile +++ b/usr.sbin/boot0cfg/Makefile @@ -3,6 +3,5 @@ MAINTAINER= rnordier PROG= boot0cfg -MAN8= boot0cfg.8 .include <bsd.prog.mk> diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile index 8d9658028249..db5ea4ff3ed8 100644 --- a/usr.sbin/boot98cfg/Makefile +++ b/usr.sbin/boot98cfg/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= boot98cfg -MAN8= boot98cfg.8 .include <bsd.prog.mk> diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile index e1a54c07dae8..621bbaf71d9b 100644 --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -4,7 +4,6 @@ MAINTAINER= rnordier PROG= btxld SRCS= btxld.c elfh.c -MAN8= btxld.8 CFLAGS+= -Wall diff --git a/usr.sbin/burncd/Makefile b/usr.sbin/burncd/Makefile index a4228c749975..2749bc85e665 100644 --- a/usr.sbin/burncd/Makefile +++ b/usr.sbin/burncd/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= burncd -MAN8= burncd.8 .include <bsd.prog.mk> diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index 1c5be4efb9a5..4560eacac0f4 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -1,4 +1,7 @@ +# $FreeBSD$ + PROG= cdcontrol +MAN1= ${PROG}.1 CFLAGS+= -Wall DPADD += ${LIBEDIT} ${LIBTERMCAP} diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile index 9171b53df1e8..42def0ced81b 100644 --- a/usr.sbin/chkgrp/Makefile +++ b/usr.sbin/chkgrp/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= chkgrp -MAN8= chkgrp.8 .include <bsd.prog.mk> diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile index 69fe8b8528c3..771e4c07cc14 100644 --- a/usr.sbin/chroot/Makefile +++ b/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> diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile index 74c4c5402f74..74ee6873b291 100644 --- a/usr.sbin/ckdist/Makefile +++ b/usr.sbin/ckdist/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= ckdist +MAN1= ${PROG}.1 .PATH: ${.CURDIR}/../../usr.bin/cksum diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 7ec44fe0d6f9..df2c7428ad73 100644 --- a/usr.sbin/config/Makefile +++ b/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 diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index 318e781d1aa6..a9b7071a379d 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/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> diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile index f90436814d15..499e2fe8ca10 100644 --- a/usr.sbin/ctm/ctm_rmail/Makefile +++ b/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 diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile index 8737b50bbfdf..933f9e195dde 100644 --- a/usr.sbin/dev_mkdb/Makefile +++ b/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> diff --git a/usr.sbin/diskpart/Makefile b/usr.sbin/diskpart/Makefile index bf623cb54e07..75b9ddc8e710 100644 --- a/usr.sbin/diskpart/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile index ac71bd1305c2..59b42af5025c 100644 --- a/usr.sbin/dpt/dpt_ctlinfo/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile index e0b0eda2b4ce..03d3f26a7cb8 100644 --- a/usr.sbin/dpt/dpt_ctls/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile index d67e5567972a..a4dbe5f18a12 100644 --- a/usr.sbin/dpt/dpt_dm/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile index e449aa5ae9ef..d709f25684ce 100644 --- a/usr.sbin/dpt/dpt_led/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile index c25c11a18848..6d29c5678ab9 100644 --- a/usr.sbin/dpt/dpt_sig/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile index 45c24ddd601d..a21215f17cb4 100644 --- a/usr.sbin/dpt/dpt_softc/Makefile +++ b/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> diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile index d9a61f3c697d..7c8e431508c8 100644 --- a/usr.sbin/dpt/dpt_sysinfo/Makefile +++ b/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> diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile index 1eb5de96377c..bf31c73fec00 100644 --- a/usr.sbin/edquota/Makefile +++ b/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> diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile index aaf16c2ffcda..1f983aabcfbb 100644 --- a/usr.sbin/elf2exe/Makefile +++ b/usr.sbin/elf2exe/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= elf2exe -SRCS= elf2exe.c -MAN8= elf2exe.8 CFLAGS+= -Wall MANSUBDIR=/${MACHINE_ARCH} diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile index b7b90dfb6882..16d227d95103 100644 --- a/usr.sbin/extattrctl/Makefile +++ b/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> diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile index bc84552d5141..36f296c3c4be 100644 --- a/usr.sbin/faithd/Makefile +++ b/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 diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile index 068cadeb782a..d9b80395e93d 100644 --- a/usr.sbin/fdcontrol/Makefile +++ b/usr.sbin/fdcontrol/Makefile @@ -1,4 +1,5 @@ +# $FreeBSD$ + PROG = fdcontrol -MAN8 = fdcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile index e489ebc7465c..e3d629a15b05 100644 --- a/usr.sbin/fdformat/Makefile +++ b/usr.sbin/fdformat/Makefile @@ -1,5 +1,7 @@ -# -PROG = fdformat +# $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 diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile index 8eac7b0ebc00..74392d1a8c35 100644 --- a/usr.sbin/fdwrite/Makefile +++ b/usr.sbin/fdwrite/Makefile @@ -10,7 +10,8 @@ # # -PROG = fdwrite -CFLAGS+= -Wall +PROG= fdwrite +MAN1= ${PROG}.1 +CFLAGS+=-Wall .include <bsd.prog.mk> diff --git a/usr.sbin/getextattr/Makefile b/usr.sbin/getextattr/Makefile index 45560a9c2581..1a0b9aebec5e 100644 --- a/usr.sbin/getextattr/Makefile +++ b/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> diff --git a/usr.sbin/gifconfig/Makefile b/usr.sbin/gifconfig/Makefile index b562390e8d90..a48bacf19c60 100644 --- a/usr.sbin/gifconfig/Makefile +++ b/usr.sbin/gifconfig/Makefile @@ -14,7 +14,6 @@ # $FreeBSD$ PROG= gifconfig -MAN8= gifconfig.8 CFLAGS+=-DINET6 diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile index b22566d2f091..2cc230fe8e62 100644 --- a/usr.sbin/i4b/isdndebug/Makefile +++ b/usr.sbin/i4b/isdndebug/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG = isdndebug SRCS = main.c -MAN8 = isdndebug.8 .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile index c6e4671a606d..5b86b709bb4d 100644 --- a/usr.sbin/i4b/isdndecode/Makefile +++ b/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> diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile index bad57590e796..6c2abd7877e1 100644 --- a/usr.sbin/i4b/isdnmonitor/Makefile +++ b/usr.sbin/i4b/isdnmonitor/Makefile @@ -2,7 +2,6 @@ PROG = isdnmonitor SRCS = main.c curses.c -MAN8 = isdnmonitor.8 # compile debug support COPTS += -DDEBUG diff --git a/usr.sbin/i4b/isdnphone/Makefile b/usr.sbin/i4b/isdnphone/Makefile index 42d4490983c5..47fe1378b840 100644 --- a/usr.sbin/i4b/isdnphone/Makefile +++ b/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 diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile index a7a68a8a3b97..dd0b1559ffad 100644 --- a/usr.sbin/i4b/isdntel/Makefile +++ b/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> diff --git a/usr.sbin/i4b/isdntelctl/Makefile b/usr.sbin/i4b/isdntelctl/Makefile index c8971e2b3e2f..989418c4aec5 100644 --- a/usr.sbin/i4b/isdntelctl/Makefile +++ b/usr.sbin/i4b/isdntelctl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG = isdntelctl SRCS = main.c -MAN8 = isdntelctl.8 .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile index 7444055116dc..119167fc9295 100644 --- a/usr.sbin/i4b/isdntest/Makefile +++ b/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 diff --git a/usr.sbin/i4b/isdntrace/Makefile b/usr.sbin/i4b/isdntrace/Makefile index 3f68001eab45..c0be08003434 100644 --- a/usr.sbin/i4b/isdntrace/Makefile +++ b/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> diff --git a/usr.sbin/i4b/ispppcontrol/Makefile b/usr.sbin/i4b/ispppcontrol/Makefile index 89cd637c6014..a311294f5247 100644 --- a/usr.sbin/i4b/ispppcontrol/Makefile +++ b/usr.sbin/i4b/ispppcontrol/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ PROG = ispppcontrol -SRCS = ispppcontrol.c -MAN8 = ispppcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile index 1cebcca5ac30..35af6bd0fb69 100644 --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= ifmcstat -MAN8= ifmcstat.8 BINGRP= kmem BINMODE=2555 diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index a92e053fefe0..13be67f4ccdc 100644 --- a/usr.sbin/inetd/Makefile +++ b/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 diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile index 5da17528bea2..f6e277e6aee1 100644 --- a/usr.sbin/iostat/Makefile +++ b/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 diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index 4a1d6a9c33a8..c1aba992b4ca 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= jail -MAN8= jail.8 .include <bsd.prog.mk> diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile index c7d566304a97..62358a8215b3 100644 --- a/usr.sbin/kernbb/Makefile +++ b/usr.sbin/kernbb/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= kernbb -MAN8= kernbb.8 DPADD= ${LIBKVM} LDADD= -lkvm diff --git a/usr.sbin/keyadmin/Makefile b/usr.sbin/keyadmin/Makefile index d0a422ec43b5..556cb6c1c82c 100644 --- a/usr.sbin/keyadmin/Makefile +++ b/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> diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index 9493e04ec3f3..ea8d9f48a895 100644 --- a/usr.sbin/keyserv/Makefile +++ b/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 diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile index 20fcf68a1540..67af4e972bbb 100644 --- a/usr.sbin/kgmon/Makefile +++ b/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 # diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile index 85c3486023f0..46f7ce3ac1b4 100644 --- a/usr.sbin/kgzip/Makefile +++ b/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 \ diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile index 289e46e46390..8681e7d57555 100644 --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= lastlogin -MAN8= lastlogin.8 CFLAGS+=-Wall .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index e671ec98a94d..f2a7e3fef864 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/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} diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 48fd38b2586c..b8b417e1623d 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/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 diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index e107e97f8a87..b2e5c7d61fd0 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/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} diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 24afb7ab101a..695a1bdfdb97 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/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} diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index abeac25b290e..b8fae07d6720 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/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} diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile index fe13560106b2..723580eba1c0 100644 --- a/usr.sbin/lpr/lptest/Makefile +++ b/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> diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index 2b8d6ed22a06..a8f0888d2e7d 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/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} diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile index 76c40e75b0e8..8069d07099e6 100644 --- a/usr.sbin/lptcontrol/Makefile +++ b/usr.sbin/lptcontrol/Makefile @@ -1,5 +1,6 @@ +# $FreeBSD$ + PROG= lptcontrol CFLAGS+= -Wall -MAN8= lptcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index dc90a0994b4f..d86f6471574e 100644 --- a/usr.sbin/mailstats/Makefile +++ b/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) diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 02a189936b2a..63723e4fa668 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= mailwrapper -MAN8= mailwrapper.8 DPADD+= ${LIBUTIL} LDADD+= -lutil diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 7c896ac129f5..1b587bf576b7 100644 --- a/usr.sbin/makemap/Makefile +++ b/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 diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile index 046bb670eece..d90d63bf5c0d 100644 --- a/usr.sbin/memcontrol/Makefile +++ b/usr.sbin/memcontrol/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= memcontrol -MAN8= memcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile index 78f5844209e6..8eb63ae03ba8 100644 --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG = mixer -MAN8= mixer.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile index c1cdd8fee477..1de76b220382 100644 --- a/usr.sbin/mld6query/Makefile +++ b/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> diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile index 2c79bfb8a437..9dfe890dd5e4 100644 --- a/usr.sbin/mlxcontrol/Makefile +++ b/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> diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile index 1c45d5ebc0c4..357729e08593 100644 --- a/usr.sbin/moused/Makefile +++ b/usr.sbin/moused/Makefile @@ -1,6 +1,6 @@ +# $FreeBSD$ + PROG= moused -SRCS= moused.c -MAN8= moused.8 #BINMODE=4555 #INSTALLFLAGS=-fschg diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index afe6d24ef377..22abcb43e878 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/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> diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index a529cf9b64ee..caf106b3bfe0 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/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> diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile index a7a0fcbe5512..efcc1d64624e 100644 --- a/usr.sbin/mrouted/mrouted/Makefile +++ b/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 ; \ diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 6fa62606f2e4..ee9c203b07e5 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/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> diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile index 75e2cf62b9bc..8ab0477092bd 100644 --- a/usr.sbin/mtest/Makefile +++ b/usr.sbin/mtest/Makefile @@ -1,4 +1,5 @@ +# $FreeBSD$ + PROG= mtest -MAN8= mtest.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile index 646cb413ac89..15f7856362e2 100644 --- a/usr.sbin/mtree/Makefile +++ b/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} diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile index 033803c4e952..6db054f29897 100644 --- a/usr.sbin/ndc/Makefile +++ b/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> diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile index b0ba34841fc8..3f4cb460ba98 100644 --- a/usr.sbin/ndp/Makefile +++ b/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 diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index a7cf621c9811..c230c85dcd07 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -2,6 +2,4 @@ PROG= newsyslog -MAN8= newsyslog.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index d8dee7c6a9c1..78a42dbc7c54 100644 --- a/usr.sbin/ngctl/Makefile +++ b/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 diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile index 18b07d29a671..552a2cd9d283 100644 --- a/usr.sbin/nghook/Makefile +++ b/usr.sbin/nghook/Makefile @@ -3,7 +3,6 @@ PROG= nghook SRCS= main.c -MAN8= nghook.8 DPADD= ${LIBNETGRAPH} LDADD= -lnetgraph COPTS+= -Wall diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile index c9b31f2cb31d..acfca5f71eb9 100644 --- a/usr.sbin/nslookup/Makefile +++ b/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 diff --git a/usr.sbin/pccard/Makefile.inc b/usr.sbin/pccard/Makefile.inc index 6503c10dcf9a..a830ef2d3311 100644 --- a/usr.sbin/pccard/Makefile.inc +++ b/usr.sbin/pccard/Makefile.inc @@ -1,4 +1,6 @@ # $FreeBSD$ -CFLAGS+= -Wall -static -BINDIR?= /usr/sbin +CFLAGS+= -Wall +NOSHARED?= YES + +.include "../Makefile.inc" diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile index 679b47d1a00d..8c3e4c577b1c 100644 --- a/usr.sbin/pccard/pccardc/Makefile +++ b/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 diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile index b60866806a4b..eb21d047d106 100644 --- a/usr.sbin/pciconf/Makefile +++ b/usr.sbin/pciconf/Makefile @@ -1,7 +1,7 @@ # $ANA: Makefile,v 1.1.1.1 1996/09/25 21:12:57 wollman Exp $ +# $FreeBSD$ PROG= pciconf -MAN8= pciconf.8 CFLAGS+= -I${.CURDIR}/../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Makefile.inc b/usr.sbin/pcvt/Makefile.inc index 20f7cc0632e9..7899d9c307d2 100644 --- a/usr.sbin/pcvt/Makefile.inc +++ b/usr.sbin/pcvt/Makefile.inc @@ -2,8 +2,4 @@ FONTDIR = /usr/share/misc/pcvtfonts -MAN3EXT= 3 -MAN5EXT= 5 -MAN8EXT= 8 - .include "../Makefile.inc" diff --git a/usr.sbin/pcvt/cursor/Makefile b/usr.sbin/pcvt/cursor/Makefile index fb068782e417..56cdbb2e336f 100644 --- a/usr.sbin/pcvt/cursor/Makefile +++ b/usr.sbin/pcvt/cursor/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= cursor +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/fontedit/Makefile b/usr.sbin/pcvt/fontedit/Makefile index 9cbe4e5a5b56..db978b04b713 100644 --- a/usr.sbin/pcvt/fontedit/Makefile +++ b/usr.sbin/pcvt/fontedit/Makefile @@ -1,3 +1,6 @@ +# $FreeBSD$ + PROG= fontedit +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/ispcvt/Makefile b/usr.sbin/pcvt/ispcvt/Makefile index adec4f1836dc..107e99b90df3 100644 --- a/usr.sbin/pcvt/ispcvt/Makefile +++ b/usr.sbin/pcvt/ispcvt/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= ispcvt -MAN8= ispcvt.${MAN8EXT} .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index dbc94f9b03ac..1c21884919a4 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= kcon +MAN1= ${PROG}.1 DEVICE= /dev/ttyv0 CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile index fa7da94e5de2..6a294e094b4e 100644 --- a/usr.sbin/pcvt/keycap/Makefile +++ b/usr.sbin/pcvt/keycap/Makefile @@ -6,12 +6,12 @@ CAPPATH = $(CAPDIR)/keycap.pcvt KEYCAPSRC= keycap.src CFLAGS += -DKEYCAP_PATH=\"$(CAPPATH)\" SRCS = keycap.c -MAN3 = keycap.${MAN3EXT} -MLINKS+= keycap.${MAN3EXT} kgetent.${MAN3EXT} \ - keycap.${MAN3EXT} kgetnum.${MAN3EXT} \ - keycap.${MAN3EXT} kgetflag.${MAN3EXT} \ - keycap.${MAN3EXT} kgetstr.${MAN3EXT} -MAN5 = man5/keycap.${MAN5EXT} +MAN3 = keycap.3 +MLINKS+= keycap.3 kgetent.3 \ + keycap.3 kgetnum.3 \ + keycap.3 kgetflag.3 \ + keycap.3 kgetstr.3 +MAN5 = man5/keycap.5 #CLEANFILES+= keycap.0 man5/keycap.0 beforeinstall: diff --git a/usr.sbin/pcvt/loadfont/Makefile b/usr.sbin/pcvt/loadfont/Makefile index 50646a7a7f0c..f1709b5cef97 100644 --- a/usr.sbin/pcvt/loadfont/Makefile +++ b/usr.sbin/pcvt/loadfont/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= loadfont +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/scon/Makefile b/usr.sbin/pcvt/scon/Makefile index dc7d02a06598..8c096e53b3c4 100644 --- a/usr.sbin/pcvt/scon/Makefile +++ b/usr.sbin/pcvt/scon/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= scon +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/userkeys/Makefile b/usr.sbin/pcvt/userkeys/Makefile index 66fe02217239..ed42145fa9a5 100644 --- a/usr.sbin/pcvt/userkeys/Makefile +++ b/usr.sbin/pcvt/userkeys/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= vt220keys +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile index 431f6152db7e..99200a18f823 100644 --- a/usr.sbin/pcvt/vgaio/Makefile +++ b/usr.sbin/pcvt/vgaio/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= vgaio -MAN8= vgaio.${MAN8EXT} SRCS= vgaio.y lex.l y.tab.h YACC= yacc diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile index 440962e60eed..5c892243f2a8 100644 --- a/usr.sbin/pcvt/vttest/Makefile +++ b/usr.sbin/pcvt/vttest/Makefile @@ -3,5 +3,6 @@ PROG= vttest CFLAGS+= -traditional -DUSEMYSTTY SRCS= main.c esc.c +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/pim6sd/mtrace6/Makefile b/usr.sbin/pim6sd/mtrace6/Makefile index d59e76fa94af..f4fd32e2cacb 100644 --- a/usr.sbin/pim6sd/mtrace6/Makefile +++ b/usr.sbin/pim6sd/mtrace6/Makefile @@ -80,6 +80,4 @@ PROG= mtrace6 CFLAGS+=-Wall CFLAGS+= -I$(.CURDIR)/.. -DHAVE_GETIFADDRS -MAN8= mtrace6.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index ac13ed56e771..d157361e80cd 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -6,5 +6,7 @@ LIBINSTALL= ${.OBJDIR}/../lib/libinstall.a LIBINSTALL= ${.CURDIR}/../lib/libinstall.a .endif +MANSECT?= 1 + # Inherit BINDIR from one level up. .include "../Makefile.inc" diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile index ca49b4bbc5a0..77f1e84ad8ba 100644 --- a/usr.sbin/pnpinfo/Makefile +++ b/usr.sbin/pnpinfo/Makefile @@ -4,7 +4,6 @@ PROG= pnpinfo SRCS= pnpinfo.c CFLAGS+=-I${.CURDIR}/../../sys -MAN8= pnpinfo.8 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index fe89221c21dc..140a6a2f00cc 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -17,7 +17,6 @@ BINMODE=4554 BINOWN= root .endif BINGRP= network -MAN8= ppp.8 .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 45495d675f78..224799dd60a3 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ PROG= pppctl -SRCS= pppctl.c CFLAGS+=-Wall LDADD+= -lc_r -ledit -ltermcap DPADD+= ${LIBC_R} ${LIBEDIT} ${LIBTERMCAP} -MAN8= pppctl.8 .include <bsd.prog.mk> diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index 8faf198a92c5..ff1047528aea 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -5,7 +5,6 @@ CFLAGS+= -DHAVE_PATHS_H PROG= pppd SRCS= main.c magic.c fsm.c lcp.c ipcp.c ipxcp.c upap.c chap.c ccp.c \ demand.c auth.c options.c sys-bsd.c -MAN8= pppd.8 BINMODE=4555 # as per handbook policies section diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile index adf70a339520..0fdd2844af38 100644 --- a/usr.sbin/pppstats/Makefile +++ b/usr.sbin/pppstats/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= pppstats -SRCS= pppstats.c -MAN8= pppstats.8 #as per policies in handbook MAINTAINER= peter@freebsd.org diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 0d4086c9dee0..b282b7bf8b91 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -7,8 +7,6 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases PROG= praliases -SRCS= praliases.c -MAN8= praliases.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include CFLAGS+=-DNEWDB -DNOT_SENDMAIL diff --git a/usr.sbin/prefix/Makefile b/usr.sbin/prefix/Makefile index 323d6d3e1478..574b210bb2c5 100644 --- a/usr.sbin/prefix/Makefile +++ b/usr.sbin/prefix/Makefile @@ -3,9 +3,6 @@ # $FreeBSD$ PROG= prefix -SRCS= prefix.c - -MAN8= prefix.8 CFLAGS+=-DINET6 diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile index 09e70cac7ba3..c8ec4e7aa8b6 100644 --- a/usr.sbin/procctl/Makefile +++ b/usr.sbin/procctl/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= procctl -MAN8= procctl.8 .include <bsd.prog.mk> diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index 5954d13c0224..9b6ed4f43da3 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= pstat CFLAGS+=-I${.CURDIR}/../../sys @@ -6,7 +7,6 @@ BINGRP= kmem BINMODE=2555 DPADD= ${LIBKVM} LDADD= -lkvm -MAN8= pstat.8 LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MLINKS= pstat.8 swapinfo.8 diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index 057ac6b37683..b1b8792e3bd6 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -6,6 +6,5 @@ CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h PROG= pwd_mkdb SRCS= pw_scan.c pwd_mkdb.c -MAN8= pwd_mkdb.8 .include <bsd.prog.mk> diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index 6754d6a66af3..248cd63a660d 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,6 +1,5 @@ # $FreeBSD$ PROG= quot -MAN8= quot.8 .include <bsd.prog.mk> diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile index be3001e40350..5dd3077b7002 100644 --- a/usr.sbin/quotaon/Makefile +++ b/usr.sbin/quotaon/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= quotaon -MAN8= quotaon.8 MLINKS= quotaon.8 quotaoff.8 LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile index f5825a24f409..05c7419407eb 100644 --- a/usr.sbin/rarpd/Makefile +++ b/usr.sbin/rarpd/Makefile @@ -2,8 +2,6 @@ # $FreeBSD$ PROG= rarpd -MAN8= rarpd.8 -SRCS= rarpd.c CFLAGS+= -DTFTP_DIR=\"/tftpboot\" diff --git a/usr.sbin/raycontrol/Makefile b/usr.sbin/raycontrol/Makefile index 8fd1eef798ca..253d4502dd1c 100644 --- a/usr.sbin/raycontrol/Makefile +++ b/usr.sbin/raycontrol/Makefile @@ -1,8 +1,5 @@ # $FreeBSD$ PROG= raycontrol -SRCS= raycontrol.c - -MAN8= raycontrol.8 CFLAGS+=-I${.CURDIR}/../../sys diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile index eea735191d78..fb5eb7e3a721 100644 --- a/usr.sbin/repquota/Makefile +++ b/usr.sbin/repquota/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= repquota -MAN8= repquota.8 .include <bsd.prog.mk> diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile index 4257e98b9777..bb600cada16e 100644 --- a/usr.sbin/rip6query/Makefile +++ b/usr.sbin/rip6query/Makefile @@ -3,7 +3,6 @@ # $FreeBSD$ PROG= rip6query -MAN8= rip6query.8 CFLAGS+=-DINET6 -I${.CURDIR}/../route6d diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile index 166d45863078..96f0181ba3a9 100644 --- a/usr.sbin/rmt/Makefile +++ b/usr.sbin/rmt/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= rmt -MAN8= rmt.8 # called from /usr/src/etc/Makefile etc-rmt: diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile index 02b1900dde55..e1d70f1dcc02 100644 --- a/usr.sbin/route6d/Makefile +++ b/usr.sbin/route6d/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= route6d -MAN8= route6d.8 CFLAGS+= -Dss_len=__ss_len -Dss_family=__ss_family -DINET6 \ -DHAVE_GETIFADDRS diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile index ba6b3c77dbc1..765c83aa4a83 100644 --- a/usr.sbin/rpc.lockd/Makefile +++ b/usr.sbin/rpc.lockd/Makefile @@ -3,7 +3,6 @@ PROG= rpc.lockd SRCS= nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c -MAN8= rpc.lockd.8 MLINKS= rpc.lockd.8 lockd.8 CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index 112cc138bbe9..ca0d44f160a7 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -2,7 +2,6 @@ PROG = rpc.statd SRCS = file.c sm_inter_svc.c sm_inter.h statd.c procs.c -MAN8 = rpc.statd.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile index 207bfc956225..16916d874b52 100644 --- a/usr.sbin/rpc.umntall/Makefile +++ b/usr.sbin/rpc.umntall/Makefile @@ -3,6 +3,5 @@ PROG= rpc.umntall SRCS= rpc.umntall.c mounttab.c -MAN8= rpc.umntall.8 .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 772b5fbc7fa2..66c4514c4dd6 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -11,8 +11,6 @@ RPCDIR= ${DESTDIR}/usr/include/rpcsvc .PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} -MAN8= rpc.yppasswdd.8 - CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \ -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \ -I${.CURDIR} -I. diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile index fffa5eafe060..f23d4f36ee44 100644 --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -8,8 +8,6 @@ RPCDIR= ${.CURDIR}/../../include/rpcsvc .PATH: ${.CURDIR}/../../usr.sbin/ypserv -MAN8= rpc.ypxfrd.8 - CFLAGS+= -I. -DXFRBLOCKSIZE=65535 DPADD= ${LIBRPCSVC} diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile index fb73b23a0f24..87d70e775063 100644 --- a/usr.sbin/rpcbind/Makefile +++ b/usr.sbin/rpcbind/Makefile @@ -3,7 +3,6 @@ PROG= rpcbind CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP -MAN8= rpcbind.8 SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c \ rpc_generic.c diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile index 4c0e0cdc3212..3280dbe43d8e 100644 --- a/usr.sbin/rtprio/Makefile +++ b/usr.sbin/rtprio/Makefile @@ -1,10 +1,9 @@ # from: @(#)Makefile 5.5 (Berkeley) 5/11/90 # $FreeBSD$ -BINDIR=/usr/sbin PROG= rtprio LINKS= ${BINDIR}/rtprio ${BINDIR}/idprio +MAN1= ${PROG}.1 MLINKS= rtprio.1 idprio.1 -MAN1= rtprio.1 .include <bsd.prog.mk> diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile index 2790059e80e9..88a55d638903 100644 --- a/usr.sbin/rtsold/Makefile +++ b/usr.sbin/rtsold/Makefile @@ -19,7 +19,6 @@ CFLAGS+=-DINET6 -DHAVE_GETIFADDRS LDADD= -lkvm DPADD= ${LIBKVM} -MAN8= rtsold.8 MLINKS= rtsold.8 rtsol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile index 0f884f506066..4485e2d64ea1 100644 --- a/usr.sbin/rwhod/Makefile +++ b/usr.sbin/rwhod/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= rwhod -MAN8= rwhod.8 .include <bsd.prog.mk> diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile index db82867e720d..34e98fdeb443 100644 --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= sa -MAN8= sa.8 SRCS= main.c pdb.c usrdb.c .include <bsd.prog.mk> diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 13196bfc2526..7149dd4079a6 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= sysinstall -MAN8= sysinstall.8 CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist CLEANFILES+= keymap.tmp keymap.h diff --git a/usr.sbin/setextattr/Makefile b/usr.sbin/setextattr/Makefile index 8ba76edf6cc8..babb397a5ef7 100644 --- a/usr.sbin/setextattr/Makefile +++ b/usr.sbin/setextattr/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= setextattr -SRCS= setextattr.c LDADD= ${LIBUTIL} CFLAGS+= -Wall -MAN8+= setextattr.8 .include <bsd.prog.mk> diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile index 3cc92262247d..b8a270c5dd01 100644 --- a/usr.sbin/setkey/Makefile +++ b/usr.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 diff --git a/usr.sbin/sgsc/Makefile b/usr.sbin/sgsc/Makefile index 5f14a66b9bba..99cdda104450 100644 --- a/usr.sbin/sgsc/Makefile +++ b/usr.sbin/sgsc/Makefile @@ -1,5 +1,6 @@ # $FreeBSD$ PROG= sgsc +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile index 139e8d6999a8..5c4c2ce7e9c7 100644 --- a/usr.sbin/sicontrol/Makefile +++ b/usr.sbin/sicontrol/Makefile @@ -1,8 +1,6 @@ # $FreeBSD$ PROG= sicontrol -SRCS= sicontrol.c -MAN8= sicontrol.8 CFLAGS+= -I${.CURDIR}/../../sys -Wall .include <bsd.prog.mk> diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile index 8e9dbb2e10bb..a8e4973947de 100644 --- a/usr.sbin/sliplogin/Makefile +++ b/usr.sbin/sliplogin/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 +# $FreeBSD$ PROG= sliplogin -MAN8= sliplogin.8 BINGRP= network BINMODE=4550 INSTALLFLAGS=-fschg diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile index 601612578129..38ad93d66c88 100644 --- a/usr.sbin/slstat/Makefile +++ b/usr.sbin/slstat/Makefile @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= slstat -MAN8= slstat.8 .include <bsd.prog.mk> diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile index 4a0cbab20514..65448b7177b9 100644 --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= spray -MAN8= spray.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile index 9b22fa485b11..328bb74b07b0 100644 --- a/usr.sbin/stallion/stlload/Makefile +++ b/usr.sbin/stallion/stlload/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= stlload -MAN8= stlload.8 MANSUBDIR=/i386 CFLAGS+=-DBOOTDIR=\"${BOOTDIR}\" diff --git a/usr.sbin/stallion/stlstats/Makefile b/usr.sbin/stallion/stlstats/Makefile index 7d0c73b2c071..c708b04f7339 100644 --- a/usr.sbin/stallion/stlstats/Makefile +++ b/usr.sbin/stallion/stlstats/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= stlstats -MAN8= stlstats.8 MANSUBDIR=/i386 DPADD= ${LIBNCURSES} diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index 13196bfc2526..7149dd4079a6 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= sysinstall -MAN8= sysinstall.8 CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist CLEANFILES+= keymap.tmp keymap.h diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile index 3393011498fe..759b0317b359 100644 --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -5,7 +5,6 @@ MAINTAINER=markm@FreeBSD.org PROG= tcpdchk -MAN8= tcpdchk.8 SRCS= tcpdchk.c fakelog.c inetcf.c scaffold.c CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \ diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile index e69c050f6964..3426dc941733 100644 --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -5,7 +5,6 @@ MAINTAINER=markm@FreeBSD.org PROG= tcpdmatch -MAN8= tcpdmatch.8 SRCS= tcpdmatch.c fakelog.c inetcf.c scaffold.c CFLAGS= -DREAL_DAEMON_DIR=\"/usr/libexec\" \ diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile index 7edc521d05ab..a0002b554106 100644 --- a/usr.sbin/timed/timed/Makefile +++ b/usr.sbin/timed/timed/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ # # optional flags are: MEASURE TESTING DEBUG @@ -7,7 +8,6 @@ SRCS= acksend.c candidate.c correct.c master.c networkdelta.c readmsg.c \ slave.c timed.c byteorder.c measure.c cksum.c DPADD= ${LIBUTIL} LDADD= -lutil -MAN8= timed.8 .include "../../Makefile.inc" .include <bsd.prog.mk> diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile index 9cb47164d0fb..a18eb0629d99 100644 --- a/usr.sbin/timed/timedc/Makefile +++ b/usr.sbin/timed/timedc/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= timedc SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c -MAN8= timedc.8 BINMODE=4555 .PATH: ${.CURDIR}/../timed diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 89ed6b4c4c48..ea047301ee78 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= traceroute -MAN8= traceroute.8 BINMODE=4555 CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ -DSTDC_HEADERS=1 diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile index a05e98b45115..01f2d1180e1a 100644 --- a/usr.sbin/traceroute6/Makefile +++ b/usr.sbin/traceroute6/Makefile @@ -23,6 +23,4 @@ CFLAGS+=-DINET6 -DIPSEC -DHAVE_POLL DPADD= ${LIBIPSEC} LDADD= -lipsec -MAN8= traceroute6.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile index 8445d133e83e..f3304a22dca9 100644 --- a/usr.sbin/trpt/Makefile +++ b/usr.sbin/trpt/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= trpt -MAN8= trpt.8 BINGRP= kmem BINMODE=2555 CFLAGS+=-DINET6 diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index b746ce99d042..4687a8727083 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= tzsetup -MAN8= tzsetup.8 CFLAGS+= -I${.CURDIR} LDADD+= -ldialog -lncurses DPADD+= ${LIBDIALOG} ${LIBNCURSES} diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile index 556655ddcac9..070b97957925 100644 --- a/usr.sbin/usbdevs/Makefile +++ b/usr.sbin/usbdevs/Makefile @@ -2,8 +2,6 @@ # FreeBSD $FreeBSD$ PROG= usbdevs -SRCS= usbdevs.c -MAN8= usbdevs.8 CFLAGS+=-I${.CURDIR}/../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile index 020081280a91..6f27868e6e34 100644 --- a/usr.sbin/vidcontrol/Makefile +++ b/usr.sbin/vidcontrol/Makefile @@ -1,5 +1,8 @@ +# $FreeBSD$ + PROG= vidcontrol SRCS= vidcontrol.c decode.c +MAN1= ${PROG}.1 CFLAGS += -Wall diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile index e1c397803c2c..ca42db45afac 100644 --- a/usr.sbin/vipw/Makefile +++ b/usr.sbin/vipw/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= vipw SRCS= pw_util.c vipw.c -MAN8= vipw.8 .include <bsd.prog.mk> diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index 4d8d9f166cff..d7395fcd6832 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= watch -MAN8= watch.8 BINMODE=500 LDADD+= -ltermcap DPADD+= ${LIBTERMCAP} diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile index f68ae34746b1..ed9f06ce7f19 100644 --- a/usr.sbin/wicontrol/Makefile +++ b/usr.sbin/wicontrol/Makefile @@ -1,9 +1,6 @@ # $FreeBSD$ PROG= wicontrol -SRCS= wicontrol.c CFLAGS+= -Wall -DWICACHE -MAN8= wicontrol.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile index 0ebb7b4e174b..d45b284ea1e1 100644 --- a/usr.sbin/wlconfig/Makefile +++ b/usr.sbin/wlconfig/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ PROG= wlconfig -SRCS= wlconfig.c CFLAGS+= -Wall -MAN8= wlconfig.8 .include <bsd.prog.mk> diff --git a/usr.sbin/xten/Makefile b/usr.sbin/xten/Makefile index a86f58632a12..23879aeec137 100644 --- a/usr.sbin/xten/Makefile +++ b/usr.sbin/xten/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PROG= xten +MAN1= ${PROG}.1 CFLAGS+= -I${.CURDIR}/../../libexec/xtend .include <bsd.prog.mk> diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index 18f79b4cabb2..42c291cecff5 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -3,8 +3,6 @@ PROG= yp_mkdb SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c -MAN8= yp_mkdb.8 - .PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv CFLAGS+= -Dyp_error=warnx -I${.CURDIR}/../../libexec/ypxfr diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile index 2f0ff5fe82de..fa7ced859e3d 100644 --- a/usr.sbin/ypbind/Makefile +++ b/usr.sbin/ypbind/Makefile @@ -3,7 +3,6 @@ SRCS= ypbind.c yp_ping.c PROG= ypbind -MAN8= ypbind.8 CFLAGS+=-DDAEMON .include <bsd.prog.mk> diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile index e099f4d6f317..47451af9ae7a 100644 --- a/usr.sbin/yppoll/Makefile +++ b/usr.sbin/yppoll/Makefile @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= yppoll -MAN8= yppoll.8 .include <bsd.prog.mk> diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index abaa5784d640..bea2c6fb201f 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -5,8 +5,6 @@ SRCS= ypxfr_getmap.c yp_dblookup.c yp_error.c ypxfr_misc.c yppush_main.c \ ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppush_svc.c -MAN8= yppush.8 - CFLAGS+=-I. -I${.CURDIR}/../../libexec/ypxfr RPCDIR= ${.CURDIR}/../../include/rpcsvc diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile index 28591103fb40..69dd650aee4d 100644 --- a/usr.sbin/ypset/Makefile +++ b/usr.sbin/ypset/Makefile @@ -1,7 +1,6 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 -# Makefile,v 1.1 1994/08/08 01:10:27 wollman Exp +# $FreeBSD$ PROG= ypset -MAN8= ypset.8 .include <bsd.prog.mk> diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile index ca10ac2c3375..3ee3ce6bf873 100644 --- a/usr.sbin/zic/zdump/Makefile +++ b/usr.sbin/zic/zdump/Makefile @@ -5,7 +5,6 @@ PROG= zdump SRCS= zdump.c ialloc.c scheck.c -MAN8= ${.CURDIR}/../zdump.8 CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile index f8ad4db11253..c7eae2d2eaac 100644 --- a/usr.sbin/zic/zic/Makefile +++ b/usr.sbin/zic/zic/Makefile @@ -5,7 +5,6 @@ PROG= zic SRCS= zic.c ialloc.c scheck.c -MAN8= ${.CURDIR}/../zic.8 CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir |