diff --git a/usr.sbin/altq/libaltq/Makefile b/usr.sbin/altq/libaltq/Makefile
index 31c6bc4b6e9b..884f93d1de58 100644
--- a/usr.sbin/altq/libaltq/Makefile
+++ b/usr.sbin/altq/libaltq/Makefile
@@ -1,4 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2002/03/05 04:11:53 itojun Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 13:31:52 lukem Exp $
+
+NOLINT=		# defined
+NOPIC=		# defined
+NOPROFILE=	# defined
 
 #WARNS=	2
 
@@ -9,10 +13,6 @@ SRCS=	parser.c qop.c qop_blue.c qop_cbq.c qop_cdnr.c qop_conf.c \
 
 CPPFLAGS+= -DALTQ -DINET6
 
-NOLINT=		# defined
-NOPIC=		# defined
-NOPROFILE=	# defined
-
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/bootp/bootpgw/Makefile b/usr.sbin/bootp/bootpgw/Makefile
index 7ec643cbb463..a3f25af2170e 100644
--- a/usr.sbin/bootp/bootpgw/Makefile
+++ b/usr.sbin/bootp/bootpgw/Makefile
@@ -1,6 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2001/12/12 01:48:49 tv Exp $
+#	$NetBSD: Makefile,v 1.4 2002/09/18 13:31:52 lukem Exp $
 
-PROG=	bootpgw
 NOMAN=	# defined
 
+PROG=	bootpgw
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bootp/common/Makefile b/usr.sbin/bootp/common/Makefile
index c91be7d9660e..90815144ff92 100644
--- a/usr.sbin/bootp/common/Makefile
+++ b/usr.sbin/bootp/common/Makefile
@@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.4 2001/12/12 01:48:49 tv Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 13:31:52 lukem Exp $
+
+NOLINT=		# defined
+NOPIC=		# defined
+NOPROFILE=	# defined
 
 LIB=	common
 SRCS=	dovend.c dumptab.c getif.c hash.c hwaddr.c lookup.c readfile.c \
 	report.c tzone.c
 CPPFLAGS+= -DETC_ETHERS -DSYSLOG -DDEBUG
 
-NOLINT=		# defined
-NOPIC=		# defined
-NOPROFILE=	# defined
-
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/dhcp/clientscript/Makefile b/usr.sbin/dhcp/clientscript/Makefile
index 2e48d2341647..0fb0d6657f43 100644
--- a/usr.sbin/dhcp/clientscript/Makefile
+++ b/usr.sbin/dhcp/clientscript/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/12/12 01:48:49 tv Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/18 13:31:53 lukem Exp $
+
+NOOBJ=	# defined
 
 SCRIPTS=dhclient-script
 SCRIPTSDIR=/sbin
 
-NOOBJ=
-# defined
 .include <bsd.prog.mk>
diff --git a/usr.sbin/dhcp/common/Makefile b/usr.sbin/dhcp/common/Makefile
index 12b2fe04d051..04e3970a80bf 100644
--- a/usr.sbin/dhcp/common/Makefile
+++ b/usr.sbin/dhcp/common/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.20 2001/12/12 01:48:49 tv Exp $
-
-MAN    = dhcp-options.5 dhcp-eval.5
-LIB    = dhcp
-SRCS   = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
-	 lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c options.c \
-	 inet.c tree.c tables.c alloc.c fddi.c ctrace.c \
-	 dns.c resolv.c execute.c discover.c comapi.c
-
-DHCPSRCDIR=	common
+# $NetBSD: Makefile,v 1.21 2002/09/18 13:31:53 lukem Exp $
 
 NOLINT=	# defined
 NOPIC=	# defined
 NOPROFILE=# defined
 
+LIB    = dhcp
+SRCS   = raw.c parse.c nit.c icmp.c dispatch.c conflex.c upf.c bpf.c socket.c \
+	 lpf.c dlpi.c packet.c tr.c ethernet.c memory.c print.c options.c \
+	 inet.c tree.c tables.c alloc.c fddi.c ctrace.c \
+	 dns.c resolv.c execute.c discover.c comapi.c
+MAN    = dhcp-options.5 dhcp-eval.5
+
+DHCPSRCDIR=	common
+
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/dhcp/dhcpctl/Makefile b/usr.sbin/dhcp/dhcpctl/Makefile
index 72a5d9f717cb..61fcc0648c77 100644
--- a/usr.sbin/dhcp/dhcpctl/Makefile
+++ b/usr.sbin/dhcp/dhcpctl/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2001/12/12 01:48:50 tv Exp $
-
-LIB    = dhcpctl
-SRCS   = dhcpctl.c callback.c remote.c
+# $NetBSD: Makefile,v 1.4 2002/09/18 13:31:53 lukem Exp $
 
 NOLINT=	# defined
 NOPIC=	# defined
 NOPROFILE=# defined
 
