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.

7 files changed, 22 insertions, 25 deletions

diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
index 2ea2846..286e20a 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 248f21e..b93e0c5 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 d39f93a..b249610 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 36b83ba..9bbaa8a 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 5ca61a5..d746760 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 0fb00b2..d8dbc50 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 72a07fb..a7b354c 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>