Perform a major cleanup of the usr.sbin Makefiles.

These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.

15 files changed, 65 insertions, 61 deletions

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>
-