+LIB    = dhcpctl
+SRCS   = dhcpctl.c callback.c remote.c
+
 DHCPSRCDIR=	dhcpctl
 
 # only needed during build
diff --git a/usr.sbin/dhcp/dst/Makefile b/usr.sbin/dhcp/dst/Makefile
index 71247acc10b2..93b932c48e0e 100644
--- a/usr.sbin/dhcp/dst/Makefile
+++ b/usr.sbin/dhcp/dst/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2001/12/12 01:48:50 tv Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/18 13:31:53 lukem Exp $
+
+NOLINT=	# defined
+NOPIC=	# defined
+NOPROFILE=# defined
 
 LIB    = dst
 SRCS    = dst_support.c dst_api.c hmac_link.c md5_dgst.c base64.c prandom.c
 
 DHCPSRCDIR=	dst
 
-NOLINT=	# defined
-NOPIC=	# defined
-NOPROFILE=# defined
-
 CFLAGS += -DMINIRES_LIB -DHMAC_MD5
 
 # only needed during build
diff --git a/usr.sbin/dhcp/minires/Makefile b/usr.sbin/dhcp/minires/Makefile
index 07aa712df401..22a4f2312822 100644
--- a/usr.sbin/dhcp/minires/Makefile
+++ b/usr.sbin/dhcp/minires/Makefile
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 01:48:50 tv Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/18 13:31:53 lukem Exp $
+
+NOLINT=	# defined
+NOPIC=	# defined
+NOPROFILE=# defined
 
 LIB    = minires
 SRCS   = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \
@@ -8,10 +12,6 @@ SRCS   = res_mkupdate.c res_init.c res_update.c res_send.c res_comp.c \
 
 DHCPSRCDIR=	minires
 
-NOLINT=	# defined
-NOPIC=	# defined
-NOPROFILE=# defined
-
 CFLAGS += -DMINIRES_LIB
 
 # only needed during build
diff --git a/usr.sbin/dhcp/omapip/Makefile b/usr.sbin/dhcp/omapip/Makefile
index e98332cc368c..466117c73f08 100644
--- a/usr.sbin/dhcp/omapip/Makefile
+++ b/usr.sbin/dhcp/omapip/Makefile
@@ -1,4 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/12/12 01:48:50 tv Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/18 13:31:54 lukem Exp $
+
+NOLINT=	# defined
+NOPIC=	# defined
+NOPROFILE=# defined
 
 LIB    = omapi
 SRCS   = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
@@ -8,10 +12,6 @@ SRCS   = protocol.c buffer.c alloc.c result.c connection.c errwarn.c \
 
 DHCPSRCDIR=	omapip
 
-NOLINT=	# defined
-NOPIC=	# defined
-NOPROFILE=# defined
-
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile
index 72d710fd62d9..9d78a1fd8d7e 100644
--- a/usr.sbin/lpr/common_source/Makefile
+++ b/usr.sbin/lpr/common_source/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.7 2001/12/12 01:48:52 tv Exp $
-
-LIB=	common
-SRCS=	common.c common_vars.c displayq.c fatal.c rmjob.c startdaemon.c
+#	$NetBSD: Makefile,v 1.8 2002/09/18 13:31:54 lukem Exp $
 
 NOLINT=		# defined
 NOPIC=		# defined
 NOPROFILE=	# defined
 
+LIB=	common
+SRCS=	common.c common_vars.c displayq.c fatal.c rmjob.c startdaemon.c
+
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile
index d9bded70bfb7..4cae50837de5 100644
--- a/usr.sbin/lpr/filters/Makefile
+++ b/usr.sbin/lpr/filters/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.6 2001/12/12 01:48:52 tv Exp $
+#	$NetBSD: Makefile,v 1.7 2002/09/18 13:31:54 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
-PROG=	lpf
 NOMAN=	# defined
+
+PROG=	lpf
 BINDIR=	/usr/libexec/lpr
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mopd/common/Makefile b/usr.sbin/mopd/common/Makefile
index 37f6f7c0d112..82182a458e00 100644
--- a/usr.sbin/mopd/common/Makefile
+++ b/usr.sbin/mopd/common/Makefile
@@ -1,4 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2001/12/12 01:48:52 tv Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 13:31:54 lukem Exp $
+
+NOLINT=		# defined
+NOPIC=		# defined
+NOPROFILE=	# defined
 
 LIB=	common
 SRCS=	cmp.c device.c dl.c file.c get.c loop-bsd.c mopdef.c nma.c pf.c \
