diff options
30 files changed, 7 insertions, 35 deletions
diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc index f9922b6d6916..1e6f06c715e9 100644 --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,3 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 +# $FreeBSD$ BINDIR?= /usr/libexec +MANSECT?= 8 diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index bcb64c11c092..a71a797b1a87 100644 --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -5,7 +5,6 @@ MAINSRC=${.CURDIR}/../../usr.bin/at .include "${MAINSRC}/Makefile.inc" PROG= atrun -MAN8= atrun.8 SRCS= atrun.c gloadavg.c BINDIR= ${ATLIB_DIR} @@ -13,6 +12,8 @@ CLEANFILES= ${MAN8} CFLAGS+=-I${MAINSRC} -I${.CURDIR} +.include <bsd.prog.mk> + ${MAN8}: atrun.man sed -e \ "s@_ATSPOOL_DIR@$(ATSPOOL_DIR)@g; \ @@ -20,5 +21,3 @@ ${MAN8}: atrun.man s@_ATLIB_DIR@$(ATLIB_DIR)@g; \ s@_LOADAVG_MX@$(LOADAVG_MX)@g;" \ < ${.ALLSRC} > ${.TARGET} - -.include <bsd.prog.mk> diff --git a/libexec/bootpd/tools/Makefile.inc b/libexec/bootpd/tools/Makefile.inc index 16007eec373b..993014725b0e 100644 --- a/libexec/bootpd/tools/Makefile.inc +++ b/libexec/bootpd/tools/Makefile.inc @@ -1,4 +1,5 @@ # Makefile.inc # $FreeBSD$ -BINDIR=/usr/sbin +BINDIR= /usr/sbin +MANSECT?= 8 diff --git a/libexec/bootpd/tools/bootpef/Makefile b/libexec/bootpd/tools/bootpef/Makefile index dfb766255864..860509cb1d88 100644 --- a/libexec/bootpd/tools/bootpef/Makefile +++ b/libexec/bootpd/tools/bootpef/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= bootpef -MAN8= bootpef.8 SRCS= bootpef.c dovend.c readfile.c hash.c dumptab.c lookup.c \ hwaddr.c report.c tzone.c rtmsg.c diff --git a/libexec/bootpd/tools/bootptest/Makefile b/libexec/bootpd/tools/bootptest/Makefile index 1bc8887432f2..e82fcb207da0 100644 --- a/libexec/bootpd/tools/bootptest/Makefile +++ b/libexec/bootpd/tools/bootptest/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= bootptest -MAN8= bootptest.8 SRCS= bootptest.c getether.c getif.c print-bootp.c report.c SRCDIR= ${.CURDIR}/../.. diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile index d3a6740c4677..0547d04125af 100644 --- a/libexec/comsat/Makefile +++ b/libexec/comsat/Makefile @@ -2,6 +2,5 @@ # $FreeBSD$ PROG= comsat -MAN8= comsat.8 .include <bsd.prog.mk> diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index 6c78d8d4c5a4..62d32c6fef5a 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -4,6 +4,5 @@ PROG= fingerd DPADD= ${LIBUTIL} LDADD= -lutil -MAN8= fingerd.8 .include <bsd.prog.mk> diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 89d230d1a9b6..f2626727f5ac 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= ftpd -MAN8= ftpd.8 SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c CFLAGS+=-DSETPROCTITLE -DSKEY -DLOGIN_CAP -DVIRTUAL_HOSTING -Wall diff --git a/libexec/getNAME/Makefile b/libexec/getNAME/Makefile index a88492c48eb9..4e02d71d1583 100644 --- a/libexec/getNAME/Makefile +++ b/libexec/getNAME/Makefile @@ -2,5 +2,6 @@ # $FreeBSD$ PROG= getNAME +MAN1= ${PROG}.1 .include <bsd.prog.mk> diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index b6f554fbf7d7..a1d5fc0826de 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -8,7 +8,6 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail PROG= mail.local SRCS= mail.local.c -MAN8= mail.local.8 CFLAGS+=-I${SENDMAIL_DIR}/include .if exists(${.OBJDIR}/../../lib/libsmutil) diff --git a/libexec/makekey/Makefile b/libexec/makekey/Makefile index 2028c6dad80b..417d6e809977 100644 --- a/libexec/makekey/Makefile +++ b/libexec/makekey/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= makekey -MAN8= makekey.8 DPADD+= ${LIBCRYPT} LDADD+= -lcrypt diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile index 3f5592087b75..dfdea29ce8a3 100644 --- a/libexec/mknetid/Makefile +++ b/libexec/mknetid/Makefile @@ -3,6 +3,4 @@ PROG= mknetid SRCS= mknetid.c hash.c parse_group.c -MAN8= mknetid.8 - .include <bsd.prog.mk> diff --git a/libexec/named-xfer/Makefile b/libexec/named-xfer/Makefile index fcda9909e3c0..b58d38d961f5 100644 --- a/libexec/named-xfer/Makefile +++ b/libexec/named-xfer/Makefile @@ -21,6 +21,4 @@ LIBISC:= ${LIBISCDIR}/libisc.a DPADD+= ${LIBISC} LDADD+= ${LIBISC} -MAN8= named-xfer.8 - .include <bsd.prog.mk> diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile index 438dee65cca5..7e12057a2182 100644 --- a/libexec/pppoed/Makefile +++ b/libexec/pppoed/Makefile @@ -4,6 +4,5 @@ PROG= pppoed SRCS= pppoed.c DPADD= ${LIBNETGRAPH} LDADD= -lnetgraph -MAN8= pppoed.8 .include <bsd.prog.mk> diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile index f4ad590f046a..c187af816023 100644 --- a/libexec/rbootd/Makefile +++ b/libexec/rbootd/Makefile @@ -3,6 +3,5 @@ PROG= rbootd SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c -MAN8= rbootd.8 .include <bsd.prog.mk> diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile index 9c41089c0648..a82901fdd5fd 100644 --- a/libexec/revnetgroup/Makefile +++ b/libexec/revnetgroup/Makefile @@ -3,6 +3,4 @@ PROG= revnetgroup SRCS= revnetgroup.c hash.c parse_netgroup.c -MAN8= revnetgroup.8 - .include <bsd.prog.mk> diff --git a/libexec/rexecd/Makefile b/libexec/rexecd/Makefile index fa5203ca98b6..626a99b331e5 100644 --- a/libexec/rexecd/Makefile +++ b/libexec/rexecd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= rexecd -MAN8= rexecd.8 CFLAGS+= -DSKEY DPADD= ${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL} diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile index 5cb2e96b9531..74ab8d1ab4db 100644 --- a/libexec/rlogind/Makefile +++ b/libexec/rlogind/Makefile @@ -3,7 +3,6 @@ PROG= rlogind SRCS= rlogind.c -MAN8= rlogind.8 DPADD= ${LIBUTIL} LDADD= -lutil CFLAGS+= -Wall -DINET6 diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile index 1bda56af794d..13304eda6aad 100644 --- a/libexec/rpc.rquotad/Makefile +++ b/libexec/rpc.rquotad/Makefile @@ -2,7 +2,6 @@ PROG = rpc.rquotad SRCS = rquotad.c -MAN8 = rpc.rquotad.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index d4b71ea1b8d7..8af426f7092b 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -2,7 +2,6 @@ PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c -MAN8 = rpc.rstatd.8 DPADD= ${LIBRPCSVC} ${LIBUTIL} ${LIBKVM} ${LIBDEVSTAT} LDADD= -lrpcsvc -lutil -lkvm -ldevstat diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index fefc7bfa1d5f..8d783ed598c1 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -2,7 +2,6 @@ PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c -MAN8 = rpc.rusersd.8 DPADD= ${LIBRPCSVC} ${LIBUTIL} LDADD= -lrpcsvc -lutil diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile index 8a0b75c3eedc..20a9a23a0511 100644 --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -2,7 +2,6 @@ PROG = rpc.rwalld SRCS = rwalld.c -MAN8 = rpc.rwalld.8 DPADD= ${LIBRPCSVC} ${LIBUTIL} LDADD= -lrpcsvc -lutil diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile index 80d73302349d..e4944d9cd95c 100644 --- a/libexec/rpc.sprayd/Makefile +++ b/libexec/rpc.sprayd/Makefile @@ -2,7 +2,6 @@ PROG = rpc.sprayd SRCS = sprayd.c -MAN8 = rpc.sprayd.8 DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/libexec/rshd/Makefile b/libexec/rshd/Makefile index 2e40e4fdad4e..24dd7e3f853a 100644 --- a/libexec/rshd/Makefile +++ b/libexec/rshd/Makefile @@ -3,7 +3,6 @@ PROG= rshd SRCS= rshd.c -MAN8= rshd.8 #CFLAGS+= -DCRYPT diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 6bc79a15d864..505fde26be27 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -8,7 +8,6 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail PROG= smrsh SRCS= smrsh.c -MAN8= smrsh.8 CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include .if exists(${.OBJDIR}/../../lib/libsmutil) diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index 7766276ca15f..64c6bcc7fb68 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -11,6 +11,5 @@ SRCS= global.c slc.c state.c sys_term.c telnetd.c \ termstat.c utility.c DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap -ltelnet -MAN8= telnetd.8 .include <bsd.prog.mk> diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile index ce43894dcb21..d7456d1513c7 100644 --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -5,7 +5,6 @@ PROG= tftpd SRCS= tftpd.c tftpsubs.c DPADD= ${LIBUTIL} LDADD= -lutil -MAN8= tftpd.8 CFLAGS+=-I${.CURDIR}/../../usr.bin/tftp .PATH: ${.CURDIR}/../../usr.bin/tftp diff --git a/libexec/uucpd/Makefile b/libexec/uucpd/Makefile index 3aeb623eab90..fa5ee36f96b2 100644 --- a/libexec/uucpd/Makefile +++ b/libexec/uucpd/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= uucpd -MAN8= uucpd.8 LDADD= -lcrypt -lutil DPADD= ${LIBCRYPT} ${LIBUTIL} .include <bsd.prog.mk> diff --git a/libexec/xtend/Makefile b/libexec/xtend/Makefile index 3418457cc3f9..9f5b7f111439 100644 --- a/libexec/xtend/Makefile +++ b/libexec/xtend/Makefile @@ -9,6 +9,4 @@ CFLAGS+= -DXTENUNAME=\"xten\" -DXTENGNAME=\"xten\" DPADD= ${LIBUTIL} LDADD= -lutil -MAN8= xtend.8 - .include <bsd.prog.mk> diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index f03b266d2480..3d7af161e66a 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -9,8 +9,6 @@ GENSRCS=yp.h yp_clnt.c ypxfr_clnt.c .PATH: ${.CURDIR}/../../usr.sbin/ypserv -MAN8= ypxfr.8 - CFLAGS+= -I. DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc |