diff options
239 files changed, 1089 insertions, 853 deletions
diff --git a/sbin/setkey/Makefile b/sbin/setkey/Makefile index 0ce9f7730a47..b66bc464e289 100644 --- a/sbin/setkey/Makefile +++ b/sbin/setkey/Makefile @@ -24,32 +24,35 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +# # $FreeBSD$ PROG= setkey +MAN= setkey.8 SRCS= setkey.c parse.y token.l -CFLAGS+=-g + CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec +YFLAGS= -d + DPADD= ${LIBL} ${LIBY} LDADD= -ll -ly -CLEANFILES+= y.tab.c y.tab.h key_test.o keytest -YFLAGS+=-d + +CLEANFILES= y.tab.c y.tab.h key_test.o keytest # libpfkey. # ipsec_strerror.c is for avoiding shlib reference to non-exported function. .PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c -CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey +CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey -SRCS+=y.tab.h +SRCS+= y.tab.h y.tab.h: parse.y -CFLAGS+=-DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. +CFLAGS+= -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. DPADD+= ${LIBIPSEC} LDADD+= -lipsec CLEANFILES+= scriptdump y.tab.h -SCRIPTS=scriptdump -MAN= setkey.8 +SCRIPTS= scriptdump LOCALPREFIX= /usr diff --git a/usr.sbin/IPXrouted/Makefile b/usr.sbin/IPXrouted/Makefile index f8949f181b65..374782de559a 100644 --- a/usr.sbin/IPXrouted/Makefile +++ b/usr.sbin/IPXrouted/Makefile @@ -5,6 +5,7 @@ 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} LDADD= -lcompat -lipx diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile index 5ddc6e41081e..1d34fe22d6c4 100644 --- a/usr.sbin/ac/Makefile +++ b/usr.sbin/ac/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ PROG= ac -WARNS?= 2 MAN= ac.8 +WARNS?= 2 + # If "CONSOLE_TTY" is not defined, this program is compatible with the # traditional implementation (using SunOS 4.x as the sample traditional # implementation). This is the default. diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile index 2a24e0bbb57f..eec1948db67e 100644 --- a/usr.sbin/accton/Makefile +++ b/usr.sbin/accton/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= accton -WARNS?= 2 MAN= accton.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/acpi/Makefile b/usr.sbin/acpi/Makefile index f43e421d5d9d..953eca7eb1d1 100644 --- a/usr.sbin/acpi/Makefile +++ b/usr.sbin/acpi/Makefile @@ -1,8 +1,6 @@ -# # Makefile for acpi tools # $Id: Makefile,v 1.1 2000/07/14 18:16:22 iwasaki Exp $ # $FreeBSD$ -# SUBDIR= acpiconf acpidump amldb diff --git a/usr.sbin/acpi/Makefile.inc b/usr.sbin/acpi/Makefile.inc index 66c3de73f470..c5f729f6ff1a 100644 --- a/usr.sbin/acpi/Makefile.inc +++ b/usr.sbin/acpi/Makefile.inc @@ -1,6 +1,6 @@ # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $ # $FreeBSD$ -CFLAGS+= -I${.CURDIR}/../../../sys +CFLAGS+= -I${.CURDIR}/../../../sys .include "../Makefile.inc" diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile index f63f558e5623..bb7a454b2db0 100644 --- a/usr.sbin/acpi/acpidump/Makefile +++ b/usr.sbin/acpi/acpidump/Makefile @@ -2,8 +2,9 @@ # $FreeBSD$ PROG= acpidump -SRCS= acpi.c acpi_user.c asl_dump.c aml_dump.c acpidump.c MAN= acpidump.8 +SRCS= acpi.c acpi_user.c asl_dump.c aml_dump.c acpidump.c + #DEBUG_FLAGS= -g .include <bsd.prog.mk> diff --git a/usr.sbin/acpi/amldb/Makefile b/usr.sbin/acpi/amldb/Makefile index f5aa849a8243..3d5b65613ea8 100644 --- a/usr.sbin/acpi/amldb/Makefile +++ b/usr.sbin/acpi/amldb/Makefile @@ -2,9 +2,11 @@ # $FreeBSD$ 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 +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 + #DEBUG_FLAGS= -g CFLAGS+= -I${.CURDIR} diff --git a/usr.sbin/amd/Makefile b/usr.sbin/amd/Makefile index 0bf72fd8f404..37e42005884c 100644 --- a/usr.sbin/amd/Makefile +++ b/usr.sbin/amd/Makefile @@ -4,8 +4,8 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# -SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd scripts wire-test +SUBDIR= include libamu amd amq doc fixmount fsinfo hlfsd mk-amd-map pawd \ + scripts wire-test .include <bsd.subdir.mk> diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc index 55290c878d33..186b5085c24c 100644 --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -8,16 +8,15 @@ # $NetBSD: Makefile.inc,v 1.10 1998/08/08 22:33:27 christos Exp $ # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ -# -CFLAGS+= -I. -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/../include +CFLAGS+= -I. -I${.CURDIR} +CFLAGS+= -I${.CURDIR}/../include .if exists(${.OBJDIR}/../include) -CFLAGS+= -I${.OBJDIR}/../include +CFLAGS+= -I${.OBJDIR}/../include .endif -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include -CFLAGS+= -I${.CURDIR}/../../../contrib/amd -CFLAGS+= -DHAVE_CONFIG_H +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include +CFLAGS+= -I${.CURDIR}/../../../contrib/amd +CFLAGS+= -DHAVE_CONFIG_H .if exists(${.OBJDIR}/../libamu) LIBAMUDIR= ${.OBJDIR}/../libamu diff --git a/usr.sbin/amd/amd/Makefile b/usr.sbin/amd/amd/Makefile index 485ace6df4dc..1a42b193fdc0 100644 --- a/usr.sbin/amd/amd/Makefile +++ b/usr.sbin/amd/amd/Makefile @@ -6,31 +6,30 @@ # $FreeBSD$ # -.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 -SRCS+= amfs_host.c amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c -SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c -SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c -SRCS+= get_args.c info_file.c info_ndbm.c info_nis.c info_passwd.c -SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c -SRCS+= nfs_subr.c ops_cdfs.c ops_lofs.c ops_mfs.c ops_nfs.c ops_nfs3.c -SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c -SRCS+= ops_unionfs.c opts.c restart.c rpc_fwd.c sched.c -SRCS+= srvr_amfs_auto.c srvr_nfs.c - -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd - -DPADD= ${LIBAMU} ${LIBRPCSVC} -LDADD= ${LIBAMU} -lrpcsvc +.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 +SRCS+= amfs_host.c amfs_inherit.c amfs_link.c amfs_linkx.c amfs_nfsl.c +SRCS+= amfs_nfsx.c amfs_program.c amfs_root.c amfs_toplvl.c +SRCS+= amfs_union.c amq_subr.c amq_svc.c autil.c clock.c conf.c +SRCS+= get_args.c info_file.c info_ndbm.c info_nis.c info_passwd.c +SRCS+= info_union.c map.c mapc.c mntfs.c nfs_prot_svc.c nfs_start.c +SRCS+= nfs_subr.c ops_cdfs.c ops_lofs.c ops_mfs.c ops_nfs.c ops_nfs3.c +SRCS+= ops_nullfs.c ops_pcfs.c ops_tfs.c ops_ufs.c ops_umapfs.c +SRCS+= ops_unionfs.c opts.c restart.c rpc_fwd.c sched.c +SRCS+= srvr_amfs_auto.c srvr_nfs.c + +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd + +DPADD= ${LIBAMU} ${LIBRPCSVC} +LDADD= ${LIBAMU} -lrpcsvc CLEANFILES+= conf_parse.c conf_parse.h conf_tok.c -conf_tok.o: conf_parse.h +conf_tok.o: conf_parse.h # These are generated at compile time SRCS+= mount_xdr.c diff --git a/usr.sbin/amd/amq/Makefile b/usr.sbin/amd/amq/Makefile index 660c4323f13b..74fc7492f524 100644 --- a/usr.sbin/amd/amq/Makefile +++ b/usr.sbin/amd/amq/Makefile @@ -6,16 +6,15 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../contrib/amd/amq +.PATH: ${.CURDIR}/../../../contrib/amd/amq -PROG= amq -MAN= amq.8 +PROG= amq +MAN= amq.8 +SRCS= amq.c amq_clnt.c amq_xdr.c -SRCS= amq.c amq_clnt.c amq_xdr.c +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq - -DPADD+= ${LIBAMU} -LDADD+= ${LIBAMU} +DPADD= ${LIBAMU} +LDADD= ${LIBAMU} .include <bsd.prog.mk> diff --git a/usr.sbin/amd/doc/Makefile b/usr.sbin/amd/doc/Makefile index 0d96d8d6636a..e9c77073b290 100644 --- a/usr.sbin/amd/doc/Makefile +++ b/usr.sbin/amd/doc/Makefile @@ -2,6 +2,8 @@ # $FreeBSD$ +.PATH: ${.CURDIR}/../../../contrib/amd/doc + INFO= am-utils INFOSECTION= "AMD Documentation" @@ -9,6 +11,4 @@ INFOENTRY= "* Am-utils: (am-utils). The Amd automounter suite of utilities" MAKEINFOFLAGS+= -I ${.CURDIR}/../../../contrib/amd/doc -.PATH: ${.CURDIR}/../../../contrib/amd/doc - .include <bsd.info.mk> diff --git a/usr.sbin/amd/fixmount/Makefile b/usr.sbin/amd/fixmount/Makefile index 1730122547f2..7f96a456dfe4 100644 --- a/usr.sbin/amd/fixmount/Makefile +++ b/usr.sbin/amd/fixmount/Makefile @@ -4,20 +4,18 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# - -.PATH: ${.CURDIR}/../../../contrib/amd/fixmount \ - ${.CURDIR}/../../../contrib/amd/conf/checkmount -PROG= fixmount -MAN= fixmount.8 +.PATH: ${.CURDIR}/../../../contrib/amd/fixmount \ + ${.CURDIR}/../../../contrib/amd/conf/checkmount -SRCS= fixmount.c +PROG= fixmount +MAN= fixmount.8 +SRCS= fixmount.c -# These would be links created by the GNU-style configure -SRCS+= checkmount_bsd44.c +# These would be links created by the GNU-style configure +SRCS+= checkmount_bsd44.c -DPADD= ${LIBAMU} ${LIBRPCSVC} -LDADD= ${LIBAMU} -lrpcsvc +DPADD= ${LIBAMU} ${LIBRPCSVC} +LDADD= ${LIBAMU} -lrpcsvc .include <bsd.prog.mk> diff --git a/usr.sbin/amd/fsinfo/Makefile b/usr.sbin/amd/fsinfo/Makefile index 634062665e45..9ae55adfa7ac 100644 --- a/usr.sbin/amd/fsinfo/Makefile +++ b/usr.sbin/amd/fsinfo/Makefile @@ -4,21 +4,19 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# - -.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo -PROG= fsinfo -MAN= fsinfo.8 +.PATH: ${.CURDIR}/../../../contrib/amd/fsinfo -SRCS= fsi_gram.y fsi_lex.l -SRCS+= fsi_analyze.c fsi_dict.c fsi_util.c fsinfo.c wr_atab.c -SRCS+= wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c +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 +SRCS+= wr_bparam.c wr_dumpset.c wr_exportfs.c wr_fstab.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo CLEANFILES+= fsi_gram.c fsi_gram.h fsi_lex.c -fsi_lex.o: fsi_gram.h +fsi_lex.o: fsi_gram.h .include <bsd.prog.mk> diff --git a/usr.sbin/amd/hlfsd/Makefile b/usr.sbin/amd/hlfsd/Makefile index 93606ab702ca..b2c94476f034 100644 --- a/usr.sbin/amd/hlfsd/Makefile +++ b/usr.sbin/amd/hlfsd/Makefile @@ -4,18 +4,16 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# - -.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd -PROG= hlfsd -MAN= hlfsd.8 +.PATH: ${.CURDIR}/../../../contrib/amd/hlfsd -SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c +PROG= hlfsd +MAN= hlfsd.8 +SRCS= hlfsd.c homedir.c nfs_prot_svc.c stubs.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd -DPADD= ${LIBAMU} ${LIBRPCSVC} -LDADD= ${LIBAMU} -lrpcsvc +DPADD= ${LIBAMU} ${LIBRPCSVC} +LDADD= ${LIBAMU} -lrpcsvc .include <bsd.prog.mk> diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile index 4816e98b806d..d3c77d120498 100644 --- a/usr.sbin/amd/include/Makefile +++ b/usr.sbin/amd/include/Makefile @@ -6,9 +6,8 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998. # Portions derived from amd/libamu/Makefile # $NetBSD: Makefile,v 1.8 1998/08/08 22:33:37 christos Exp $ -# -SRCS= config_local.h mount.h nfs_prot.h +SRCS= config_local.h mount.h nfs_prot.h CLEANFILES= ${SRCS} all: ${SRCS} diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index ae0256533f20..b2738ac3a20c 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -5,27 +5,25 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/libamu \ - ${.CURDIR}/../../../contrib/amd/conf/transp \ - ${.CURDIR}/../../../contrib/amd/conf/mtab \ - ${.CURDIR}/../../../contrib/amd/conf/umount +.PATH: ${.CURDIR}/../../../contrib/amd/libamu \ + ${.CURDIR}/../../../contrib/amd/conf/transp \ + ${.CURDIR}/../../../contrib/amd/conf/mtab \ + ${.CURDIR}/../../../contrib/amd/conf/umount -LIB= amu +LIB= amu +NOMAN= noman +SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ + util.c wire.c xutil.c -SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ - util.c wire.c xutil.c - -# These would be links created by the GNU-style configure -SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c - -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu - -NOMAN= noman +# These would be links created by the GNU-style configure +SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c # Generated at compile time (replaces supplied xdr_func.c) SRCS+= nfs_prot_x.c CLEANFILES+= nfs_prot_x.c +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu + nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} diff --git a/usr.sbin/amd/mk-amd-map/Makefile b/usr.sbin/amd/mk-amd-map/Makefile index 66efcf5551b8..ff792bd570dc 100644 --- a/usr.sbin/amd/mk-amd-map/Makefile +++ b/usr.sbin/amd/mk-amd-map/Makefile @@ -4,11 +4,10 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map +.PATH: ${.CURDIR}/../../../contrib/amd/mk-amd-map -PROG= mk-amd-map -MAN= mk-amd-map.8 +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 index b4fd43e5f4b3..c6bb1cc37a0b 100644 --- a/usr.sbin/amd/pawd/Makefile +++ b/usr.sbin/amd/pawd/Makefile @@ -4,18 +4,17 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/amd/amq +.PATH: ${.CURDIR}/../../../contrib/amd/amq -BINDIR= /usr/bin +BINDIR= /usr/bin -PROG= pawd -SRCS= pawd.c amq_clnt.c amq_xdr.c +PROG= pawd +SRCS= pawd.c amq_clnt.c amq_xdr.c -CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq +CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -DPADD+= ${LIBAMU} -LDADD+= ${LIBAMU} +DPADD= ${LIBAMU} +LDADD= ${LIBAMU} .include <bsd.prog.mk> diff --git a/usr.sbin/amd/scripts/Makefile b/usr.sbin/amd/scripts/Makefile index 4c069d766d62..822b95144916 100644 --- a/usr.sbin/amd/scripts/Makefile +++ b/usr.sbin/amd/scripts/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/amd/scripts +.PATH: ${.CURDIR}/../../../contrib/amd/scripts -MAN= 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 index 61734d7496d8..a07e6902fe76 100644 --- a/usr.sbin/amd/wire-test/Makefile +++ b/usr.sbin/amd/wire-test/Makefile @@ -4,14 +4,13 @@ # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/amd/wire-test +.PATH: ${.CURDIR}/../../../contrib/amd/wire-test -PROG= wire-test -MAN= wire-test.8 +PROG= wire-test +MAN= wire-test.8 -DPADD+= ${LIBAMU} -LDADD+= ${LIBAMU} +DPADD= ${LIBAMU} +LDADD= ${LIBAMU} .include <bsd.prog.mk> diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile index 95db0e624893..e2c2e8fcfbdb 100644 --- a/usr.sbin/ancontrol/Makefile +++ b/usr.sbin/ancontrol/Makefile @@ -3,6 +3,6 @@ PROG= ancontrol MAN= ancontrol.8 -CFLAGS+= -I${.CURDIR}/../../sys -DANCACHE +CFLAGS+= -I${.CURDIR}/../../sys -DANCACHE .include <bsd.prog.mk> diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index 8ffe016a56c1..772eca561b4a 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ PROG= apmd +MAN= apmd.8 SRCS= apmd.c apmdlex.l apmdparse.y y.tab.h DPADD= ${LIBL} LDADD= -ll -MAN= apmd.8 - YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} #-DYY_STACK_USED # for debug: diff --git a/usr.sbin/atm/Makefile b/usr.sbin/atm/Makefile index 96f3cbfee481..2367085d25b6 100644 --- a/usr.sbin/atm/Makefile +++ b/usr.sbin/atm/Makefile @@ -1,5 +1,3 @@ -# -# # =================================== # HARP | Host ATM Research Platform # =================================== @@ -24,8 +22,6 @@ # notice must be reproduced on all copies. # # @(#) $FreeBSD$ -# -# SUBDIR= atmarpd \ scspd diff --git a/usr.sbin/atm/Makefile.inc b/usr.sbin/atm/Makefile.inc index dece1093d7b4..46723c133d51 100644 --- a/usr.sbin/atm/Makefile.inc +++ b/usr.sbin/atm/Makefile.inc @@ -1,5 +1,3 @@ -# -# # =================================== # HARP | Host ATM Research Platform # =================================== @@ -24,7 +22,5 @@ # notice must be reproduced on all copies. # # @(#) $FreeBSD$ -# -# .include "../Makefile.inc" diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile index 973b59abaedc..1ed613cea6c9 100644 --- a/usr.sbin/atm/atmarpd/Makefile +++ b/usr.sbin/atm/atmarpd/Makefile @@ -1,5 +1,3 @@ -# -# # =================================== # HARP | Host ATM Research Platform # =================================== @@ -24,16 +22,15 @@ # notice must be reproduced on all copies. # # @(#) $FreeBSD$ -# -# PROG= atmarpd +MAN= atmarpd.8 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 -DPADD+= ${LIBATM} ${LIBMD} +CFLAGS+= -I${.CURDIR}/../../../sys + +LDADD= -latm -lmd +DPADD= ${LIBATM} ${LIBMD} .include <bsd.prog.mk> diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile index 7740c2500866..7130c2bae5c1 100644 --- a/usr.sbin/atm/scspd/Makefile +++ b/usr.sbin/atm/scspd/Makefile @@ -1,5 +1,3 @@ -# -# # =================================== # HARP | Host ATM Research Platform # =================================== @@ -24,21 +22,20 @@ # notice must be reproduced on all copies. # # @(#) $FreeBSD$ -# -# PROG= scspd +MAN= scspd.8 SRCS= scspd.c scsp_cafsm.c scsp_config.c scsp_config_lex.c \ scsp_config_parse.y \ 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 -DPADD+= ${LIBATM} ${LIBMD} +CFLAGS+= -I. -I${.CURDIR}/../../../sys -I${.CURDIR} + +LDADD= -latm -lmd +DPADD= ${LIBATM} ${LIBMD} -YFLAGS= -d +YFLAGS= -d .include <bsd.prog.mk> diff --git a/usr.sbin/boot98cfg/Makefile b/usr.sbin/boot98cfg/Makefile index 6d8441ad96ae..e7ffd9dad0ae 100644 --- a/usr.sbin/boot98cfg/Makefile +++ b/usr.sbin/boot98cfg/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= boot98cfg -WARNS?= 2 MAN= boot98cfg.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile index c4f61985a209..c4e3361ecfab 100644 --- a/usr.sbin/bootparamd/Makefile +++ b/usr.sbin/bootparamd/Makefile @@ -1,3 +1,4 @@ +# $FreeBSD$ SUBDIR= bootparamd callbootd diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc index 26c6f1c71ba1..1e4d46f113a5 100644 --- a/usr.sbin/bootparamd/Makefile.inc +++ b/usr.sbin/bootparamd/Makefile.inc @@ -1,3 +1,4 @@ # @(#)Makefile.inc 5.1 (Berkeley) 5/11/90 +# $FreeBSD$ BINDIR?= /usr/sbin diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile index 89b879a46d28..d3122888538f 100644 --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -2,10 +2,12 @@ # $FreeBSD$ PROG= bootparamd +MAN= bootparams.5 bootparamd.8 SRCS= bootparamd.c main.c ${GENSRCS} GENSRCS=bootparam_prot.h bootparam_prot_svc.c bootparam_prot_xdr.c -MAN= bootparams.5 bootparamd.8 + CFLAGS+= -DTFTP_DIR=\"/tftpboot\" -I. + CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index 92ae2e5b1e2e..8db69eab9529 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -2,10 +2,12 @@ # $FreeBSD$ PROG= callbootd +NOMAN= #true SRCS= callbootd.c ${GENSRCS} GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c -NOMAN= + CFLAGS+= -I. + CLEANFILES= ${GENSRCS} RPCSRC= ${DESTDIR}/usr/include/rpcsvc/bootparam_prot.x diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile index 02714db448d5..a2ad939b49c4 100644 --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -3,7 +3,7 @@ MAINTAINER= rnordier PROG= btxld -SRCS= btxld.c elfh.c MAN= btxld.8 +SRCS= btxld.c elfh.c .include <bsd.prog.mk> diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index da47cc8f7dc2..3a5d07285e3b 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -2,7 +2,7 @@ PROG= cdcontrol -DPADD += ${LIBEDIT} ${LIBTERMCAP} -LDADD += -ledit -ltermcap +DPADD= ${LIBEDIT} ${LIBTERMCAP} +LDADD= -ledit -ltermcap .include <bsd.prog.mk> diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile index a1c3b5b7b0af..1c52f4680f83 100644 --- a/usr.sbin/chkgrp/Makefile +++ b/usr.sbin/chkgrp/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= chkgrp -WARNS?= 2 MAN= chkgrp.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 5e8e22debdca..97972e5684ed 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= chown -MAN= chgrp.1 chown.8 LINKS= ${BINDIR}/chown /usr/bin/chgrp +MAN= chgrp.1 chown.8 .include <bsd.prog.mk> diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile index 74c4c5402f74..23430a8bb1af 100644 --- a/usr.sbin/ckdist/Makefile +++ b/usr.sbin/ckdist/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ -PROG= ckdist - .PATH: ${.CURDIR}/../../usr.bin/cksum +PROG= ckdist SRCS= ckdist.c crc.c DPADD= ${LIBMD} diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index ca8e04400669..982ae143a883 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -2,11 +2,13 @@ # $FreeBSD$ PROG= config -CFLAGS+=-I. -I${.CURDIR} -CFLAGS+=${BDECFLAGS} +MAN= config.8 SRCS= config.y main.c lang.l mkmakefile.c mkheaders.c \ mkoptions.c y.tab.h -MAN= config.8 + +CFLAGS+= -I. -I${.CURDIR} +CFLAGS+= ${BDECFLAGS} + DPADD= ${LIBL} LDADD= -ll diff --git a/usr.sbin/config/SMM.doc/Makefile b/usr.sbin/config/SMM.doc/Makefile index 3a2f1881662c..5055062855e3 100644 --- a/usr.sbin/config/SMM.doc/Makefile +++ b/usr.sbin/config/SMM.doc/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 +# $FreeBSD$ DIR= smm/02.config SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile index 1131cff7b17f..62f853cd2673 100644 --- a/usr.sbin/cron/Makefile +++ b/usr.sbin/cron/Makefile @@ -1,3 +1,5 @@ +# $FreeBSD$ + SUBDIR= lib cron crontab .include <bsd.subdir.mk> diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc index f9208ecffeee..d7844f561e25 100644 --- a/usr.sbin/cron/Makefile.inc +++ b/usr.sbin/cron/Makefile.inc @@ -1,9 +1,9 @@ # $FreeBSD$ .if exists(${.OBJDIR}/../lib) -LIBCRON=${.OBJDIR}/../lib/libcron.a +LIBCRON= ${.OBJDIR}/../lib/libcron.a .else -LIBCRON=${.CURDIR}/../lib/libcron.a +LIBCRON= ${.CURDIR}/../lib/libcron.a .endif .include "../Makefile.inc" diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index e9bb9cdb98b1..d578da72daa5 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ PROG= cron +MAN= cron.8 SRCS= cron.c database.c do_command.c job.c user.c popen.c -CFLAGS+=-DLOGIN_CAP + +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 index 9ce35411a10b..96a4bd6c8b8a 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,14 +1,16 @@ # $FreeBSD$ +BINDIR= /usr/bin + PROG= crontab -CFLAGS+=-I${.CURDIR}/../cron -DPADD= ${LIBCRON} ${LIBUTIL} -LDADD= ${LIBCRON} -lutil MAN= crontab.1 crontab.5 - -BINDIR= /usr/bin BINOWN= root BINMODE=4555 INSTALLFLAGS=-fschg +CFLAGS+= -I${.CURDIR}/../cron + +DPADD= ${LIBCRON} ${LIBUTIL} +LDADD= ${LIBCRON} -lutil + .include <bsd.prog.mk> diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile index 52701315fe31..ddb5fb1ad1bf 100644 --- a/usr.sbin/cron/lib/Makefile +++ b/usr.sbin/cron/lib/Makefile @@ -1,10 +1,12 @@ -LIB= cron +# $FreeBSD$ -SRCS= entry.c env.c misc.c -CFLAGS+=-I${.CURDIR}/../cron -CFLAGS+=-DLOGIN_CAP +LIB= cron NOPIC= yes NOPROFILE= yes +SRCS= entry.c env.c misc.c + +CFLAGS+= -I${.CURDIR}/../cron +CFLAGS+= -DLOGIN_CAP install: @echo -n diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile index a38e0b9061df..6bf600fce66b 100644 --- a/usr.sbin/crunch/Makefile +++ b/usr.sbin/crunch/Makefile @@ -1,4 +1,5 @@ +# $FreeBSD$ -SUBDIR=crunchgen crunchide +SUBDIR= crunchgen crunchide .include <bsd.subdir.mk> diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc index da4210505219..f8ffe675db6e 100644 --- a/usr.sbin/crunch/Makefile.inc +++ b/usr.sbin/crunch/Makefile.inc @@ -1,2 +1,4 @@ +# $FreeBSD$ + # modify to taste BINDIR?= /usr/bin diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile index 51fa8a752ad5..8d0a78b19027 100644 --- a/usr.sbin/crunch/crunchgen/Makefile +++ b/usr.sbin/crunch/crunchgen/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -PROG=crunchgen -SRCS=crunchgen.c crunched_skel.c +PROG= crunchgen +SRCS= crunchgen.c crunched_skel.c CLEANFILES+= crunched_skel.c crunched_skel.c: crunched_main.c diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile index d7abd44fd800..b03e1f583933 100644 --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -1,6 +1,6 @@ +# $FreeBSD$ PROG= crunchide - SRCS= crunchide.c exec_aout.c exec_elf32.c exec_elf64.c .include <bsd.prog.mk> diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile index 861e3028cb87..5ff5263e5593 100644 --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -1,5 +1,6 @@ +# $FreeBSD$ -CRUNCHED= fixit +CRUNCHED= fixit # below is boiler-plate to make $(CRUNCHED) from $(CRUNCHED).conf # I'd use PROG instead of CRUNCHED, but the system makefiles REALLY want @@ -8,11 +9,11 @@ CRUNCHED= fixit CONF= $(CRUNCHED).conf OUTMK= $(CRUNCHED).mk -OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache +OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache -NOMAN= -CLEANFILES+=$(CRUNCHED) *.o *.lo *.c *.mk *.cache -CLEANDIRFILES+=$(OUTPUTS) +NOMAN= #true +CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache +CLEANDIRFILES+= $(OUTPUTS) all: $(CRUNCHED) exe: $(CRUNCHED) diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile index d7eda9b92dfb..324fb36d55e0 100644 --- a/usr.sbin/ctm/ctm/Makefile +++ b/usr.sbin/ctm/ctm/Makefile @@ -1,4 +1,3 @@ -# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # <phk@login.dknet.dk> wrote this file. As long as you retain this notice you @@ -7,15 +6,16 @@ # ---------------------------------------------------------------------------- # # $FreeBSD$ -# PROG= ctm -NOTYET= ctm_ed.c +MAN= ctm.1 ctm.5 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} -MAN= ctm.1 ctm.5 + +NOTYET= ctm_ed.c + +LDADD= -lmd +DPADD= ${LIBMD} .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile index 475f00d553e5..f12ecea39760 100644 --- a/usr.sbin/ctm/ctm_dequeue/Makefile +++ b/usr.sbin/ctm/ctm_dequeue/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ -PROG= ctm_dequeue -SRCS= ctm_dequeue.c error.c -NOMAN= yes -CFLAGS+= -I${.CURDIR}/../ctm_rmail - .PATH: ${.CURDIR}/../ctm_rmail +PROG= ctm_dequeue +NOMAN= #true +SRCS= ctm_dequeue.c error.c + +CFLAGS+= -I${.CURDIR}/../ctm_rmail + .include <bsd.prog.mk> diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile index 0dc756c37f99..c2d0789bef1d 100644 --- a/usr.sbin/ctm/ctm_smail/Makefile +++ b/usr.sbin/ctm/ctm_smail/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ -PROG= ctm_smail -SRCS= ctm_smail.c error.c -NOMAN= 1 -CFLAGS+= -I${.CURDIR}/../ctm_rmail .PATH: ${.CURDIR}/../ctm_rmail +PROG= ctm_smail +NOMAN= #true +SRCS= ctm_smail.c error.c + +CFLAGS+= -I${.CURDIR}/../ctm_rmail + .include <bsd.prog.mk> diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile index ea446b269b2c..1ec255d76f2d 100644 --- a/usr.sbin/ctm/mkCTM/Makefile +++ b/usr.sbin/ctm/mkCTM/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ PROG= mkctm -SRCS= mkctm.c -LDADD= -lmd NOMAN= 1 +SRCS= mkctm.c + +LDADD= -lmd test: mkctm rm -f tst.out* diff --git a/usr.sbin/dev_mkdb/Makefile b/usr.sbin/dev_mkdb/Makefile index 02d2b9d5a9bb..b12cfa413f3d 100644 --- a/usr.sbin/dev_mkdb/Makefile +++ b/usr.sbin/dev_mkdb/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= dev_mkdb -WARNS?= 2 MAN= dev_mkdb.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile index 3f12588389c3..31891886b51c 100644 --- a/usr.sbin/devinfo/Makefile +++ b/usr.sbin/devinfo/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ PROG= devinfo +NOMAN= #true + DPADD= ${LIBDEVINFO} LDADD= -ldevinfo -NOMAN= .include <bsd.prog.mk> diff --git a/usr.sbin/diskcheckd/Makefile b/usr.sbin/diskcheckd/Makefile index 0ead4f700694..265acaa4c28e 100644 --- a/usr.sbin/diskcheckd/Makefile +++ b/usr.sbin/diskcheckd/Makefile @@ -1,10 +1,9 @@ # $FreeBSD$ +BINDIR?= /usr/sbin + PROG= diskcheckd MAN8= diskcheckd.8 - MLINKS= diskcheckd.8 diskcheckd.conf.5 -BINDIR?= /usr/sbin - .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_ctlinfo/Makefile b/usr.sbin/dpt/dpt_ctlinfo/Makefile index 843bf28e7703..b82a6c051cef 100644 --- a/usr.sbin/dpt/dpt_ctlinfo/Makefile +++ b/usr.sbin/dpt/dpt_ctlinfo/Makefile @@ -4,7 +4,8 @@ PROG= dpt_ctlinfo MAN= dpt_ctlinfo.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_ctls/Makefile b/usr.sbin/dpt/dpt_ctls/Makefile index 92cc90d71907..82b91615edcb 100644 --- a/usr.sbin/dpt/dpt_ctls/Makefile +++ b/usr.sbin/dpt/dpt_ctls/Makefile @@ -4,7 +4,8 @@ PROG= dpt_ctls MAN= dpt_ctls.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_dm/Makefile b/usr.sbin/dpt/dpt_dm/Makefile index 3e150f8f047a..05a698a10044 100644 --- a/usr.sbin/dpt/dpt_dm/Makefile +++ b/usr.sbin/dpt/dpt_dm/Makefile @@ -4,7 +4,8 @@ PROG= dpt_dm MAN= dpt_dm.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_led/Makefile b/usr.sbin/dpt/dpt_led/Makefile index 87fe47f15a8d..7d4f39c07823 100644 --- a/usr.sbin/dpt/dpt_led/Makefile +++ b/usr.sbin/dpt/dpt_led/Makefile @@ -4,7 +4,8 @@ PROG= dpt_led MAN= dpt_led.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_sig/Makefile b/usr.sbin/dpt/dpt_sig/Makefile index 68d1b20c7cc6..e36635b2f1f7 100644 --- a/usr.sbin/dpt/dpt_sig/Makefile +++ b/usr.sbin/dpt/dpt_sig/Makefile @@ -4,7 +4,8 @@ PROG= dpt_sig MAN= dpt_sig.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_softc/Makefile b/usr.sbin/dpt/dpt_softc/Makefile index 4e3743c91ef3..279e01a99547 100644 --- a/usr.sbin/dpt/dpt_softc/Makefile +++ b/usr.sbin/dpt/dpt_softc/Makefile @@ -4,7 +4,8 @@ PROG= dpt_softc MAN= dpt_softc.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/dpt/dpt_sysinfo/Makefile b/usr.sbin/dpt/dpt_sysinfo/Makefile index c17e4ba635db..4747fd048a71 100644 --- a/usr.sbin/dpt/dpt_sysinfo/Makefile +++ b/usr.sbin/dpt/dpt_sysinfo/Makefile @@ -4,7 +4,8 @@ PROG= dpt_sysinfo MAN= dpt_sysinfo.8 -CFLAGS+=-I${.CURDIR}/../../../sys -BINMODE=500 +BINMODE= 500 + +CFLAGS+= -I${.CURDIR}/../../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/elf2exe/Makefile b/usr.sbin/elf2exe/Makefile index d6440f9a3a94..69e362204b93 100644 --- a/usr.sbin/elf2exe/Makefile +++ b/usr.sbin/elf2exe/Makefile @@ -2,6 +2,6 @@ PROG= elf2exe MAN= elf2exe.8 -MANSUBDIR=/${MACHINE_ARCH} +MANSUBDIR= /${MACHINE_ARCH} .include <bsd.prog.mk> diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile index bd66173be904..0fba0197974a 100644 --- a/usr.sbin/extattrctl/Makefile +++ b/usr.sbin/extattrctl/Makefile @@ -2,6 +2,7 @@ PROG= extattrctl MAN= extattrctl.8 + DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/usr.sbin/faithd/Makefile b/usr.sbin/faithd/Makefile index ae1c66567226..29634c342824 100644 --- a/usr.sbin/faithd/Makefile +++ b/usr.sbin/faithd/Makefile @@ -11,11 +11,13 @@ # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. +# # $FreeBSD$ PROG= faithd -SRCS= faithd.c tcp.c ftp.c rsh.c prefix.c MAN= faithd.8 +SRCS= faithd.c tcp.c ftp.c rsh.c prefix.c + #CFLAGS+= -DFAITH4 .include <bsd.prog.mk> diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile index df184681e3ea..ec411d7a48a0 100644 --- a/usr.sbin/fdcontrol/Makefile +++ b/usr.sbin/fdcontrol/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= fdcontrol -WARNS?= 2 MAN= fdcontrol.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile index 2c1477064bd9..8cc164bf9ebe 100644 --- a/usr.sbin/fdformat/Makefile +++ b/usr.sbin/fdformat/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../fdread +.PATH: ${.CURDIR}/../fdread PROG= fdformat SRCS= fdformat.c fdutil.c -CFLAGS= -I${.CURDIR}/../fdread WARNS?= 2 +CFLAGS+= -I${.CURDIR}/../fdread .include <bsd.prog.mk> diff --git a/usr.sbin/fdwrite/Makefile b/usr.sbin/fdwrite/Makefile index f888c8504434..755b1fe0a53f 100644 --- a/usr.sbin/fdwrite/Makefile +++ b/usr.sbin/fdwrite/Makefile @@ -1,4 +1,3 @@ -# # ---------------------------------------------------------------------------- # "THE BEER-WARE LICENSE" (Revision 42): # <phk@login.dkuug.dk> wrote this file. As long as you retain this notice you @@ -7,8 +6,6 @@ # ---------------------------------------------------------------------------- # # $FreeBSD$ -# -# PROG= fdwrite diff --git a/usr.sbin/getextattr/Makefile b/usr.sbin/getextattr/Makefile index 115993c3c785..41d54d614ad2 100644 --- a/usr.sbin/getextattr/Makefile +++ b/usr.sbin/getextattr/Makefile @@ -2,6 +2,7 @@ PROG= getextattr MAN= getextattr.8 + DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/usr.sbin/gifconfig/Makefile b/usr.sbin/gifconfig/Makefile index b4f3fa1d64c3..c6f257c8cfc4 100644 --- a/usr.sbin/gifconfig/Makefile +++ b/usr.sbin/gifconfig/Makefile @@ -11,11 +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= gifconfig MAN= gifconfig.8 -CFLAGS+=-DINET6 +CFLAGS+= -DINET6 .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/Makefile b/usr.sbin/i4b/Makefile index e50fc424876e..d956597b22f5 100644 --- a/usr.sbin/i4b/Makefile +++ b/usr.sbin/i4b/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ -SUBDIR = dtmfdecode g711conv isdnd isdndebug isdndecode \ - isdnmonitor isdnphone isdntel isdntelctl isdntest \ - isdntrace ispppcontrol man +SUBDIR= dtmfdecode g711conv isdnd isdndebug isdndecode isdnmonitor isdnphone \ + isdntel isdntelctl isdntest isdntrace ispppcontrol man .include <bsd.subdir.mk> diff --git a/usr.sbin/i4b/Makefile.inc b/usr.sbin/i4b/Makefile.inc index 691d73809e06..11954191e2ea 100644 --- a/usr.sbin/i4b/Makefile.inc +++ b/usr.sbin/i4b/Makefile.inc @@ -1,3 +1,5 @@ +# $FreeBSD$ + # if you don't like curses stuff in the daemon (i.e. don't intend # to ever run it in the foreground but are using the monitoring # utilities instead) define this to compile it without. diff --git a/usr.sbin/i4b/dtmfdecode/Makefile b/usr.sbin/i4b/dtmfdecode/Makefile index e746f9169853..74a9df7cde9d 100644 --- a/usr.sbin/i4b/dtmfdecode/Makefile +++ b/usr.sbin/i4b/dtmfdecode/Makefile @@ -6,12 +6,12 @@ # #--------------------------------------------------------------------------- -PROG = dtmfdecode +PROG= dtmfdecode -# libm is only necessary if USE_COS is defined in the source -#LDADD += -lm +CFLAGS+= -DDEBUG -CFLAGS += -DDEBUG +# libm is only necessary if USE_COS is defined in the source +#LDADD= -lm test: ${PROG} uudecode -p < dtmfsounds.al.uu | ./${PROG} diff --git a/usr.sbin/i4b/g711conv/Makefile b/usr.sbin/i4b/g711conv/Makefile index 9f9ac06ae6ad..f24d6e8d568b 100644 --- a/usr.sbin/i4b/g711conv/Makefile +++ b/usr.sbin/i4b/g711conv/Makefile @@ -6,6 +6,6 @@ # #--------------------------------------------------------------------------- -PROG = g711conv +PROG= g711conv .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile index 71dbe9106f2c..9ef7e032e64a 100644 --- a/usr.sbin/i4b/isdnd/Makefile +++ b/usr.sbin/i4b/isdnd/Makefile @@ -1,34 +1,32 @@ # $FreeBSD$ -PROG = isdnd +PROG= isdnd +MAN= isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 isdnd.8 +SRCS= rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ + process.c rates.c msghdl.c fsm.c support.c timer.c \ + exec.c dial.c monitor.c pcause.c controller.c alias.c \ + y.tab.h holiday.c -SRCS = rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ - process.c rates.c msghdl.c fsm.c support.c timer.c \ - exec.c dial.c monitor.c pcause.c controller.c alias.c \ - y.tab.h holiday.c - -COPTS += -I. -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.CURDIR} +COPTS+= -I. -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.CURDIR} # compile debug support -COPTS += -DDEBUG +COPTS+= -DDEBUG # enable rtprio usage -COPTS += -DUSE_RTPRIO - -MAN = isdnd.rc.5 isdnd.rates.5 isdnd.acct.5 isdnd.8 +COPTS+= -DUSE_RTPRIO .include "${.CURDIR}/../Makefile.inc" .if !defined(I4B_WITHOUT_CURSES) -COPTS += -DUSE_CURSES -DPADD = ${LIBCURSES} -LDADD = -lcurses +COPTS+= -DUSE_CURSES +DPADD= ${LIBCURSES} +LDADD= -lcurses .endif .if defined(I4B_EXTERNAL_MONITOR) -COPTS += -DI4B_EXTERNAL_MONITOR +COPTS+= -DI4B_EXTERNAL_MONITOR .if defined(I4B_NOTCPIP_MONITOR) -COPTS += -DI4B_NOTCPIP_MONITOR +COPTS+= -DI4B_NOTCPIP_MONITOR .endif .endif diff --git a/usr.sbin/i4b/isdndebug/Makefile b/usr.sbin/i4b/isdndebug/Makefile index 94b1ade5d460..5a31de955365 100644 --- a/usr.sbin/i4b/isdndebug/Makefile +++ b/usr.sbin/i4b/isdndebug/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -PROG = isdndebug -SRCS = main.c -MAN = isdndebug.8 + +PROG= isdndebug +MAN= isdndebug.8 +SRCS= main.c .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdndecode/Makefile b/usr.sbin/i4b/isdndecode/Makefile index c91596fa5d77..9dbd971b83cb 100644 --- a/usr.sbin/i4b/isdndecode/Makefile +++ b/usr.sbin/i4b/isdndecode/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PROG = isdndecode -SRCS = main.c layer1.c layer2.c layer3.c \ - layer3_subr.c facility.c pcause.c -MAN = isdndecode.8 + +PROG= isdndecode +MAN= isdndecode.8 +SRCS= main.c layer1.c layer2.c layer3.c layer3_subr.c facility.c pcause.c .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile index aff25e877ebb..84f5c160c88a 100644 --- a/usr.sbin/i4b/isdnmonitor/Makefile +++ b/usr.sbin/i4b/isdnmonitor/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -PROG = isdnmonitor -SRCS = main.c curses.c -MAN = isdnmonitor.8 +PROG= isdnmonitor +SRCS= main.c curses.c +MAN= isdnmonitor.8 # compile debug support -COPTS += -DDEBUG +COPTS+= -DDEBUG -DPADD = ${LIBCURSES} -LDADD = -lcurses +DPADD= ${LIBCURSES} +LDADD= -lcurses .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdnphone/Makefile b/usr.sbin/i4b/isdnphone/Makefile index 3df28e75c6bb..3527e8cef36d 100644 --- a/usr.sbin/i4b/isdnphone/Makefile +++ b/usr.sbin/i4b/isdnphone/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PROG = isdnphone -SRCS = main.c display.c audio.c isdn.c -MAN = isdnphone.8 +PROG= isdnphone +MAN= isdnphone.8 +SRCS= main.c display.c audio.c isdn.c -DPADD = ${LIBCURSES} -LDADD = -lcurses +DPADD= ${LIBCURSES} +LDADD= -lcurses .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdntel/Makefile b/usr.sbin/i4b/isdntel/Makefile index 0772bc6128df..e3aff090b196 100644 --- a/usr.sbin/i4b/isdntel/Makefile +++ b/usr.sbin/i4b/isdntel/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ -PROG = isdntel -SRCS = main.c display.c files.c alias.c -DPADD = ${LIBNCURSES} -LDADD = -lncurses -MAN = isdntel.8 +PROG= isdntel +MAN= isdntel.8 +SRCS= main.c display.c files.c alias.c + +DPADD= ${LIBNCURSES} +LDADD= -lncurses .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdntelctl/Makefile b/usr.sbin/i4b/isdntelctl/Makefile index dabc8b840165..41b771e9616e 100644 --- a/usr.sbin/i4b/isdntelctl/Makefile +++ b/usr.sbin/i4b/isdntelctl/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ -PROG = isdntelctl -SRCS = main.c -MAN = isdntelctl.8 + +PROG= isdntelctl +MAN= isdntelctl.8 +SRCS= main.c .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdntest/Makefile b/usr.sbin/i4b/isdntest/Makefile index 2988b1d94b95..2a677e9e814a 100644 --- a/usr.sbin/i4b/isdntest/Makefile +++ b/usr.sbin/i4b/isdntest/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -PROG = isdntest -SRCS = main.c -MAN = isdntest.8 + +PROG= isdntest +MAN= isdntest.8 +SRCS= main.c install: @echo isdntest is not installed automatically diff --git a/usr.sbin/i4b/isdntrace/Makefile b/usr.sbin/i4b/isdntrace/Makefile index 8cd8edf341bb..eae0919b299b 100644 --- a/usr.sbin/i4b/isdntrace/Makefile +++ b/usr.sbin/i4b/isdntrace/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ -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 -MAN = isdntrace.8 + +PROG= isdntrace +MAN= isdntrace.8 +SRCS= q921.c q931.c q931_util.c q932_fac.c 1tr6.c trace.c \ + pcause_1tr6.c pcause_q850.c unknownl3.c .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/ispppcontrol/Makefile b/usr.sbin/i4b/ispppcontrol/Makefile index 3158aaca8559..66dc327c5dea 100644 --- a/usr.sbin/i4b/ispppcontrol/Makefile +++ b/usr.sbin/i4b/ispppcontrol/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG = ispppcontrol -MAN = ispppcontrol.8 +PROG= ispppcontrol +MAN= ispppcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/man/Makefile b/usr.sbin/i4b/man/Makefile index f75cd6b27025..f355d2c855c3 100644 --- a/usr.sbin/i4b/man/Makefile +++ b/usr.sbin/i4b/man/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -MAN = i4b.4 i4bctl.4 i4bipr.4 i4bq921.4 i4bq931.4 i4brbch.4 i4btel.4 \ + +MAN= i4b.4 i4bctl.4 i4bipr.4 i4bq921.4 i4bq931.4 i4brbch.4 i4btel.4 \ i4btrc.4 isic.4 i4bisppp.4 iwic.4 ifpi.4 ifpnp.4 ihfc.4 itjc.4 \ i4bcapi.4 iavc.4 .include <bsd.prog.mk> - diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile index b1bec80cad1c..bda9b68a756d 100644 --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -3,11 +3,9 @@ PROG= ifmcstat MAN= ifmcstat.8 +BINMODE= 550 -BINMODE=550 LDADD= -lkvm DPADD= ${LIBKVM} -CFLAGS+=-DINET6 - .include <bsd.prog.mk> diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index 3c84dc9e49b7..2e1d831dc461 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -4,19 +4,21 @@ MAINTAINER= dwmalone PROG= inetd -SRCS= inetd.c builtins.c -#WARNS?= 2 MAN= inetd.8 MLINKS= inetd.8 inetd.conf.5 +SRCS= inetd.c builtins.c +#WARNS?= 2 COPTS+= -DLOGIN_CAP #COPTS+= -DSANITY_CHECK -DPADD+= ${LIBUTIL} ${LIBWRAP} -LDADD+= -lutil -lwrap +DPADD= ${LIBUTIL} ${LIBWRAP} +LDADD= -lutil -lwrap + .if !defined(RELEASE_CRUNCH) -CFLAGS+=-DINET6 -DIPSEC +CFLAGS+= -DINET6 -DIPSEC DPADD+= ${LIBIPSEC} LDADD+= -lipsec .endif + .include <bsd.prog.mk> diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile index bfc1e49247bc..51514423b15b 100644 --- a/usr.sbin/iostat/Makefile +++ b/usr.sbin/iostat/Makefile @@ -1,13 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -MAINTAINER=ken@FreeBSD.ORG +MAINTAINER= ken@FreeBSD.ORG PROG= iostat MAN= iostat.8 +BINGRP= kmem +BINMODE= 2555 + DPADD= ${LIBKVM} ${LIBDEVSTAT} LDADD= -lkvm -ldevstat -BINGRP= kmem -BINMODE=2555 .include <bsd.prog.mk> diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile index ab7233a56d9e..ccfd3f890690 100644 --- a/usr.sbin/ipftest/Makefile +++ b/usr.sbin/ipftest/Makefile @@ -1,17 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sys/contrib/ipfilter/netinet \ - ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man +MAINTAINER= guido@freebsd.org + +.PATH: ${.CURDIR}/../../sys/contrib/ipfilter/netinet \ + ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man PROG= ipftest SRCS= ipt.c parse.c fil.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c \ ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ip_proxy.c \ ip_auth.c ipft_hx.c ip_fil.c natparse.c facpri.c common.c -CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet -CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter - -MAINTAINER= guido@freebsd.org +CFLAGS+= -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" +CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet +CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter .include <bsd.prog.mk> diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile index 0c10f9f9c923..feb0b9aadfaf 100644 --- a/usr.sbin/ipresend/Makefile +++ b/usr.sbin/ipresend/Makefile @@ -1,16 +1,17 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ - ${.CURDIR}/../../contrib/ipfilter +MAINTAINER= guido@freebsd.org -PROG= ipresend -SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c +.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ + ${.CURDIR}/../../contrib/ipfilter -CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 -CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet -CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter/ipsend \ - -I${.CURDIR}/../../contrib/ipfilter +PROG= ipresend +SRCS= ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c \ + ipft_tx.c sbpf.c 44arp.c ipft_pc.c -MAINTAINER= guido@freebsd.org +CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 +CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet +CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \ + -I${.CURDIR}/../../contrib/ipfilter .include <bsd.prog.mk> diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile index 07f2979d5deb..ee7085f45b67 100644 --- a/usr.sbin/ipsend/Makefile +++ b/usr.sbin/ipsend/Makefile @@ -1,23 +1,23 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ - ${.CURDIR}/../../contrib/ipfilter/iplang \ - ${.CURDIR}/../../contrib/ipfilter +MAINTAINER= guido@freebsd.org + +.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ + ${.CURDIR}/../../contrib/ipfilter/iplang \ + ${.CURDIR}/../../contrib/ipfilter PROG= ipsend +MAN= ipsend.1 ipsend.5 SRCS= ipsend.c ip.c ipsopt.c sbpf.c sock.c 44arp.c iplang_y.y iplang_l.l \ y.tab.h -MAN= ipsend.1 ipsend.5 -CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 -CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet -CFLAGS+=-I. -I${.CURDIR}/../../contrib/ipfilter/ipsend \ - -I${.CURDIR}/../../contrib/ipfilter/iplang \ - -I${.CURDIR}/../../contrib/ipfilter +CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 +CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet +CFLAGS+= -I. -I${.CURDIR}/../../contrib/ipfilter/ipsend \ + -I${.CURDIR}/../../contrib/ipfilter/iplang \ + -I${.CURDIR}/../../contrib/ipfilter DPADD= ${LIBL} LDADD= -ll -MAINTAINER= guido@freebsd.org - .include <bsd.prog.mk> diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile index 304d009fba5c..f7a965dd4a73 100644 --- a/usr.sbin/iptest/Makefile +++ b/usr.sbin/iptest/Makefile @@ -1,16 +1,16 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ - ${.CURDIR}/../../contrib/ipfilter +MAINTAINER= guido@freebsd.org + +.PATH: ${.CURDIR}/../../contrib/ipfilter/ipsend \ + ${.CURDIR}/../../contrib/ipfilter PROG= iptest SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c -CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 -CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet -CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter/ipsend \ - -I${.CURDIR}/../../contrib/ipfilter - -MAINTAINER= guido@freebsd.org +CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6 +CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet +CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \ + -I${.CURDIR}/../../contrib/ipfilter .include <bsd.prog.mk> diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index 5b1df4799fd6..0d18ff40bd44 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= jail -WARNS?= 2 MAN= jail.8 -.include <bsd.prog.mk> +WARNS?= 2 + +.include <bsd.prog.mk> diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile index da863552a467..ad6540a36c5b 100644 --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ PROG= kbdcontrol -SRCS= kbdcontrol.c lex.l -CFLAGS+= -I${.CURDIR} MAN= kbdcontrol.1 kbdmap.5 MLINKS= kbdmap.5 keymap.5 +SRCS= kbdcontrol.c lex.l + +CFLAGS+= -I${.CURDIR} + DPADD= ${LIBL} LDADD= -ll diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index b2f660954f2d..13e0c7600c08 100644 --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -2,9 +2,9 @@ MAINTAINER= wosch -SCRIPTS=${.CURDIR}/kbdmap.pl -MAN= kbdmap.1 +SCRIPTS= ${.CURDIR}/kbdmap.pl LINKS= ${BINDIR}/kbdmap ${BINDIR}/vidfont +MAN= kbdmap.1 MLINKS= kbdmap.1 vidfont.1 .include <bsd.prog.mk> diff --git a/usr.sbin/kernbb/Makefile b/usr.sbin/kernbb/Makefile index bb18ba37ba8c..19473059a74a 100644 --- a/usr.sbin/kernbb/Makefile +++ b/usr.sbin/kernbb/Makefile @@ -2,6 +2,7 @@ PROG= kernbb MAN= kernbb.8 + DPADD= ${LIBKVM} LDADD= -lkvm diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index 50feeaeb75a3..09007e915375 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= keyserv -SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h - MAN= keyserv.8 +SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. .if $(OBJFORMAT) == elf diff --git a/usr.sbin/kgmon/Makefile b/usr.sbin/kgmon/Makefile index f5eff5d4172f..964c79b542f6 100644 --- a/usr.sbin/kgmon/Makefile +++ b/usr.sbin/kgmon/Makefile @@ -3,13 +3,14 @@ PROG= kgmon MAN= kgmon.8 -DPADD= ${LIBKVM} -LDADD= -lkvm -# + # This program may safely be run setuid-root to allow non-root # users to start, stop, and reset profiling buffers. # #BINOWN=root #BINMODE=4555 +DPADD= ${LIBKVM} +LDADD= -lkvm + .include <bsd.prog.mk> diff --git a/usr.sbin/kgzip/Makefile b/usr.sbin/kgzip/Makefile index 1d051ba72e23..3539e305e685 100644 --- a/usr.sbin/kgzip/Makefile +++ b/usr.sbin/kgzip/Makefile @@ -3,8 +3,9 @@ MAINTAINER= rnordier PROG= kgzip -SRCS= kgzip.c aouthdr.c elfhdr.c kgzcmp.c kgzld.c xio.c MAN= kgzip.8 +SRCS= kgzip.c aouthdr.c elfhdr.c kgzcmp.c kgzld.c xio.c + CFLAGS+= ${BDECFLAGS} .include <bsd.prog.mk> diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile index 022cfe00e910..017aadf27726 100644 --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= lastlogin -WARNS?= 2 MAN= lastlogin.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile index 9214954aa678..858127169740 100644 --- a/usr.sbin/lpr/Makefile +++ b/usr.sbin/lpr/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -SUBDIR= common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \ - filters filters.ru SMM.doc - MAINTAINER= wollman@FreeBSD.org MAINTAINER+= gad@FreeBSD.org +SUBDIR= common_source chkprintcap lp lpc lpd lpq lpr lprm lptest pac \ + filters filters.ru SMM.doc + # Questions/ideas for lpr & friends could also be sent to: # freebsd-print@bostonradio.org .include <bsd.subdir.mk> - diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc index aba984eba347..bd8272f065ab 100644 --- a/usr.sbin/lpr/Makefile.inc +++ b/usr.sbin/lpr/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -CFLAGS+=-DINET6 +CFLAGS+= -DINET6 CWARNFLAGS= ${BDECFLAGS} .if exists(${.OBJDIR}/../common_source) diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index 54c3182d448a..b527e525ce9b 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -1,9 +1,12 @@ # $FreeBSD$ +.PATH: ${.CURDIR}/../common_source + PROG= chkprintcap MAN= chkprintcap.8 -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} -.PATH: ${.CURDIR}/../common_source + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} LDADD= ${LIBLPR} diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile index db64f3b5d3ec..7a2304925451 100644 --- a/usr.sbin/lpr/common_source/Makefile +++ b/usr.sbin/lpr/common_source/Makefile @@ -6,11 +6,12 @@ # but the library makes it much easier to modularize them. # LIB= lpr -SRCS= common.c ctlinfo.c displayq.c net.c printcap.c request.c \ - rmjob.c startdaemon.c -NOMAN= noman NOPROFILE= noprofile NOPIC= nopic +NOMAN= noman +SRCS= common.c ctlinfo.c displayq.c net.c printcap.c request.c \ + rmjob.c startdaemon.c + CFLAGS+= ${CWARNFLAGS} install: diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile index 0c7be10f3070..a2e0ae0e9313 100644 --- a/usr.sbin/lpr/filters.ru/Makefile +++ b/usr.sbin/lpr/filters.ru/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -SUBDIR = koi2alt koi2855 +SUBDIR= koi2alt koi2855 -SAMPLES=bjc-240.sh.sample +SAMPLES= bjc-240.sh.sample afterinstall: cd ${.CURDIR} && \ @@ -11,4 +11,3 @@ afterinstall: .include "Makefile.inc" .include <bsd.prog.mk> - diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc index c4a3a7fc878a..a312e73941ec 100644 --- a/usr.sbin/lpr/filters.ru/Makefile.inc +++ b/usr.sbin/lpr/filters.ru/Makefile.inc @@ -1,2 +1,3 @@ # $FreeBSD$ -BINDIR= /usr/libexec/lpr/ru + +BINDIR= /usr/libexec/lpr/ru diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 3e83d97eb34e..9bc28cda952d 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG=koi2855 -NOMAN= noman +PROG= koi2855 +NOMAN= #true .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index f980bbfcb82b..3af814f05081 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG=koi2alt -NOMAN= noman +PROG= koi2alt +NOMAN= #true .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index c9d5c4f02158..c8bdca76821e 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -1,7 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ + +BINDIR= /usr/libexec/lpr PROG= lpf NOMAN= noman -BINDIR= /usr/libexec/lpr .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile index 8876472e1220..2fcec43ec80b 100644 --- a/usr.sbin/lpr/lp/Makefile +++ b/usr.sbin/lpr/lp/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ +BINDIR= /usr/bin + SCRIPTS=lp.sh MAN= lp.1 -BINDIR= /usr/bin - .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index 2c6ceae5449a..51ab44d46821 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -1,13 +1,16 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../common_source + PROG= lpc -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} MAN= lpc.8 SRCS= lpc.c cmds.c cmdtab.c BINGRP= daemon -BINMODE=2555 -.PATH: ${.CURDIR}/../common_source +BINMODE= 2555 + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAP} LDADD= ${LIBLPR} -ledit -ltermcap diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index 1131262537ff..6250e163faac 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -2,9 +2,11 @@ # $FreeBSD$ PROG= lpd -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} MAN= lpd.8 SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} LDADD= ${LIBLPR} diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index 24afb7ab101a..2b795d9af6f6 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -1,13 +1,15 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +BINDIR= /usr/bin + PROG= lpq -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} +BINGRP= daemon +BINMODE= 6555 + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} LDADD= ${LIBLPR} -BINGRP= daemon -BINMODE=6555 -BINDIR= /usr/bin - .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index ae5fa174d9dc..e952f608b3b7 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -1,13 +1,17 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -PROG= lpr -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} -BINGRP= daemon -BINMODE=6555 +.PATH: ${.CURDIR}/../common_source + BINDIR= /usr/bin + +PROG= lpr MAN= lpr.1 printcap.5 -.PATH: ${.CURDIR}/../common_source +BINGRP= daemon +BINMODE= 6555 + +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..cc9d07582706 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -1,14 +1,17 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../common_source + +BINDIR= /usr/bin + PROG= lprm -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} -.PATH: ${.CURDIR}/../common_source +BINGRP= daemon +BINMODE= 6555 + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} LDADD= ${LIBLPR} -BINGRP= daemon -BINMODE=6555 -BINDIR= /usr/bin - .include <bsd.prog.mk> diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index 3a9c5ebf151f..19ecdc98db95 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -1,10 +1,13 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../common_source + PROG= pac -CFLAGS+=-I${.CURDIR}/../common_source ${CWARNFLAGS} MAN= pac.8 -.PATH: ${.CURDIR}/../common_source + +CFLAGS+= -I${.CURDIR}/../common_source ${CWARNFLAGS} + DPADD= ${LIBLPR} LDADD= ${LIBLPR} diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile index f49160ed18ee..76f4f2d4931e 100644 --- a/usr.sbin/lptcontrol/Makefile +++ b/usr.sbin/lptcontrol/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -PROG= lptcontrol -WARNS?= 2 -MAN= lptcontrol.8 +PROG= lptcontrol +MAN= lptcontrol.8 + +WARNS?= 2 .include <bsd.prog.mk> diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index 850ad428f6aa..3cef65b23a86 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -3,12 +3,13 @@ MAINTAINER= gshapiro@FreeBSD.org -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail -.PATH: ${SENDMAIL_DIR}/mailstats +SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail +.PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats MAN= mailstats.8 -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL + +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL .if exists(${.OBJDIR}/../../lib/libsmutil) LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil @@ -21,9 +22,9 @@ DPADD= ${LIBSMUTIL} LDADD= ${LIBSMUTIL} # User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} -LDFLAGS+=${SENDMAIL_LDFLAGS} +CFLAGS+= ${SENDMAIL_CFLAGS} +DPADD+= ${SENDMAIL_DPADD} +LDADD+= ${SENDMAIL_LDADD} +LDFLAGS+= ${SENDMAIL_LDFLAGS} .include <bsd.prog.mk> diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 0cb27dcfb437..2f28a2f0be02 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -3,8 +3,8 @@ PROG= mailwrapper MAN= mailwrapper.8 -DPADD+= ${LIBUTIL} -LDADD+= -lutil +DPADD= ${LIBUTIL} +LDADD= -lutil SYMLINKS= ${BINDIR}/mailwrapper /usr/sbin/sendmail \ ${BINDIR}/mailwrapper /usr/bin/newaliases \ diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 5425555ff1dd..b14ef27e7f78 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -4,12 +4,13 @@ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail -.PATH: ${SENDMAIL_DIR}/makemap +.PATH: ${SENDMAIL_DIR}/makemap PROG= makemap MAN= makemap.8 -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -CFLAGS+=-DNEWDB -DNOT_SENDMAIL + +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+= -DNEWDB -DNOT_SENDMAIL .if exists(${.OBJDIR}/../../lib/libsmdb) LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile index 0e61be7a7128..d465d531a3e9 100644 --- a/usr.sbin/memcontrol/Makefile +++ b/usr.sbin/memcontrol/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= memcontrol -MAN= memcontrol.8 +PROG= memcontrol +MAN= memcontrol.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index d65784aa4281..92d9dd91085a 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ MAINTAINER= dougb@FreeBSD.org + SCRIPTS= mergemaster.sh MAN= mergemaster.8 diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile index e50fe00a399e..e86fceec116e 100644 --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= mixer -WARNS?= 2 MAN= mixer.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/mld6query/Makefile b/usr.sbin/mld6query/Makefile index c774f9f16c6f..66f2a5eaaa36 100644 --- a/usr.sbin/mld6query/Makefile +++ b/usr.sbin/mld6query/Makefile @@ -15,8 +15,8 @@ # $FreeBSD$ PROG= mld6query -SRCS= mld6.c MAN= mld6query.8 +SRCS= mld6.c CFLAGS+= -DINET6 -DIPSEC diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile index 094d7451e226..95964a5854ff 100644 --- a/usr.sbin/mlxcontrol/Makefile +++ b/usr.sbin/mlxcontrol/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -PROG= mlxcontrol -SRCS= command.c config.c interface.c util.c -MAN= mlxcontrol.8 -CFLAGS+= -I${.CURDIR}/../../sys +PROG= mlxcontrol +MAN= mlxcontrol.8 +SRCS= command.c config.c interface.c util.c -.include <bsd.prog.mk> +CFLAGS+= -I${.CURDIR}/../../sys +.include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/Makefile.inc b/usr.sbin/mrouted/Makefile.inc index 767c93a298fc..a8e134e93611 100644 --- a/usr.sbin/mrouted/Makefile.inc +++ b/usr.sbin/mrouted/Makefile.inc @@ -1,6 +1,6 @@ # $FreeBSD$ -CFLAGS+= -DRSRR +CFLAGS+= -DRSRR .if exists(${.OBJDIR}/../common) LIBMROUTED= ${.OBJDIR}/../common/libmrouted.a diff --git a/usr.sbin/mrouted/common/Makefile b/usr.sbin/mrouted/common/Makefile index d3ed61e4f731..4c0288125798 100644 --- a/usr.sbin/mrouted/common/Makefile +++ b/usr.sbin/mrouted/common/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ -LIB= mrouted -NOPROFILE= yes -NOPIC= yes - S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S +.PATH: $S +LIB= mrouted +NOPROFILE= yes +NOPIC= yes +NOMAN= #true SRCS= igmp.c inet.c kern.c -NOMAN= + +CFLAGS+= -I$S # nothing to install install: diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index 66b0f5d234ac..f99247b62500 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/usr.sbin/mrouted/map-mbone/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ +S= ${.CURDIR}/.. +.PATH: $S + PROG= map-mbone +MAN= map-mbone.8 +SRCS= mapper.c + +CFLAGS+= -I$S -S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S DPADD= ${LIBMROUTED} LDADD= ${LIBMROUTED} -SRCS= mapper.c -MAN= map-mbone.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index 701a1932962d..feae4cea32d6 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -1,14 +1,15 @@ # $FreeBSD$ +S= ${.CURDIR}/.. +.PATH: $S + PROG= mrinfo +MAN= mrinfo.8 +BINMODE= 4555 + +CFLAGS+= -I$S -S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S DPADD= ${LIBMROUTED} LDADD= ${LIBMROUTED} -MAN= mrinfo.8 -BINMODE=4555 - .include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/mrouted/Makefile b/usr.sbin/mrouted/mrouted/Makefile index c6855f4b2583..afd3af82342d 100644 --- a/usr.sbin/mrouted/mrouted/Makefile +++ b/usr.sbin/mrouted/mrouted/Makefile @@ -1,16 +1,16 @@ # $FreeBSD$ -PROG= mrouted - S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S -YFLAGS= +.PATH: $S +PROG= mrouted +MAN= mrouted.8 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 -MAN= mrouted.8 + +CFLAGS+= -I$S +YFLAGS= vers.c: $S/VERSION rm -f vers.c ; \ diff --git a/usr.sbin/mrouted/mtrace/Makefile b/usr.sbin/mrouted/mtrace/Makefile index 325999465629..125493e5d95f 100644 --- a/usr.sbin/mrouted/mtrace/Makefile +++ b/usr.sbin/mrouted/mtrace/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -PROG= mtrace - S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S +.PATH: $S +PROG= mtrace MAN= mtrace.8 -BINMODE=4555 +BINMODE= 4555 + +CFLAGS+= -I$S .include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile index b1ea5e523689..131346d6d356 100644 --- a/usr.sbin/mrouted/testrsrr/Makefile +++ b/usr.sbin/mrouted/testrsrr/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -PROG= testrsrr - S= ${.CURDIR}/.. -.PATH: $S -CFLAGS+= -I$S +.PATH: $S +PROG= testrsrr +NOMAN= #true SRCS= testrsrr.c -NOMAN= + +CFLAGS+= -I$S install: diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile index 08a9a97723b7..6e895d904866 100644 --- a/usr.sbin/mtree/Makefile +++ b/usr.sbin/mtree/Makefile @@ -1,16 +1,17 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../../usr.bin/cksum ${.CURDIR}/../../lib/libc/gen + PROG= mtree +MAN= mtree.8 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 -MAN= mtree.8 .if !defined(WORLD) -DPADD+= ${LIBMD} -LDADD+= -lmd CFLAGS+= -DMD5 -DSHA1 -DRMD160 +DPADD= ${LIBMD} +LDADD= -lmd .endif .include <bsd.prog.mk> diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 5df94e5a51da..b0ac4d025b73 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -3,10 +3,11 @@ USE_LIBBIND= true .include "${.CURDIR}/Makefile.inc" -.PATH: ${BIND_DIR}/bin/named -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/named +.PATH: ${BIND_DIR}/doc/man PROG= named +MAN= named.conf.5 named.8 named-bootconf.8 nsupdate.8 SRCS= tmp_version.c pathnames.h \ db_dump.c db_load.c db_lookup.c db_save.c db_update.c \ db_glue.c db_ixfr.c db_sec.c db_tsig.c \ @@ -26,8 +27,6 @@ LIBISC:= ${LIBISCDIR}/libisc.a DPADD+= ${LIBISC} LDADD+= ${LIBISC} -MAN= named.conf.5 named.8 named-bootconf.8 nsupdate.8 - DOCDIR= /usr/share/doc/bind HTMLS= acl.html address_list.html comments.html config.html controls.html \ docdef.html example.html include.html index.html key.html \ diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile index 0e01f48824bf..99f978485297 100644 --- a/usr.sbin/ndc/Makefile +++ b/usr.sbin/ndc/Makefile @@ -3,12 +3,12 @@ USE_LIBBIND= true .include "${.CURDIR}/../named/Makefile.inc" -.PATH: ${BIND_DIR}/bin/ndc -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/ndc +.PATH: ${BIND_DIR}/doc/man PROG= ndc +MAN= ndc.8 SRCS= pathnames.h \ ndc.c -MAN= ndc.8 .include <bsd.prog.mk> diff --git a/usr.sbin/ndp/Makefile b/usr.sbin/ndp/Makefile index 84d283cd2279..2af816bfdf12 100644 --- a/usr.sbin/ndp/Makefile +++ b/usr.sbin/ndp/Makefile @@ -13,13 +13,13 @@ # A PARTICULAR PURPOSE. # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/tcpdump +.PATH: ${.CURDIR}/../../contrib/tcpdump PROG= ndp -SRCS= ndp.c gmt2local.c MAN= ndp.8 +SRCS= ndp.c gmt2local.c -CFLAGS+=-DINET6 -CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump +CFLAGS+= -DINET6 +CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump .include <bsd.prog.mk> diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index 7c97dfe141d9..0a4b254b5fa7 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= newsyslog - MAN= newsyslog.8 .include <bsd.prog.mk> diff --git a/usr.sbin/ngctl/Makefile b/usr.sbin/ngctl/Makefile index c0fb6f240f7e..415b1b2848f4 100644 --- a/usr.sbin/ngctl/Makefile +++ b/usr.sbin/ngctl/Makefile @@ -1,11 +1,12 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.3 1999/01/16 00:10:11 archie Exp $ -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 -MAN= ngctl.8 -DPADD+= ${LIBNETGRAPH} -LDADD+= -lnetgraph +PROG= ngctl +MAN= ngctl.8 +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 + +DPADD= ${LIBNETGRAPH} +LDADD= -lnetgraph .include <bsd.prog.mk> diff --git a/usr.sbin/nghook/Makefile b/usr.sbin/nghook/Makefile index 3feb539c5787..e427f2603cc9 100644 --- a/usr.sbin/nghook/Makefile +++ b/usr.sbin/nghook/Makefile @@ -1,10 +1,11 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.4 1999/01/16 04:44:33 archie Exp $ -PROG= nghook -SRCS= main.c -MAN= nghook.8 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +PROG= nghook +MAN= nghook.8 +SRCS= main.c + +DPADD= ${LIBNETGRAPH} +LDADD= -lnetgraph .include <bsd.prog.mk> diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile index ed279bfa9076..6a8acaa25d35 100644 --- a/usr.sbin/nslookup/Makefile +++ b/usr.sbin/nslookup/Makefile @@ -3,15 +3,16 @@ USE_LIBBIND= yes .include "${.CURDIR}/../named/Makefile.inc" -.PATH: ${BIND_DIR}/bin/nslookup -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/nslookup +.PATH: ${BIND_DIR}/doc/man PROG= nslookup -SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l MAN= nslookup.8 +SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l + +CFLAGS+= -D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\" +CFLAGS+= -I${.CURDIR}/../../contrib/bind/bin/nslookup -CFLAGS+=-D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\" -CFLAGS+=-I${.CURDIR}/../../contrib/bind/bin/nslookup LDADD+= -ll -ledit -ltermcap DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} diff --git a/usr.sbin/nsupdate/Makefile b/usr.sbin/nsupdate/Makefile index c8b2b9b3eb6a..16697cb7dd8c 100644 --- a/usr.sbin/nsupdate/Makefile +++ b/usr.sbin/nsupdate/Makefile @@ -3,7 +3,7 @@ USE_LIBBIND= yes .include "${.CURDIR}/../named/Makefile.inc" -.PATH: ${BIND_DIR}/bin/nsupdate +.PATH: ${BIND_DIR}/bin/nsupdate PROG= nsupdate NOMAN= hmm.. diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile index 4c676df5b88f..04349e23d8f8 100644 --- a/usr.sbin/ntp/Makefile +++ b/usr.sbin/ntp/Makefile @@ -1,9 +1,8 @@ -# # Makefile for ntpd. # $FreeBSD$ -# + MAINTAINER= roberto -SUBDIR= doc libntp libparse ntpd ntpdc ntpq ntpdate ntptrace ntptimeset ntptime +SUBDIR= doc libntp libparse ntpd ntpdc ntpq ntpdate ntptrace ntptimeset ntptime .include <bsd.subdir.mk> diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index d815266e3f05..8b8a1994e3c5 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,5 +1,5 @@ -# $FreeBSD$ -# +# $FreeBSD$ + MAINTAINER= roberto DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index 245cc53ae5f2..498e250b5add 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -1,8 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/libntp +.PATH: ${.CURDIR}/../../../contrib/ntp/libntp + +LIB= ntp +NOPROFILE= true +INTERNALLIB= true +NOPIC= true +INTERNALSTATICLIB= true +NOMAN= true SRCS= a_md5encrypt.c adjtime.c atoint.c \ atolfp.c atouint.c authencrypt.c authkeys.c \ @@ -10,26 +15,18 @@ SRCS= a_md5encrypt.c adjtime.c atoint.c \ buftvtots.c caljulian.c calleapwhen.c caltontp.c \ calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ dofptoa.c dolfptoa.c emalloc.c findconfig.c \ - fptoa.c fptoms.c getopt.c gpstolfp.c \ + fptoa.c fptoms.c getopt.c gpstolfp.c \ hextoint.c hextolfp.c humandate.c ieee754io.c \ inttoa.c iosignal.c lib_strbuf.c \ - machines.c md5c.c memmove.c \ + machines.c md5c.c memmove.c \ mfp_mul.c mfptoa.c mfptoms.c \ modetoa.c mstolfp.c msutotsf.c msyslog.c \ - netof.c numtoa.c numtohost.c octtoint.c \ - prettydate.c ranny.c recvbuff.c refnumtoa.c \ + netof.c numtoa.c numtohost.c octtoint.c \ + prettydate.c ranny.c recvbuff.c refnumtoa.c \ statestr.c syssignal.c systime.c \ - tsftomsu.c tstotv.c tvtoa.c tvtots.c \ + tsftomsu.c tstotv.c tvtoa.c tvtots.c \ uglydate.c uinttoa.c utvtoa.c ymd2yd.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= true -NOPROFILE= true -INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true - -LIB= ntp - .include <bsd.lib.mk> diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index dd0b645a6c0b..0e28830cdfcd 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -1,10 +1,15 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/libparse +.PATH: ${.CURDIR}/../../../contrib/ntp/libparse -SRCS= parse.c parse_conf.c \ +LIB= parse +NOPROFILE= true +NOPIC= true +INTERNALLIB= true +INTERNALSTATICLIB= true +NOMAN= true + +SRCS= parse.c parse_conf.c \ clk_computime.c clk_dcf7000.c clk_hopf6021.c \ clk_meinberg.c clk_rawdcf.c clk_rcc8000.c \ clk_schmid.c clk_trimtaip.c clk_trimtsip.c \ @@ -13,12 +18,4 @@ SRCS= parse.c parse_conf.c \ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= true -NOPROFILE= true -INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true - -LIB= parse - .include <bsd.lib.mk> diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index fd1e393308a6..766ad4735dcc 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,11 +1,9 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd +.PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd - +NOMAN= yes SRCS= map_vme.c ntp_config.c \ ntp_control.c ntp_filegen.c ntp_intres.c \ ntp_io.c ntp_loopfilter.c ntp_monitor.c \ @@ -26,8 +24,6 @@ SRCS= map_vme.c ntp_config.c \ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBPARSE} ${LIBNTP} -lm LDADD= ${LIBPARSE} ${LIBNTP} -lm diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 22c7cf0afbd0..af0db44a3acb 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -1,17 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate +.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate -PROG= ntpdate - -SRCS= ntpdate.c version.c +PROG= ntpdate +NOMAN= yes +SRCS= ntpdate.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 97756af2e821..8a37ae156ade 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,17 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc - -PROG= ntpdc +.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc +PROG= ntpdc +NOMAN= yes SRCS= ntpdc.c ntpdc_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 29f16e0200fa..17d55455529a 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,18 +1,15 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq +.PATH: ${.CURDIR}/../../../contrib/ntp/ntpq -PROG= ntpq -BINDIR= /usr/bin +BINDIR= /usr/bin +PROG= ntpq +NOMAN= yes SRCS= ntpq.c ntpq_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index 6d57ec251769..9e14c38cb096 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -1,17 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/util - -PROG= ntptime +.PATH: ${.CURDIR}/../../../contrib/ntp/util +PROG= ntptime +NOMAN= yes SRCS= ntptime.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/ntp/ntptimeset/Makefile b/usr.sbin/ntp/ntptimeset/Makefile index 7e2dc934de77..240e516078c8 100644 --- a/usr.sbin/ntp/ntptimeset/Makefile +++ b/usr.sbin/ntp/ntptimeset/Makefile @@ -1,17 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate +.PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate -PROG= ntptimeset - -SRCS= ntptimeset.c ntptime_config.c version.c +PROG= ntptimeset +NOMAN= yes +SRCS= ntptimeset.c ntptime_config.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile index 9bb0bde604d2..297339fcc86a 100644 --- a/usr.sbin/ntp/ntptrace/Makefile +++ b/usr.sbin/ntp/ntptrace/Makefile @@ -1,17 +1,13 @@ -# # $FreeBSD$ -# -.PATH: ${.CURDIR}/../../../contrib/ntp/ntptrace - -PROG= ntptrace +.PATH: ${.CURDIR}/../../../contrib/ntp/ntptrace +PROG= ntptrace +NOMAN= yes SRCS= ntptrace.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -NOMAN= yes - DPADD= ${LIBNTP} LDADD= ${LIBNTP} diff --git a/usr.sbin/pccard/Makefile b/usr.sbin/pccard/Makefile index 06516bf40815..10b8a4c849c7 100644 --- a/usr.sbin/pccard/Makefile +++ b/usr.sbin/pccard/Makefile @@ -1,7 +1,6 @@ -# # Makefile for pccardc/pccardd. # $FreeBSD$ -# -SUBDIR= pccardc pccardd + +SUBDIR= pccardc pccardd .include <bsd.subdir.mk> diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile index 3306ab32e875..0d09f92ee6bf 100644 --- a/usr.sbin/pccard/pccardc/Makefile +++ b/usr.sbin/pccard/pccardc/Makefile @@ -1,14 +1,13 @@ -# # pccardc Makefile # # $FreeBSD$ -# + PROG= pccardc +MAN= pccardc.8 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 -MAN= pccardc.8 -CFLAGS+= -I${.CURDIR}/../pccardd +CFLAGS+= -I${.CURDIR}/../pccardd .include <bsd.prog.mk> .PATH: ${.CURDIR}/../pccardd diff --git a/usr.sbin/pccard/pccardd/Makefile b/usr.sbin/pccard/pccardd/Makefile index c82ce9a5da8d..0fb8c6e9b0a5 100644 --- a/usr.sbin/pccard/pccardd/Makefile +++ b/usr.sbin/pccard/pccardd/Makefile @@ -2,11 +2,13 @@ # $FreeBSD$ PROG= pccardd -SRCS= pccardd.c cardd.c file.c util.c readcis.c printcis.c server.c MAN= pccard.conf.5 pccardd.8 +SRCS= pccardd.c cardd.c file.c util.c readcis.c printcis.c server.c + +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../pccardc + DPADD= ${LIBUTIL} LDADD= -lutil -CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../pccardc .include <bsd.prog.mk> .PATH: ${.CURDIR}/../pccardc diff --git a/usr.sbin/pciconf/Makefile b/usr.sbin/pciconf/Makefile index a32dfd47c2ee..d892a1282197 100644 --- a/usr.sbin/pciconf/Makefile +++ b/usr.sbin/pciconf/Makefile @@ -3,6 +3,7 @@ PROG= pciconf MAN= pciconf.8 + CFLAGS+= -I${.CURDIR}/../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile index dcbc0b54a336..a512eaae74aa 100644 --- a/usr.sbin/pcvt/Misc/Makefile +++ b/usr.sbin/pcvt/Misc/Makefile @@ -1,3 +1,5 @@ +# $FreeBSD$ + SUBDIR= Doc Etc FILES= README.FIRST diff --git a/usr.sbin/pcvt/Misc/Makefile.inc b/usr.sbin/pcvt/Misc/Makefile.inc index 6c5322a59e0f..c7ce5f2f18b3 100644 --- a/usr.sbin/pcvt/Misc/Makefile.inc +++ b/usr.sbin/pcvt/Misc/Makefile.inc @@ -1,3 +1,5 @@ +# $FreeBSD$ + DISTRIBUTION= doc BINDIR= /usr/share/pcvt BINMODE= 0444 diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile index 59e8ad6230ba..ee2d1ef3378c 100644 --- a/usr.sbin/pcvt/demo/Makefile +++ b/usr.sbin/pcvt/demo/Makefile @@ -1,8 +1,12 @@ +# $FreeBSD$ + PROG= playvt +NOMAN= #true SRCS= playvt.c + DEMOS= chardemo.vt colors.vt sgr.vt DEMOS+= outerlimit.vt twzone.vt cowscene.vt xmas.vt -NOMAN= +CLEANFILES+= ${DEMOS} all: $(DEMOS) $(PROG) @@ -14,8 +18,6 @@ install: .include <bsd.prog.mk> -CLEANFILES+= ${DEMOS} - # this seems to be the lowest common denominator chardemo.vt: ${.CURDIR}/${.TARGET}.gz.uu diff --git a/usr.sbin/pcvt/fed/Makefile b/usr.sbin/pcvt/fed/Makefile index 6147ef98a836..ac1baa456a4f 100644 --- a/usr.sbin/pcvt/fed/Makefile +++ b/usr.sbin/pcvt/fed/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ -PROG = fed -SRCS = fed.c select.c edit.c misc.c -LDADD = -lncurses +PROG= fed +SRCS= fed.c select.c edit.c misc.c + +DPADD= ${LIBCURSES} +LDADD= -lncurses .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index 7985af075669..1bbbdda8bbbe 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -1,22 +1,20 @@ # $FreeBSD$ PROG= kbdio +NOMAN= #true SRCS= kbdio.y lex.l y.tab.h +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g + #YACC= bison #YFLAGS+= -yd # Bison only YFLAGS+= -v # verbose - LFLAGS+= -I DPADD= ${LIBM} ${LIBY} ${LIBL} LDADD= -lm -ly -ll -NOMAN= - -CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g - CLEANFILES+= y.output # comment file from bison install: diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index dbc94f9b03ac..4e49af9a28ce 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -1,7 +1,12 @@ # $FreeBSD$ -PROG= kcon -DEVICE= /dev/ttyv0 -CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" + +PROG= kcon +DEVICE= /dev/ttyv0 + +CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" + +DPADD= ${LIBKEYCAP} +LDADD= -lkeycap .if exists(${.OBJDIR}/../keycap) LIBKEYCAP= ${.OBJDIR}/../keycap/libkeycap.a @@ -9,7 +14,4 @@ LIBKEYCAP= ${.OBJDIR}/../keycap/libkeycap.a LIBKEYCAP= ${.CURDIR}/../keycap/libkeycap.a .endif -DPADD= ${LIBKEYCAP} -LDADD= ${LIBKEYCAP} - .include <bsd.prog.mk> diff --git a/usr.sbin/pcvt/keycap/Makefile b/usr.sbin/pcvt/keycap/Makefile index 4b989e15141f..c85dba4ce8fc 100644 --- a/usr.sbin/pcvt/keycap/Makefile +++ b/usr.sbin/pcvt/keycap/Makefile @@ -1,17 +1,20 @@ # $FreeBSD$ -LIB = keycap -CAPDIR = /usr/share/misc -CAPPATH = $(CAPDIR)/keycap.pcvt +LIB= keycap +MAN= keycap.3 +MLINKS+= keycap.3 kgetent.3 \ + keycap.3 kgetnum.3 \ + keycap.3 kgetflag.3 \ + keycap.3 kgetstr.3 +MAN+= man5/keycap.5 +SRCS= keycap.c + KEYCAPSRC= keycap.src -CFLAGS += -DKEYCAP_PATH=\"$(CAPPATH)\" -SRCS = keycap.c -MAN = keycap.3 -MLINKS+= keycap.3 kgetent.3 \ - keycap.3 kgetnum.3 \ - keycap.3 kgetflag.3 \ - keycap.3 kgetstr.3 -MAN += man5/keycap.5 +CAPDIR= /usr/share/misc +CAPPATH= $(CAPDIR)/keycap.pcvt + +CFLAGS+= -DKEYCAP_PATH=\"$(CAPPATH)\" + #CLEANFILES+= keycap.0 man5/keycap.0 beforeinstall: diff --git a/usr.sbin/pcvt/vgaio/Makefile b/usr.sbin/pcvt/vgaio/Makefile index f57ef01cac19..0ac0388a0ef2 100644 --- a/usr.sbin/pcvt/vgaio/Makefile +++ b/usr.sbin/pcvt/vgaio/Makefile @@ -1,8 +1,11 @@ # $FreeBSD$ + PROG= vgaio MAN= vgaio.8 - SRCS= vgaio.y lex.l y.tab.h + +CFLAGS+= -I${.OBJDIR} -I${.CURDIR} + YACC= yacc #YFLAGS+= -yd # Bison @@ -13,8 +16,6 @@ LFLAGS+= -I DPADD= ${LIBM} ${LIBY} ${LIBL} LDADD= -lm -ly -ll -CFLAGS+= -I${.OBJDIR} -I${.CURDIR} - CLEANFILES+= y.output # comment file from bison install: diff --git a/usr.sbin/pcvt/vttest/Makefile b/usr.sbin/pcvt/vttest/Makefile index 440962e60eed..be344b2f6648 100644 --- a/usr.sbin/pcvt/vttest/Makefile +++ b/usr.sbin/pcvt/vttest/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ -PROG= vttest -CFLAGS+= -traditional -DUSEMYSTTY -SRCS= main.c esc.c +PROG= vttest +SRCS= main.c esc.c + +CFLAGS+= -traditional -DUSEMYSTTY .include <bsd.prog.mk> diff --git a/usr.sbin/pim6dd/Makefile b/usr.sbin/pim6dd/Makefile new file mode 100644 index 000000000000..9179c2689bfe --- /dev/null +++ b/usr.sbin/pim6dd/Makefile @@ -0,0 +1,87 @@ +# Copyright (c) 1998 WIDE Project. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the project nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +# Copyright (c) 1998 by the University of Oregon. +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software and +# its documentation in source and binary forms for lawful +# purposes and without fee is hereby granted, provided +# that the above copyright notice appear in all copies and that both +# the copyright notice and this permission notice appear in supporting +# documentation, and that any documentation, advertising materials, +# and other materials related to such distribution and use acknowledge +# that the software was developed by the University of Oregon. +# The name of the University of Oregon may not be used to endorse or +# promote products derived from this software without specific prior +# written permission. +# +# THE UNIVERSITY OF OREGON DOES NOT MAKE ANY REPRESENTATIONS +# ABOUT THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE. THIS SOFTWARE IS +# PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND +# NON-INFRINGEMENT. +# +# IN NO EVENT SHALL UO, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY +# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT, +# TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH, +# THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Other copyrights might apply to parts of this software and are so +# noted when applicable. +# +# +# Questions concerning this software should be directed to +# Kurt Windisch (kurtw@antc.uoregon.edu) +# +# $Id: Makefile,v 1.2 2000/02/25 06:32:22 itojun Exp $ +# +# +#Part of this program has been derived from PIM sparse-mode pimd. +#The pimd program is covered by the license in the accompanying file +#named "LICENSE.pimd". +# +#The pimd program is COPYRIGHT 1998 by University of Southern California. +# +#Part of this program has been derived from mrouted. +#The mrouted program is covered by the license in the accompanying file +#named "LICENSE.mrouted". +# +#The mrouted program is COPYRIGHT 1989 by The Board of Trustees of +#Leland Stanford Junior University. +# +# $FreeBSD$ + +PROG= pim6dd +MAN= pim6dd.conf.5 pim6dd.8 +SRCS= mld6.c mld6_proto.c \ + inet6.c kern.c main.c config.c debug.c routesock.c vers.c callout.c \ + route.c vif.c timer.c mrt.c pim6.c pim6_proto.c trace.c + +CFLAGS+= -DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS + +.include <bsd.prog.mk> diff --git a/usr.sbin/pim6sd/Makefile b/usr.sbin/pim6sd/Makefile new file mode 100644 index 000000000000..e22587abac49 --- /dev/null +++ b/usr.sbin/pim6sd/Makefile @@ -0,0 +1,98 @@ +# Copyright (c) 1999 WIDE Project. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. Neither the name of the project nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +# Copyright (c) 1998 by the University of Oregon. +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software and +# its documentation in source and binary forms for lawful +# purposes and without fee is hereby granted, provided +# that the above copyright notice appear in all copies and that both +# the copyright notice and this permission notice appear in supporting +# documentation, and that any documentation, advertising materials, +# and other materials related to such distribution and use acknowledge +# that the software was developed by the University of Oregon. +# The name of the University of Oregon may not be used to endorse or +# promote products derived from this software without specific prior +# written permission. +# +# THE UNIVERSITY OF OREGON DOES NOT MAKE ANY REPRESENTATIONS +# ABOUT THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE. THIS SOFTWARE IS +# PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, +# INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND +# NON-INFRINGEMENT. +# +# IN NO EVENT SHALL UO, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY +# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT, +# TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH, +# THE USE OR PERFORMANCE OF THIS SOFTWARE. +# +# Other copyrights might apply to parts of this software and are so +# noted when applicable. +# +# +# Questions concerning this software should be directed to +# Kurt Windisch (kurtw@antc.uoregon.edu) +# +# $Id: Makefile,v 1.8 2000/02/25 06:32:22 itojun Exp $ +# +# +#Part of this program has been derived from PIM sparse-mode pimd. +#The pimd program is covered by the license in the accompanying file +#named "LICENSE.pimd". +# +#The pimd program is COPYRIGHT 1998 by University of Southern California. +# +#Part of this program has been derived from mrouted. +#The mrouted program is covered by the license in the accompanying file +#named "LICENSE.mrouted". +# +#The mrouted program is COPYRIGHT 1989 by The Board of Trustees of +#Leland Stanford Junior University. +# +# $FreeBSD$ + +PROG= pim6sd +MAN= pim6stat.1 pim6sd.conf.5 pim6sd.8 +SRCS= mld6.c mld6_proto.c \ + inet6.c kern.c main.c config.c debug.c routesock.c vers.c callout.c \ + route.c vif.c timer.c mrt.c pim6.c pim6_proto.c rp.c crc.c trace.c \ + cfparse.y cftoken.l +SCRIPTS= pim6stat + +CLEANFILES+= lex.yy.c y.tab.h y.tab.c +SRCS+= y.tab.h +y.tab.h: cfparse.y + +CFLAGS+= -I. -I${.CURDIR} +CFLAGS+= -DINET6 -DPIM -DIOCTL_OK_ON_RAW_SOCKET -DHAVE_GETIFADDRS +CFLAGS+= -DHAVE_STDARG_H + +DPADD= ${LIBY} ${LIBL} +LDADD= -ly -ll + +.include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile index 2ea28461d23c..286e20a916cc 100644 --- a/usr.sbin/pkg_install/Makefile +++ b/usr.sbin/pkg_install/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -SUBDIR=lib add create delete info update version +SUBDIR= lib add create delete info update version .if exists(../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) -DISTRIBUTION=crypto -SUBDIR+=sign +DISTRIBUTION= crypto +SUBDIR+= sign .endif .include <bsd.subdir.mk> diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile index 248f21e6c953..b93e0c55fa4f 100644 --- a/usr.sbin/pkg_install/add/Makefile +++ b/usr.sbin/pkg_install/add/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PROG= pkg_add +PROG= pkg_add +SRCS= main.c perform.c futil.c extract.c -CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib +CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -SRCS= main.c perform.c futil.c extract.c - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile index d39f93a1ee7f..b2496100d366 100644 --- a/usr.sbin/pkg_install/create/Makefile +++ b/usr.sbin/pkg_install/create/Makefile @@ -1,12 +1,11 @@ # $FreeBSD$ -PROG= pkg_create +PROG= pkg_create +SRCS= main.c perform.c pl.c -CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib +CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -SRCS= main.c perform.c pl.c - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile index 36b83ba2fafe..9bbaa8a79a39 100644 --- a/usr.sbin/pkg_install/delete/Makefile +++ b/usr.sbin/pkg_install/delete/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -PROG= pkg_delete -CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib +PROG= pkg_delete +SRCS= main.c perform.c + +CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -SRCS= main.c perform.c - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile index 5ca61a5ca91c..d746760078d2 100644 --- a/usr.sbin/pkg_install/info/Makefile +++ b/usr.sbin/pkg_install/info/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -PROG= pkg_info -CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib +PROG= pkg_info +SRCS= main.c perform.c show.c + +CFLAGS+= ${DEBUG} -I${.CURDIR}/../lib DPADD= ${LIBINSTALL} ${LIBFETCH} ${LIBMD} LDADD= ${LIBINSTALL} -lfetch -lmd -SRCS= main.c perform.c show.c - .include <bsd.prog.mk> diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile index 0fb00b2e0700..d8dbc5050ba4 100644 --- a/usr.sbin/pkg_install/lib/Makefile +++ b/usr.sbin/pkg_install/lib/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ LIB= install -SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c \ - deps.c -CFLAGS+= ${DEBUG} NOPROFILE= yes NOPIC= yes +SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c deps.c + +CFLAGS+= ${DEBUG} install: @echo -n diff --git a/usr.sbin/pkg_install/sign/Makefile b/usr.sbin/pkg_install/sign/Makefile index 72a07fbf7388..a7b354c69d2c 100644 --- a/usr.sbin/pkg_install/sign/Makefile +++ b/usr.sbin/pkg_install/sign/Makefile @@ -2,14 +2,13 @@ # $OpenBSD: Makefile.bsd-wrapper,v 1.2 1999/10/07 16:30:32 espie Exp $ PROG= pkg_sign +LINKS= ${BINDIR}/pkg_sign ${BINDIR}/pkg_check +MLINKS= pkg_sign.1 pkg_check.1 SRCS= main.c check.c common.c gzip.c pgp_check.c pgp_sign.c \ sha1.c sign.c stand.c x509.c DPADD= ${LIBINSTALL} ${LIBCRYPTO} LDADD= ${LIBINSTALL} -lcrypto -LINKS= ${BINDIR}/pkg_sign ${BINDIR}/pkg_check -MLINKS= pkg_sign.1 pkg_check.1 - .include <bsd.prog.mk> diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile index 2ce01d3dbd90..24f87a6acfeb 100644 --- a/usr.sbin/pnpinfo/Makefile +++ b/usr.sbin/pnpinfo/Makefile @@ -1,10 +1,12 @@ # $FreeBSD$ -PROG= pnpinfo +.PATH: ${.CURDIR}/../../contrib/pnpinfo -SRCS= pnpinfo.c -CFLAGS+=-I${.CURDIR}/../../sys +PROG= pnpinfo MAN= pnpinfo.8 +SRCS= pnpinfo.c + +CFLAGS+= -I${.CURDIR}/../../sys .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 @@ -14,6 +16,4 @@ CFLAGS+= -DPC98 LDADD+= -lio .endif -.PATH: ${.CURDIR}/../../contrib/pnpinfo - .include <bsd.prog.mk> diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index c4244490c039..ccbe6a6c20dc 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= ppp +MAN= ppp.8 SRCS= acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \ command.c datalink.c deflate.c defs.c exec.c filter.c fsm.c hdlc.c \ iface.c ip.c ipcp.c iplist.c lcp.c link.c log.c lqr.c main.c \ mbuf.c mp.c pap.c physical.c pred.c probe.c prompt.c proto.c route.c \ server.c sig.c slcompress.c sync.c systems.c tcp.c tcpmss.c \ throughput.c timer.c tty.c tun.c udp.c vjcomp.c -LDADD+= -lcrypt -lmd -lutil -lz -DPADD+= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} .if defined(NOSUID) || defined(PPP_NOSUID) BINMODE=554 .else @@ -16,7 +15,9 @@ BINMODE=4554 BINOWN= root .endif BINGRP= network -MAN= ppp.8 + +LDADD= -lcrypt -lmd -lutil -lz +DPADD= ${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ} .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 809f4e829aa8..8da3f50f177b 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -2,7 +2,8 @@ PROG= pppctl MAN= pppctl.8 -LDADD+= -lc_r -ledit -ltermcap -DPADD+= ${LIBC_R} ${LIBEDIT} ${LIBTERMCAP} + +LDADD= -lc_r -ledit -ltermcap +DPADD= ${LIBC_R} ${LIBEDIT} ${LIBTERMCAP} .include <bsd.prog.mk> diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index ebcb5a6d6d8d..b1379c17bdb0 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -1,36 +1,36 @@ # $FreeBSD$ -CFLAGS+= -DHAVE_PATHS_H +# as per handbook policies section +MAINTAINER= peter@freebsd.org PROG= pppd +MAN= pppd.8 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 -MAN= pppd.8 -BINMODE=4555 +BINMODE= 4555 -# as per handbook policies section -MAINTAINER= peter@freebsd.org +CFLAGS+= -DHAVE_PATHS_H LDADD= -lcrypt -lutil -lmd DPADD= ${LIBCRYPT} ${LIBUTIL} ${LIBMD} # Support SPX/IPX - not quite ready -#CFLAGS+=-DIPX_CHANGE +#CFLAGS+= -DIPX_CHANGE #SRCS+= ipxcp.c # Callback Control Protocol -CFLAGS+=-DCBCP_SUPPORT +CFLAGS+= -DCBCP_SUPPORT SRCS+= cbcp.c # Filter support -CFLAGS+=-DPPP_FILTER +CFLAGS+= -DPPP_FILTER LDADD+= -lpcap DPADD+= ${LIBPCAP} # MS-CHAP support. Requires the DES library. .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto -CFLAGS+=-DCHAPMS +CFLAGS+= -DCHAPMS SRCS+= chap_ms.c LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} diff --git a/usr.sbin/pppstats/Makefile b/usr.sbin/pppstats/Makefile index 121023b3d0fa..0aab78b2d57a 100644 --- a/usr.sbin/pppstats/Makefile +++ b/usr.sbin/pppstats/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -PROG= pppstats -MAN= pppstats.8 - #as per policies in handbook MAINTAINER= peter@freebsd.org +PROG= pppstats +MAN= pppstats.8 + .include <bsd.prog.mk> diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 1e7074a509da..5ed8869aa6c5 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -3,13 +3,14 @@ MAINTAINER= gshapiro@FreeBSD.org -SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail -.PATH: ${SENDMAIL_DIR}/praliases +SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail +.PATH: ${SENDMAIL_DIR}/praliases PROG= praliases MAN= praliases.8 -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -CFLAGS+=-DNEWDB -DNOT_SENDMAIL + +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+= -DNEWDB -DNOT_SENDMAIL .if exists(${.OBJDIR}/../../lib/libsmdb) LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb @@ -29,9 +30,9 @@ DPADD= ${LIBSMDB} ${LIBSMUTIL} LDADD= ${LIBSMDB} ${LIBSMUTIL} # User customizations to the sendmail build environment -CFLAGS+=${SENDMAIL_CFLAGS} -DPADD+=${SENDMAIL_DPADD} -LDADD+=${SENDMAIL_LDADD} +CFLAGS+= ${SENDMAIL_CFLAGS} LDFLAGS+=${SENDMAIL_LDFLAGS} +DPADD+= ${SENDMAIL_DPADD} +LDADD+= ${SENDMAIL_LDADD} .include <bsd.prog.mk> diff --git a/usr.sbin/prefix/Makefile b/usr.sbin/prefix/Makefile index 69bd0e323a51..fe8e76cbd0be 100644 --- a/usr.sbin/prefix/Makefile +++ b/usr.sbin/prefix/Makefile @@ -1,6 +1,6 @@ -# From: @(#)Makefile 8.1 (Berkeley) 6/5/93 +# @(#)Makefile 8.1 (Berkeley) 6/5/93 # $Id: Makefile,v 1.1.1.1 1999/08/08 23:31:13 itojun Exp $ -# $FreeBSD$ +# $FreeBSD$ MAN= prefix.8 diff --git a/usr.sbin/procctl/Makefile b/usr.sbin/procctl/Makefile index 66193a6e2dfc..5cb35e707371 100644 --- a/usr.sbin/procctl/Makefile +++ b/usr.sbin/procctl/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= procctl -WARNS?= 2 MAN= procctl.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index b96e3918564c..92bcc5e74584 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -2,12 +2,13 @@ # $FreeBSD$ PROG= pstat +LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo +MAN= pstat.8 +MLINKS= pstat.8 swapinfo.8 BINGRP= kmem -BINMODE=2555 +BINMODE= 2555 + DPADD= ${LIBKVM} LDADD= -lkvm -MAN= pstat.8 -LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo -MLINKS= pstat.8 swapinfo.8 .include <bsd.prog.mk> diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile index 65263531d732..630ba6008233 100644 --- a/usr.sbin/pw/Makefile +++ b/usr.sbin/pw/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PROG= pw +MAN= pw.conf.5 pw.8 SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \ grupd.c pwupd.c fileupd.c edgroup.c psdate.c \ bitmap.c cpdir.c rm_r.c -MAN= pw.conf.5 pw.8 - -#RND= -DUSE_MD5RAND LDADD= -lcrypt -lutil DPADD= ${LIBCRYPT} ${LIBUTIL} diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index a4b518bc6bd1..7616629b2b09 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -1,11 +1,12 @@ -# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ -.PATH: ${.CURDIR}/../../lib/libc/gen # for pw_scan.c -CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h +.PATH: ${.CURDIR}/../../lib/libc/gen # for pw_scan.c PROG= pwd_mkdb -SRCS= pw_scan.c pwd_mkdb.c MAN= pwd_mkdb.8 +SRCS= pw_scan.c pwd_mkdb.c + +CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h .include <bsd.prog.mk> diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile index 222840b75db1..984008cf8e80 100644 --- a/usr.sbin/quotaon/Makefile +++ b/usr.sbin/quotaon/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PROG= quotaon +LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff MAN= quotaon.8 MLINKS= quotaon.8 quotaoff.8 -LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff .include <bsd.prog.mk> diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile index 44caa41dc0c6..e94ad62869fb 100644 --- a/usr.sbin/rarpd/Makefile +++ b/usr.sbin/rarpd/Makefile @@ -4,9 +4,9 @@ PROG= rarpd MAN= rarpd.8 -CFLAGS+= -DTFTP_DIR=\"/tftpboot\" WARNS?= 2 # This breaks with format strings returned by expand_syslog_m().. argh! #FORMAT_AUDIT?= 1 +CFLAGS+= -DTFTP_DIR=\"/tftpboot\" .include <bsd.prog.mk> diff --git a/usr.sbin/raycontrol/Makefile b/usr.sbin/raycontrol/Makefile index c2925ba96d8d..50e747277f80 100644 --- a/usr.sbin/raycontrol/Makefile +++ b/usr.sbin/raycontrol/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ + PROG= raycontrol MAN= raycontrol.8 -CFLAGS+=-I${.CURDIR}/../../sys +CFLAGS+= -I${.CURDIR}/../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile index 10cb4603ff24..51438a18abc1 100644 --- a/usr.sbin/rip6query/Makefile +++ b/usr.sbin/rip6query/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.7 1995/03/18 14:56:21 cgd Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ PROG= rip6query -WARNS?= 2 MAN= rip6query.8 -CFLAGS+=-DINET6 -I${.CURDIR}/../route6d +WARNS?= 2 +CFLAGS+= -DINET6 -I${.CURDIR}/../route6d .include <bsd.prog.mk> diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile index d7975cc0c273..817cd7ae0df3 100644 --- a/usr.sbin/route6d/Makefile +++ b/usr.sbin/route6d/Makefile @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD$ +# $FreeBSD$ PROG= route6d MAN= route6d.8 -CFLAGS+= -Dss_len=__ss_len -Dss_family=__ss_family -DINET6 \ - -DHAVE_GETIFADDRS +CFLAGS+= -Dss_len=__ss_len -Dss_family=__ss_family -DINET6 -DHAVE_GETIFADDRS .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile index fad4a769f73d..00864cfe7575 100644 --- a/usr.sbin/rpc.lockd/Makefile +++ b/usr.sbin/rpc.lockd/Makefile @@ -1,10 +1,10 @@ -# $FreeBSD$ # $NetBSD: Makefile,v 1.12 2000/08/07 16:23:31 thorpej Exp $ +# $FreeBSD$ PROG= rpc.lockd -SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c MAN= rpc.lockd.8 MLINKS= rpc.lockd.8 lockd.8 +SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index d35762fa035d..0eedee55bd51 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -PROG = rpc.statd -SRCS = file.c sm_inter_svc.c sm_inter.h statd.c procs.c -MAN = rpc.statd.8 +PROG= rpc.statd +MAN= rpc.statd.8 +SRCS= file.c sm_inter_svc.c sm_inter.h statd.c procs.c + +CFLAGS+= -I. DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc -CFLAGS+= -I. - CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile index 211a69a02be5..1ea7fe6e1401 100644 --- a/usr.sbin/rpc.umntall/Makefile +++ b/usr.sbin/rpc.umntall/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= rpc.umntall -SRCS= rpc.umntall.c mounttab.c MAN= rpc.umntall.8 +SRCS= rpc.umntall.c mounttab.c .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 8b7aebf9e6c6..56ae0d16a1f3 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -1,18 +1,17 @@ # $FreeBSD$ +RPCDIR= ${DESTDIR}/usr/include/rpcsvc + +.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ + ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} + PROG= rpc.yppasswdd +MAN= rpc.yppasswdd.8 SRCS= pw_copy.c pw_util.c util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS} GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \ yppasswd_private_xdr.c yppasswd_svc.c -RPCDIR= ${DESTDIR}/usr/include/rpcsvc - -.PATH: ${.CURDIR}/../../usr.sbin/ypserv ${.CURDIR}/../../usr.bin/chpass \ - ${.CURDIR}/../../libexec/ypxfr ${RPCDIR} - -MAN= 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. @@ -22,7 +21,7 @@ LDADD= -lrpcsvc -lcrypt CLEANFILES= ${GENSRCS} -RPCGEN= rpcgen -I -C +RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that # yppasswdd_main.c can see it. @@ -58,7 +57,7 @@ yppasswd_private_svc.c: yppasswd_private.x afterinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/yppwupdate \ - ${DESTDIR}/usr/libexec/yppwupdate + ${.CURDIR}/yppwupdate \ + ${DESTDIR}/usr/libexec/yppwupdate .include <bsd.prog.mk> diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index 5b245758b7f4..78dec492c7a7 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -1,19 +1,14 @@ # $FreeBSD$ +.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr + PROG= rpc.ypupdated +NOMAN= yes SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c -.PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr - -RPCDIR= ${DESTDIR}/usr/include/rpcsvc - -NOMAN= yes - -CFLAGS+= -I${.CURDIR}/../ypserv -I. -CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr - +CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr #CFLAGS+= -DYP DPADD= ${LIBRPCSVC} @@ -21,6 +16,7 @@ LDADD= -lrpcsvc CLEANFILES= ypupdate_prot_svc.c ypupdate_prot.h +RPCDIR= ${DESTDIR}/usr/include/rpcsvc RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile index 57590321ab19..70729b12e67d 100644 --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ +.PATH: ${.CURDIR}/../../usr.sbin/ypserv + PROG= rpc.ypxfrd +MAN= rpc.ypxfrd.8 SRCS= ypxfrd_svc.c ypxfrd.h ypxfrd_server.c yp_error.c \ yp_access.c ypxfrd_main.c -RPCDIR= ${.CURDIR}/../../include/rpcsvc - -.PATH: ${.CURDIR}/../../usr.sbin/ypserv - -MAN= rpc.ypxfrd.8 - CFLAGS+= -I. -DXFRBLOCKSIZE=65535 DPADD= ${LIBRPCSVC} @@ -17,6 +14,7 @@ LDADD= -lrpcsvc CLEANFILES= ypxfrd_svc.c ypxfrd.h +RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile index 1a4617ad49ea..ba5099296db9 100644 --- a/usr.sbin/rpcbind/Makefile +++ b/usr.sbin/rpcbind/Makefile @@ -1,21 +1,21 @@ # $NetBSD: Makefile,v 1.3 2000/06/20 13:56:43 fvdl Exp $ -# $FreeBSD$ +# $FreeBSD$ + +LIBCDIR= ${.CURDIR}/../../lib/libc +LIBCRPCDIR= ${LIBCDIR}/rpc +LIBCINCLUDE= ${LIBCDIR}/include + +.PATH: ${LIBCRPCDIR} PROG= rpcbind -CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP MAN= 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 -LIBCDIR= ${.CURDIR}/../../lib/libc -LIBCRPCDIR= ${LIBCDIR}/rpc -LIBCINCLUDE= ${LIBCDIR}/include - - -LDADD+= -lwrap -lutil -DPADD+= ${LIBWRAP} ${LIBUTIL} +CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP -.PATH: ${LIBCRPCDIR} +LDADD= -lwrap -lutil +DPADD= ${LIBWRAP} ${LIBUTIL} .include <bsd.prog.mk> diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile index 17922114fef5..21a948920668 100644 --- a/usr.sbin/rrenumd/Makefile +++ b/usr.sbin/rrenumd/Makefile @@ -11,19 +11,21 @@ # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. +# # $FreeBSD$ PROG= rrenumd +MAN= rrenumd.conf.5 rrenumd.8 SRCS= rrenumd.c parser.y lexer.l -YFLAGS+= -d CFLAGS+= -DINET6 -DIPSEC -I. -I${.CURDIR} +YFLAGS= -d + LDADD= -lipsec -lcompat -ll -ly DPADD= ${LIBIPSEC} ${LIBCOMPAT} ${LIBL} ${LIBY} -MAN= rrenumd.conf.5 rrenumd.8 - -SRCS+=y.tab.h +CLEANFILES= y.tab.h +SRCS+= y.tab.h y.tab.h: parser.y .if defined(YACCDEBUG) @@ -32,5 +34,3 @@ YFLAGS+= -t -v .endif .include <bsd.prog.mk> - -CLEANFILES+= y.tab.h diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile index 9b0aa5f82f5a..5b935fa53935 100644 --- a/usr.sbin/rtadvd/Makefile +++ b/usr.sbin/rtadvd/Makefile @@ -11,15 +11,16 @@ # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. +# # $FreeBSD$ PROG= rtadvd +MAN= rtadvd.conf.5 rtadvd.8 SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c -CFLAGS+=-DINET6 -LDADD+= -lcompat -DPADD+= ${LIBCOMPAT} +CFLAGS+= -DINET6 -MAN= rtadvd.conf.5 rtadvd.8 +LDADD= -lcompat +DPADD= ${LIBCOMPAT} .include <bsd.prog.mk> diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile index a677ba51e9d1..eb9b90501ebb 100644 --- a/usr.sbin/rtsold/Makefile +++ b/usr.sbin/rtsold/Makefile @@ -11,13 +11,17 @@ # AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT # LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # A PARTICULAR PURPOSE. +# # $FreeBSD$ PROG= rtsold -SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c -CFLAGS+=-DINET6 -DHAVE_GETIFADDRS - MAN= rtsold.8 MLINKS= rtsold.8 rtsol.8 +SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c + +CFLAGS+= -DINET6 -DHAVE_GETIFADDRS + +LDADD= -lkvm +DPADD= ${LIBKVM} .include <bsd.prog.mk> diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index de460069d1a9..7036003aa92b 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -2,10 +2,6 @@ PROG= sysinstall MAN= sysinstall.8 - -CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist -CLEANFILES+= keymap.tmp keymap.h - SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \ disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \ ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \ @@ -22,6 +18,9 @@ CFLAGS+= -DPC98 DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio +CLEANFILES= makedevs.c rtermcap rtermcap.tmp dumpnlist +CLEANFILES+= keymap.tmp keymap.h + makedevs.c: Makefile rtermcap rm -f makedevs.tmp echo '#include <sys/types.h>' > makedevs.tmp @@ -74,7 +73,6 @@ build-tools: rtermcap rtermcap: rtermcap.c ${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap - .if ${MACHINE} == "pc98" KEYMAPS= jp.pc98 jp.pc98.iso .else diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 6bb35f96e637..9aeab03ff6e9 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -5,34 +5,32 @@ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src -.PATH: ${SMDIR} +.PATH: ${SMDIR} BINDIR= /usr/libexec/sendmail PROG= sendmail +MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 +SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \ + convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \ + macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \ + readcf.c recipient.c savemail.c sfsasl.c shmticklib.c srvrsmtp.c \ + stab.c stats.c sysexits.c timers.c trace.c udb.c usersmtp.c util.c \ + version.c +BINMODE=4555 # Define the database format to use for aliases et al. DBMDEF= -DNEWDB - # If you don't want NIS alias/map support, comment out this line NIS= -DNIS - # Map extensions MAPS= -DMAP_REGEX -CFLAGS+=-I${SMDIR} -I${SENDMAIL_DIR}/include -CFLAGS+=${DBMDEF} ${NIS} -DNETINET6 -DTCPWRAPPERS ${MAPS} +CFLAGS+= -I${SMDIR} -I${SENDMAIL_DIR}/include +CFLAGS+= ${DBMDEF} ${NIS} -DNETINET6 -DTCPWRAPPERS ${MAPS} -SRCS= alias.c arpadate.c bf_torek.c clock.c collect.c conf.c control.c \ - convtime.c daemon.c deliver.c domain.c envelope.c err.c headers.c \ - macro.c main.c map.c mci.c milter.c mime.c parseaddr.c queue.c \ - readcf.c recipient.c savemail.c sfsasl.c shmticklib.c srvrsmtp.c \ - stab.c stats.c sysexits.c timers.c trace.c udb.c usersmtp.c util.c \ - version.c DPADD= ${LIBUTIL} ${LIBWRAP} LDADD= -lutil -lwrap -MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 -BINMODE=4555 .if exists(${.OBJDIR}/../../lib/libsmutil) LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil diff --git a/usr.sbin/setextattr/Makefile b/usr.sbin/setextattr/Makefile index f8ee62f3ca55..cbfbfddd665a 100644 --- a/usr.sbin/setextattr/Makefile +++ b/usr.sbin/setextattr/Makefile @@ -2,6 +2,7 @@ PROG= setextattr MAN= setextattr.8 + DPADD= ${LIBUTIL} LDADD= -lutil diff --git a/usr.sbin/setkey/Makefile b/usr.sbin/setkey/Makefile index 0ce9f7730a47..b66bc464e289 100644 --- a/usr.sbin/setkey/Makefile +++ b/usr.sbin/setkey/Makefile @@ -24,32 +24,35 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +# # $FreeBSD$ PROG= setkey +MAN= setkey.8 SRCS= setkey.c parse.y token.l -CFLAGS+=-g + CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec +YFLAGS= -d + DPADD= ${LIBL} ${LIBY} LDADD= -ll -ly -CLEANFILES+= y.tab.c y.tab.h key_test.o keytest -YFLAGS+=-d + +CLEANFILES= y.tab.c y.tab.h key_test.o keytest # libpfkey. # ipsec_strerror.c is for avoiding shlib reference to non-exported function. .PATH: ${.CURDIR}/../../lib/libipsec ${.CURDIR}/../../sys/netkey SRCS+= pfkey.c pfkey_dump.c key_debug.c ipsec_strerror.c -CFLAGS+=-I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey +CFLAGS+= -I${.CURDIR}/../../lib/libipsec -I${.CURDIR}/../../sys/netkey -SRCS+=y.tab.h +SRCS+= y.tab.h y.tab.h: parse.y -CFLAGS+=-DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. +CFLAGS+= -DIPSEC_DEBUG -DINET6 -DYY_NO_UNPUT -I. DPADD+= ${LIBIPSEC} LDADD+= -lipsec CLEANFILES+= scriptdump y.tab.h -SCRIPTS=scriptdump -MAN= setkey.8 +SCRIPTS= scriptdump LOCALPREFIX= /usr diff --git a/usr.sbin/sicontrol/Makefile b/usr.sbin/sicontrol/Makefile index 8466b1f749dc..2f3a8883ba41 100644 --- a/usr.sbin/sicontrol/Makefile +++ b/usr.sbin/sicontrol/Makefile @@ -2,6 +2,7 @@ PROG= sicontrol MAN= sicontrol.8 + CFLAGS+= -I${.CURDIR}/../../sys .include <bsd.prog.mk> diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile index 103a0354c7f3..c2515e0c117e 100644 --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -2,6 +2,7 @@ PROG= spray MAN= spray.8 + DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/usr.sbin/stallion/stlload/Makefile b/usr.sbin/stallion/stlload/Makefile index 7302b0f2f439..d53e932cfce5 100644 --- a/usr.sbin/stallion/stlload/Makefile +++ b/usr.sbin/stallion/stlload/Makefile @@ -4,6 +4,6 @@ PROG= stlload MAN= stlload.8 MANSUBDIR=/i386 -CFLAGS+=-DBOOTDIR=\"${BOOTDIR}\" +CFLAGS+= -DBOOTDIR=\"${BOOTDIR}\" .include <bsd.prog.mk> diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index de460069d1a9..7036003aa92b 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -2,10 +2,6 @@ PROG= sysinstall MAN= sysinstall.8 - -CLEANFILES+= makedevs.c rtermcap rtermcap.tmp dumpnlist -CLEANFILES+= keymap.tmp keymap.h - SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \ disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \ ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \ @@ -22,6 +18,9 @@ CFLAGS+= -DPC98 DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio +CLEANFILES= makedevs.c rtermcap rtermcap.tmp dumpnlist +CLEANFILES+= keymap.tmp keymap.h + makedevs.c: Makefile rtermcap rm -f makedevs.tmp echo '#include <sys/types.h>' > makedevs.tmp @@ -74,7 +73,6 @@ build-tools: rtermcap rtermcap: rtermcap.c ${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap - .if ${MACHINE} == "pc98" KEYMAPS= jp.pc98 jp.pc98.iso .else diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index f7b3166cc156..91a48ae35f18 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -1,10 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../../usr.bin/wall + PROG= syslogd -SRCS= syslogd.c ttymsg.c -.PATH: ${.CURDIR}/../../usr.bin/wall MAN= syslog.conf.5 syslogd.8 +SRCS= syslogd.c ttymsg.c + COPTS+= -DINET6 .include <bsd.prog.mk> diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile index 9f9b715b9fcd..fa33290e582d 100644 --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -1,8 +1,8 @@ -# # $FreeBSD$ -# -MAINTAINER=markm@FreeBSD.org +MAINTAINER= markm@FreeBSD.org + +.PATH: ${.CURDIR}/../../contrib/tcp_wrappers PROG= tcpdchk MAN= tcpdchk.8 @@ -18,6 +18,4 @@ CFLAGS+=-DINET6 DPADD= ${LIBWRAP} LDADD= -lwrap -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers - .include <bsd.prog.mk> diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile index cc497d3a303f..6bc67dcb5c3e 100644 --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -1,8 +1,8 @@ -# # $FreeBSD$ -# -MAINTAINER=markm@FreeBSD.org +MAINTAINER= markm@FreeBSD.org + +.PATH: ${.CURDIR}/../../contrib/tcp_wrappers PROG= tcpdmatch MAN= tcpdmatch.8 @@ -17,6 +17,4 @@ CFLAGS+=-DINET6 DPADD= ${LIBWRAP} LDADD= -lwrap -.PATH: ${.CURDIR}/../../contrib/tcp_wrappers - .include <bsd.prog.mk> diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index 0a1f2533744b..c549530613bd 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 0.1 (RGrimes) 4/4/93 +# $FreeBSD$ SUBDIR= tcpdump tcpslice diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc index 26c6f1c71ba1..1e4d46f113a5 100644 --- a/usr.sbin/tcpdump/Makefile.inc +++ b/usr.sbin/tcpdump/Makefile.inc @@ -1,3 +1,4 @@ # @(#)Makefile.inc 5.1 (Berkeley) 5/11/90 +# $FreeBSD$ BINDIR?= /usr/sbin diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 1101aec02843..05f9253288a9 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -24,16 +24,18 @@ SRCS= addrtoname.c gmt2local.c machdep.c parsenfsfh.c \ print-vjc.c print-vrrp.c print-wb.c \ savestr.c setsignal.c smbutil.c tcpdump.c util.c version.c CLEANFILES+= version.c + CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDIR}/lbl CFLAGS+= -DHAVE_CONFIG_H + .if !defined(NOINET6) -CFLAGS+= -DINET6 SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c \ print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c +CFLAGS+= -DINET6 .endif -DPADD+= ${LIBL} ${LIBPCAP} -LDADD+= -ll -lpcap +DPADD= ${LIBL} ${LIBPCAP} +LDADD= -ll -lpcap .if exists(../../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && \ !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) DISTRIBUTION=crypto diff --git a/usr.sbin/tcpdump/tcpslice/Makefile b/usr.sbin/tcpdump/tcpslice/Makefile index 4d996bfd71b9..2c444596a8ee 100644 --- a/usr.sbin/tcpdump/tcpslice/Makefile +++ b/usr.sbin/tcpdump/tcpslice/Makefile @@ -6,10 +6,11 @@ TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump PROG= tcpslice SRCS= gwtm2secs.c search.c tcpslice.c util.c version.c version.h CLEANFILES= version.c version.h + CFLAGS+= -I. -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +DPADD= ${LIBPCAP} +LDADD= -lpcap .ORDER: version.c version.h version.c version.h: ${TCPDUMP_DISTDIR}/VERSION diff --git a/usr.sbin/timed/Makefile b/usr.sbin/timed/Makefile index a89ab16ba162..2f56510bca1c 100644 --- a/usr.sbin/timed/Makefile +++ b/usr.sbin/timed/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ SUBDIR= timed timedc diff --git a/usr.sbin/timed/SMM.doc/timed/Makefile b/usr.sbin/timed/SMM.doc/timed/Makefile index 22ff6e649864..9afa6c60d4d4 100644 --- a/usr.sbin/timed/SMM.doc/timed/Makefile +++ b/usr.sbin/timed/SMM.doc/timed/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 +# $FreeBSD$ DIR= smm/12.timed SRCS= timed.ms diff --git a/usr.sbin/timed/SMM.doc/timedop/Makefile b/usr.sbin/timed/SMM.doc/timedop/Makefile index ae4385047c88..7d52a32220c1 100644 --- a/usr.sbin/timed/SMM.doc/timedop/Makefile +++ b/usr.sbin/timed/SMM.doc/timedop/Makefile @@ -1,4 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 +# $FreeBSD$ DIR= smm/11.timedop SRCS= timed.ms diff --git a/usr.sbin/timed/timed/Makefile b/usr.sbin/timed/timed/Makefile index 92206f84f34a..6f73824fbd74 100644 --- a/usr.sbin/timed/timed/Makefile +++ b/usr.sbin/timed/timed/Makefile @@ -4,11 +4,12 @@ # optional flags are: MEASURE TESTING DEBUG PROG= timed +MAN= timed.8 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 -MAN= timed.8 .include "../../Makefile.inc" .include <bsd.prog.mk> diff --git a/usr.sbin/timed/timedc/Makefile b/usr.sbin/timed/timedc/Makefile index 0adc501d8ea5..6963a570b495 100644 --- a/usr.sbin/timed/timedc/Makefile +++ b/usr.sbin/timed/timedc/Makefile @@ -1,11 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ +.PATH: ${.CURDIR}/../timed + PROG= timedc -SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c MAN= timedc.8 -BINMODE=4555 -.PATH: ${.CURDIR}/../timed +SRCS= cmds.c cmdtab.c timedc.c byteorder.c measure.c cksum.c +BINMODE= 4555 .include "../../Makefile.inc" .include <bsd.prog.mk> diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 8fab2a14dd4d..6e22227a68f4 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,38 +1,40 @@ # $FreeBSD$ +TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute +.PATH: ${TRACEROUTE_DISTDIR} + PROG= traceroute MAN= traceroute.8 +SRCS= version.c traceroute.c BINMODE=4555 -CFLAGS+=-DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \ - -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ - -DSTDC_HEADERS=1 +CLEANFILES= version.c + +CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SYSCTL_H=1 \ + -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ + -DSTDC_HEADERS=1 .ifndef (NOIPSEC) -CFLAGS+=-DIPSEC +CFLAGS+= -DIPSEC .endif # RTT Jitter on the internet these days means printing 3 decimal places on # > 1000ms times is plain useless. Uncomment this to enable variable precision # reporting, ie: print a variable precision from 0.001ms through 1000ms -# CFLAGS+=-DSANE_PRECISION +# CFLAGS+= -DSANE_PRECISION -SRCS= version.c traceroute.c -CLEANFILES+= version.c .ifndef (NOIPSEC) DPADD= ${LIBIPSEC} LDADD= -lipsec .endif -TRACEROUTE_DISTDIR?= ${.CURDIR}/../../contrib/traceroute - .if ${MACHINE_ARCH} == "alpha" # gcc builtin memcpy causes unaligned access -CFLAGS+= -fno-builtin +CFLAGS+= -fno-builtin .endif -CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl -.PATH: ${TRACEROUTE_DISTDIR} +CFLAGS+= -I${TRACEROUTE_DISTDIR}/lbl version.c: ${TRACEROUTE_DISTDIR}/VERSION @rm -f ${.TARGET} - sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION > ${.TARGET} + sed -e 's/.*/char version[] = "&";/' ${TRACEROUTE_DISTDIR}/VERSION \ + > ${.TARGET} .include <bsd.prog.mk> diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile index ab485742662d..349a5bf9e50f 100644 --- a/usr.sbin/traceroute6/Makefile +++ b/usr.sbin/traceroute6/Makefile @@ -14,15 +14,14 @@ # $FreeBSD$ PROG= traceroute6 - +MAN= traceroute6.8 BINOWN= root BINGRP= bin -BINMODE=4555 +BINMODE= 4555 + +CFLAGS+= -DINET6 -DIPSEC -DHAVE_POLL -CFLAGS+=-DINET6 -DIPSEC -DHAVE_POLL DPADD= ${LIBIPSEC} LDADD= -lipsec -MAN= traceroute6.8 - .include <bsd.prog.mk> diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile index 1f18d38d3c28..dff5bc8a4663 100644 --- a/usr.sbin/trpt/Makefile +++ b/usr.sbin/trpt/Makefile @@ -1,10 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD$ +# $FreeBSD$ PROG= trpt MAN= trpt.8 BINGRP= kmem -BINMODE=2555 -CFLAGS+=-DINET6 +BINMODE= 2555 + +CFLAGS+= -DINET6 .include <bsd.prog.mk> diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index e074b32399ef..7b557cfb9359 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -2,8 +2,10 @@ PROG= tzsetup MAN= tzsetup.8 + CFLAGS+= -I${.CURDIR} -LDADD+= -ldialog -lncurses -DPADD+= ${LIBDIALOG} ${LIBNCURSES} + +LDADD= -ldialog -lncurses +DPADD= ${LIBDIALOG} ${LIBNCURSES} .include <bsd.prog.mk> diff --git a/usr.sbin/usbdevs/Makefile b/usr.sbin/usbdevs/Makefile index 2442e40c1fae..985bc7a61ab5 100644 --- a/usr.sbin/usbdevs/Makefile +++ b/usr.sbin/usbdevs/Makefile @@ -2,7 +2,8 @@ # FreeBSD $FreeBSD$ PROG= usbdevs -WARNS?= 2 MAN= usbdevs.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile index 0efd0fdbf7af..8e3ba6af836b 100644 --- a/usr.sbin/vipw/Makefile +++ b/usr.sbin/vipw/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= vipw -SRCS= pw_util.c vipw.c MAN= vipw.8 +SRCS= pw_util.c vipw.c .include <bsd.prog.mk> diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile index 5f80f85bc2dc..c7aa34bfb706 100644 --- a/usr.sbin/vnconfig/Makefile +++ b/usr.sbin/vnconfig/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= vnconfig -NOMAN= "mdconfig supplies manpage" +PROG= vnconfig +NOMAN= "mdconfig supplies manpage" .include <bsd.prog.mk> diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index 7dc34a40e4bc..2718d1649e4e 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -1,9 +1,11 @@ # $FreeBSD$ PROG= watch -WARNS?= 2 MAN= watch.8 -LDADD+= -ltermcap -DPADD+= ${LIBTERMCAP} + +WARNS?= 2 + +LDADD= -ltermcap +DPADD= ${LIBTERMCAP} .include <bsd.prog.mk> diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile index ea3c1ef5f3ac..4036db58664f 100644 --- a/usr.sbin/wicontrol/Makefile +++ b/usr.sbin/wicontrol/Makefile @@ -1,4 +1,5 @@ # $FreeBSD$ + PROG= wicontrol MAN= wicontrol.8 diff --git a/usr.sbin/wlconfig/Makefile b/usr.sbin/wlconfig/Makefile index ecb3224c85ac..0cd34c096c00 100644 --- a/usr.sbin/wlconfig/Makefile +++ b/usr.sbin/wlconfig/Makefile @@ -1,4 +1,5 @@ # $FreeBSD$ + PROG= wlconfig MAN= wlconfig.8 diff --git a/usr.sbin/xten/Makefile b/usr.sbin/xten/Makefile index a86f58632a12..0475200f36f0 100644 --- a/usr.sbin/xten/Makefile +++ b/usr.sbin/xten/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PROG= xten + CFLAGS+= -I${.CURDIR}/../../libexec/xtend .include <bsd.prog.mk> diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index a3bb567ebcf8..54cc30cad574 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -1,11 +1,10 @@ # $FreeBSD$ -PROG= yp_mkdb -SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c +.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv +PROG= yp_mkdb MAN= yp_mkdb.8 - -.PATH: ${.CURDIR}/../../libexec/ypxfr ${.CURDIR}/../ypserv +SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c CFLAGS+= -Dyp_error=warnx -I${.CURDIR}/../../libexec/ypxfr CFLAGS+= -I${.CURDIR}/../../usr.sbin/ypserv diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile index 45fb7891b7bc..915d001be4dc 100644 --- a/usr.sbin/ypbind/Makefile +++ b/usr.sbin/ypbind/Makefile @@ -1,9 +1,10 @@ # from: @(#)Makefile 5.8 (Berkeley) 7/28/90 # $FreeBSD$ -SRCS= ypbind.c yp_ping.c PROG= ypbind MAN= ypbind.8 -CFLAGS+=-DDAEMON +SRCS= ypbind.c yp_ping.c + +CFLAGS+= -DDAEMON .include <bsd.prog.mk> diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index 5c82935844e9..7ce1c612e0e0 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -1,20 +1,19 @@ # $FreeBSD$ +RPCDIR= ${.CURDIR}/../../include/rpcsvc +.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ + ${.CURDIR}/../../libexec/ypxfr + PROG= yppush +MAN= yppush.8 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 -MAN= yppush.8 +CFLAGS+= -I. -I${.CURDIR}/../../libexec/ypxfr -CFLAGS+=-I. -I${.CURDIR}/../../libexec/ypxfr - -RPCDIR= ${.CURDIR}/../../include/rpcsvc RPCGEN= rpcgen -C -.PATH: ${RPCDIR} ${.CURDIR}/../../usr.sbin/ypserv \ - ${.CURDIR}/../../libexec/ypxfr - CLEANFILES= ${GENSRCS} yppush_svc.c: yp.x diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 9de9bdcc1cde..214b9958603f 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,18 +1,17 @@ # $FreeBSD$ +RPCDIR= ${.CURDIR}/../../include/rpcsvc +.PATH: ${RPCDIR} + PROG= ypserv +MAN= ypserv.8 ypinit.8 SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c -MAN= ypserv.8 ypinit.8 - CFLAGS+= -I. -DDB_CACHE CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h -RPCDIR= ${.CURDIR}/../../include/rpcsvc -.PATH: ${RPCDIR} - RPCGEN= rpcgen -I -C # We need to remove the 'static' keyword from _rpcsvcstate so that diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile index 2088d1871f18..620d8b00c11d 100644 --- a/usr.sbin/zic/zdump/Makefile +++ b/usr.sbin/zic/zdump/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR}/.. PROG= zdump - -SRCS= zdump.c ialloc.c scheck.c MAN= ${.CURDIR}/../zdump.8 +SRCS= zdump.c ialloc.c scheck.c + 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 5980252b3a6d..8f3c622c5710 100644 --- a/usr.sbin/zic/zic/Makefile +++ b/usr.sbin/zic/zic/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/.. +.PATH: ${.CURDIR}/.. PROG= zic - -SRCS= zic.c ialloc.c scheck.c MAN= ${.CURDIR}/../zic.8 +SRCS= zic.c ialloc.c scheck.c + 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 |