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.

11 files changed, 49 insertions, 83 deletions

diff --git a/usr.sbin/ntp/Makefile b/usr.sbin/ntp/Makefile
index 4c676df..04349e2 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 d815266..8b8a199 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 245cc53..498e250 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 dd0b645..0e28830 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 fd1e393..766ad47 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 22c7cf0..af0db44 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 97756af..8a37ae1 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 29f16e0..17d5545 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 6d57ec2..9e14c38 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 7e2dc93..240e516 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 9bb0bde..297339f 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}