@@ -9,10 +13,6 @@ version.c: VERSION
 	rm -f version.c; \
 	sed 's/.*/char version[] = "&";/' ${.ALLSRC} > version.c
 
-NOLINT=		# defined
-NOPIC=		# defined
-NOPROFILE=	# defined
-
 # only needed during build
 libinstall::
 
diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile
index 48d555590cdd..70cd7126618a 100644
--- a/usr.sbin/ntp/libntp/Makefile
+++ b/usr.sbin/ntp/libntp/Makefile
@@ -1,4 +1,9 @@
-#	$NetBSD: Makefile,v 1.3 2001/12/12 01:48:54 tv Exp $
+#	$NetBSD: Makefile,v 1.4 2002/09/18 13:31:54 lukem Exp $
+
+NOLINKLIB=# defined
+NOMAN=	# defined
+NOPIC=	# defined
+NOLINT=	# defined
 
 LIB=	ntp
 SRCS=	a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
@@ -15,9 +20,4 @@ SRCS=	a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	icom.c audio.c
 NTPSRCDIR=lib${LIB}
 
-NOLINKLIB=# defined
-NOMAN=	# defined
-NOPIC=	# defined
-NOLINT=	# defined
-
 .include <bsd.lib.mk>
diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile
index 344807e1a707..5d8ba43301be 100644
--- a/usr.sbin/ntp/libparse/Makefile
+++ b/usr.sbin/ntp/libparse/Makefile
@@ -1,4 +1,9 @@
-#	$NetBSD: Makefile,v 1.2 2001/12/12 01:48:54 tv Exp $
+#	$NetBSD: Makefile,v 1.3 2002/09/18 13:31:55 lukem Exp $
+
+NOLINKLIB=# defined
+NOMAN=	# defined
+NOPIC=	# defined
+NOLINT=	# defined
 
 LIB=	parse
 SRCS=	parse.c parse_conf.c clk_meinberg.c clk_schmid.c clk_rawdcf.c \
@@ -7,9 +12,4 @@ SRCS=	parse.c parse_conf.c clk_meinberg.c clk_schmid.c clk_rawdcf.c \
 	data_mbg.c info_trimble.c trim_info.c
 NTPSRCDIR=lib${LIB}
 
-NOLINKLIB=# defined
-NOMAN=	# defined
-NOPIC=	# defined
-NOLINT=	# defined
-
 .include <bsd.lib.mk>
diff --git a/usr.sbin/ntp/ntptimeset/Makefile b/usr.sbin/ntp/ntptimeset/Makefile
index 41c70511b684..e9ed9e12832f 100644
--- a/usr.sbin/ntp/ntptimeset/Makefile
+++ b/usr.sbin/ntp/ntptimeset/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.4 2001/12/12 01:48:54 tv Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 13:31:55 lukem Exp $
+
+NOMAN=	# defined
 
 PROG=	ntptimeset
-NOMAN=	# defined
 SRCS=	ntptimeset.c ntptime_config.c
 
 NTPSRCDIR=ntpdate
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
index 29be5331d7eb..687f2cbdeb43 100644
--- a/usr.sbin/pkg_install/lib/Makefile
+++ b/usr.sbin/pkg_install/lib/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.18 2002/07/19 19:04:38 yamt Exp $
+# $NetBSD: Makefile,v 1.19 2002/09/18 13:31:55 lukem Exp $
 # Original from FreeBSD, no rcs id.
 
-LIB+=		install
-SRCS+=		exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \
-		plist.c str.c version.c path.c
-
 NOLINT=		# defined
 NOMAN=		# defined
 NOPIC=		# defined
 NOPROFILE=	# defined
 
+LIB+=		install
+SRCS+=		exec.c file.c ftpio.c global.c lpkg.c pen.c pkgdb.c \
+		plist.c str.c version.c path.c
+
 # only needed during build - prevent installation of library
 libinstall::
 
diff --git a/usr.sbin/pppd/plugins/minconn/Makefile b/usr.sbin/pppd/plugins/minconn/Makefile
index d78a469b7f0f..9978a18a39c9 100644
--- a/usr.sbin/pppd/plugins/minconn/Makefile
+++ b/usr.sbin/pppd/plugins/minconn/Makefile
@@ -1,14 +1,16 @@
-#	$NetBSD: Makefile,v 1.2 2002/09/18 03:54:34 lukem Exp $
+#	$NetBSD: Makefile,v 1.3 2002/09/18 13:31:55 lukem Exp $
+
+NOLINT=	# defined
 
 .include <bsd.own.mk>
 
 PCAPDIR=${NETBSDSRCDIR}/lib/libpcap
 
