Index: user/ngie/bug203673/bin/df/Makefile
===================================================================
--- user/ngie/bug203673/bin/df/Makefile	(revision 289478)
+++ user/ngie/bug203673/bin/df/Makefile	(revision 289479)
@@ -1,14 +1,14 @@
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 # $FreeBSD$
 
 MOUNT=	${.CURDIR}/../../sbin/mount
 .PATH: ${MOUNT}
 
 PROG=	df
 SRCS=	df.c vfslist.c
 
 CFLAGS+= -I${MOUNT}
 
-LIBADD= util xo
+LIBADD=	xo util
 
 .include <bsd.prog.mk>
Index: user/ngie/bug203673/bin/ls/Makefile
===================================================================
--- user/ngie/bug203673/bin/ls/Makefile	(revision 289478)
+++ user/ngie/bug203673/bin/ls/Makefile	(revision 289479)
@@ -1,20 +1,20 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	util xo
+LIBADD=	xo util
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
 LIBADD+=	termcapw
 .endif
 
 .if ${MK_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.prog.mk>
Index: user/ngie/bug203673/libexec/ftpd/Makefile
===================================================================
--- user/ngie/bug203673/libexec/ftpd/Makefile	(revision 289478)
+++ user/ngie/bug203673/libexec/ftpd/Makefile	(revision 289479)
@@ -1,36 +1,36 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	ftpd
 MAN=	ftpd.8 ftpchroot.5
 SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c
 
 CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING
 CFLAGS+=-I${.CURDIR}
 YFLAGS=
 WARNS?=	2
 WFORMAT=0
 
-LIBADD=	crypt util xo
+LIBADD=	crypt xo util
 
 # XXX Kluge! Conversation mechanism needs to be fixed.
 LIBADD+=	opie md
 
 LSDIR=	../../bin/ls
 .PATH:	${.CURDIR}/${LSDIR}
 SRCS+=	ls.c cmp.c print.c util.c
 CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR}
 LIBADD+=	m
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=-DINET6
 .endif
 
 .if ${MK_PAM_SUPPORT} != "no"
 CFLAGS+=-DUSE_PAM
 LIBADD+=	pam
 .endif
 
 .include <bsd.prog.mk>
Index: user/ngie/bug203673/usr.bin/netstat/Makefile
===================================================================
--- user/ngie/bug203673/usr.bin/netstat/Makefile	(revision 289478)
+++ user/ngie/bug203673/usr.bin/netstat/Makefile	(revision 289479)
@@ -1,67 +1,67 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PROG=	netstat
 SRCS=	if.c inet.c main.c mbuf.c mroute.c netisr.c nl_symbols.c route.c \
 	unix.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \
 	flowtable.c
 DPSRCS=	nl_defs.h
 
 nl_symbols.c: nlist_symbols
 	awk '\
 	    BEGIN { \
 		print "#include <sys/param.h>"; \
 		print "#include <nlist.h>"; \
 		print "struct nlist nl[] = {"; \
 	    } \
 	    !/^\#/ { printf("\t{ .n_name = \"%s\" },\n", $$2); } \
 	    END { print "\t{ .n_name = NULL },\n};" } \
 	    ' < ${.ALLSRC} > ${.TARGET} || rm -f ${.TARGET}
 nl_defs.h: nlist_symbols
 	awk '\
 	    BEGIN { \
 		print "#include <nlist.h>"; \
 		print "extern struct nlist nl[];"; \
 		i = 0; \
 	    } \
 	    !/^\#/ { printf("\#define\tN%s\t%s\n", toupper($$2), i++); }' \
 	    < ${.ALLSRC} > ${.TARGET} || rm -f ${.TARGET}
 CLEANFILES+=	nl_symbols.c nl_defs.h
 CFLAGS+=	-I${.OBJDIR}
 
 WARNS?=	3
 CFLAGS+=-fno-strict-aliasing
 
 CFLAGS+=-DIPSEC
 CFLAGS+=-DSCTP
 
 .if ${MK_INET_SUPPORT} != "no"
 CFLAGS+=-DINET
 .endif
 
 .if ${MK_INET6_SUPPORT} != "no"
 SRCS+=	inet6.c
 CFLAGS+=-DINET6
 .endif
 
 .if ${MK_OFED} != "no"
 CFLAGS+=-DSDP
 .endif
 
 .if ${MK_PF} != "no"
 CFLAGS+=-DPF
 .endif
 
 BINGRP=	kmem
 BINMODE=2555
-LIBADD=	kvm memstat util xo
+LIBADD=	kvm memstat xo util
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c
 LIBADD+=	netgraph
 CFLAGS+=-DNETGRAPH
 .endif
 
 .include <bsd.prog.mk>
Index: user/ngie/bug203673/usr.bin/procstat/Makefile
===================================================================
--- user/ngie/bug203673/usr.bin/procstat/Makefile	(revision 289478)
+++ user/ngie/bug203673/usr.bin/procstat/Makefile	(revision 289479)
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
 PROG=	procstat
 MAN=	procstat.1
 SRCS=	procstat.c		\
 	procstat_args.c		\
 	procstat_auxv.c		\
 	procstat_basic.c	\
 	procstat_bin.c		\
 	procstat_cred.c		\
 	procstat_cs.c		\
 	procstat_files.c	\
 	procstat_kstack.c	\
 	procstat_rlimit.c	\
 	procstat_rusage.c	\
 	procstat_sigs.c		\
 	procstat_threads.c	\
 	procstat_vm.c
 
-LIBADD+=	procstat util xo sbuf
+LIBADD+=	procstat xo util sbuf
 
 .include <bsd.prog.mk>
Index: user/ngie/bug203673/usr.bin/w/Makefile
===================================================================
--- user/ngie/bug203673/usr.bin/w/Makefile	(revision 289478)
+++ user/ngie/bug203673/usr.bin/w/Makefile	(revision 289479)
@@ -1,12 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
 PROG=	w
 SRCS=	fmt.c pr_time.c proc_compare.c w.c
 MAN=	w.1 uptime.1
-LIBADD=	kvm sbuf util xo
+LIBADD=	kvm sbuf xo util
 LINKS=	${BINDIR}/w ${BINDIR}/uptime
 
 .PATH: ${.CURDIR}/../../bin/ps
 
 .include <bsd.prog.mk>