-NOLINT=yes
-LIBPREFIX=
-SHLIB_FULLVERSION=
 LIB=minconn
 SRCS=minconn.c
 CPPFLAGS+=-I${.CURDIR}/../pppd
 
+LIBPREFIX=
+SHLIB_FULLVERSION=
+
 .include <bsd.lib.mk>
diff --git a/usr.sbin/racoon/conf/Makefile b/usr.sbin/racoon/conf/Makefile
index b6a62c5c2053..60d6c5c60a3f 100644
--- a/usr.sbin/racoon/conf/Makefile
+++ b/usr.sbin/racoon/conf/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 2001/12/12 01:48:55 tv Exp $
+#	$NetBSD: Makefile,v 1.5 2002/09/18 13:31:55 lukem Exp $
+
+NOOBJ=# defined
 
 FILES=	psk.txt.sample racoon.conf.sample racoon.conf.sample-gssapi
 FILES+=	README.certificate README.gssapi
 
-NOOBJ=# defined
-
 .include <bsd.prog.mk>
 
 .PATH:	${RACOONSRCDIR}/samples ${RACOONSRCDIR}/doc
diff --git a/usr.sbin/rpc.pcnfsd/Makefile.clnt b/usr.sbin/rpc.pcnfsd/Makefile.clnt
index 742f10e3b174..610f2b58ed85 100644
--- a/usr.sbin/rpc.pcnfsd/Makefile.clnt
+++ b/usr.sbin/rpc.pcnfsd/Makefile.clnt
@@ -1,12 +1,13 @@
-#	$NetBSD: Makefile.clnt,v 1.9 2002/03/22 18:10:26 thorpej Exp $
+#	$NetBSD: Makefile.clnt,v 1.10 2002/09/18 13:31:56 lukem Exp $
 
 #	This Makefile builds a client used for testing.
 
+NOMAN=	# defined
+
 .include <bsd.own.mk>
 
 PROG=	clnt.pcnfsd
 SRCS=	pcnfsd_test.c pcnfsd_clnt.c pcnfsd_xdr.c
-NOMAN=	# defined
 
 CPPFLAGS+= -DUSER_CACHE -DWTMP -I.
 
diff --git a/usr.sbin/sup/lib/Makefile b/usr.sbin/sup/lib/Makefile
index fbc4b44aff60..9b73ab81f8c5 100644
--- a/usr.sbin/sup/lib/Makefile
+++ b/usr.sbin/sup/lib/Makefile
@@ -1,4 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 2001/12/12 01:48:56 tv Exp $
+#	$NetBSD: Makefile,v 1.6 2002/09/18 13:31:56 lukem Exp $
+
+NOLINT=	# defined
+NOPIC=	# defined
+NOPROFILE=# defined
 
 LIB=	sup
 
@@ -11,10 +15,6 @@ SRCS+=	atoo.c errmsg.c expand.c ffilecopy.c filecopy.c \
 
 CLEANFILES+=netcrypt.c
 
-NOLINT=	# defined
-NOPIC=	# defined
-NOPROFILE=# defined
-
 netcrypt.c: netcryptvoid.c
 	rm -f netcrypt.c
 	ln -s ${.CURDIR}/../source/netcryptvoid.c netcrypt.c
diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile
index d84522eeb955..a54e33f2ab02 100644
--- a/usr.sbin/sup/supscan/Makefile
+++ b/usr.sbin/sup/supscan/Makefile
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2001/12/12 01:48:56 tv Exp $
+#	$NetBSD: Makefile,v 1.6 2002/09/18 13:31:56 lukem Exp $
+
+NOMAN=	# defined
 
 PROG=	supscan
 SRCS=	supscan.c scan.c
-NOMAN=	# defined
 
 .PATH:	${.CURDIR}/../source
 
diff --git a/usr.sbin/ypserv/common/Makefile b/usr.sbin/ypserv/common/Makefile
index 1b90da5a6a82..26bfbb0c95d5 100644
--- a/usr.sbin/ypserv/common/Makefile
+++ b/usr.sbin/ypserv/common/Makefile
@@ -1,12 +1,12 @@
-#	$NetBSD: Makefile,v 1.8 2001/12/12 01:48:57 tv Exp $
-
-LIB=	common
-SRCS=	localhostname.c ypdb.c yplib_host.c ypresp_xdr.c
+#	$NetBSD: Makefile,v 1.9 2002/09/18 13:31:56 lukem Exp $
 
 NOLINT=		# defined
 NOPIC=		# defined
 NOPROFILE=	# defined
 
+LIB=	common
+SRCS=	localhostname.c ypdb.c yplib_host.c ypresp_xdr.c
+
 # only needed during build
 libinstall::