style.Makefile(5).

OK'ed by:	nectar

8 files changed, 65 insertions, 98 deletions

diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 6cfc673..b646c98 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -1,43 +1,35 @@
 # $FreeBSD$
 
 PROG=	kadmin
+MAN=	kadmin.8
 
-SRCS=	\
-	ank.c				\
-	cpw.c				\
-	del.c				\
-	del_enctype.c			\
-	dump.c				\
-	ext.c				\
-	get.c				\
-	init.c				\
-	kadmin.c			\
-	load.c				\
-	mod.c				\
-	rename.c			\
-	util.c				\
-	random_password.c
-
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
-	-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/sl		\
-	${LDAPCFLAGS}
-
-LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5	\
-	${LIBSL} -lroken ${LIBVERS} -lasn1	\
-	-lcrypto -lcrypt -lcom_err		\
+SRCS=	ank.c \
+	cpw.c \
+	del.c \
+	del_enctype.c \
+	dump.c \
+	ext.c \
+	get.c \
+	init.c \
+	kadmin.c \
+	load.c \
+	mod.c \
+	random_password.c \
+	rename.c \
+	util.c
+
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
+	-I${KRB5DIR}/lib/sl ${LDAPCFLAGS}
+DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \
+	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \
+	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
+	${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
+LDADD=	-lkadm5clnt -lkadm5srv -lhdb -lkrb5 \
+	${LIBSL} -lroken ${LIBVERS} -lasn1 \
+	-lcrypto -lcrypt -lcom_err \
 	-lreadline -lncurses ${LDAPLDADD}
-
 LDFLAGS=${LDAPLDFLAGS}
 
-DPADD=	${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5}	\
-	${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1}		\
-	${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}			\
-	${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD}
-
-MAN=	kadmin.8
-
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kadmin
+.PATH: ${KRB5DIR}/kadmin
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 06006e4..60bc792 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
 
 PROG=	kdestroy
-
 CFLAGS+=-I${KRB5DIR}/lib/roken
-
-LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kuser
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 913c83f..172ad98 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
 
 PROG=	kinit
-
 CFLAGS+=-I${KRB5DIR}/lib/roken
-
-LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kuser
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index b113aa7..c97d65f 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
 
 PROG=	klist
-
 CFLAGS+=-I${KRB5DIR}/lib/roken
-
-LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kuser
+.PATH: ${KRB5DIR}/kuser
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index dbb7557..686c299 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -1,15 +1,12 @@
 # $FreeBSD$
 
 PROG=	kpasswd
-
 CFLAGS+=-I${KRB5DIR}/lib/roken
-
-LDADD=	-lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/kpasswd
+.PATH: ${KRB5DIR}/kpasswd
diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile
index e1bc4ff..99ae94b 100644
--- a/kerberos5/usr.bin/krb5-config/Makefile
+++ b/kerberos5/usr.bin/krb5-config/Makefile
@@ -1,25 +1,24 @@
 # $FreeBSD$
 
 SCRIPTS=krb5-config
-
 MAN=	krb5-config.1
 
-CLEANFILES=	krb5-config
+CLEANFILES= krb5-config
 
 krb5-config: krb5-config.in
-	sed	-e "s,@PACKAGE\@,FreeBSD heimdal,g"	\
-		-e "s,@VERSION\@,0.6,g"			\
-		-e "s,@prefix\@,/usr,g"			\
-		-e "s,@exec_prefix\@,/usr,g"		\
-		-e "s,@libdir\@,${LIBDIR},g"		\
-		-e "s,@includedir\@,${INCLUDEDIR},g"	\
-		-e "s,@LIB_crypt\@,-lcrypt,g"		\
-		-e "s,@LIB_dbopen\@,,g"			\
-		-e "s,@LIB_des_appl\@,-lcrypto,g"	\
-		-e "s,@LIBS\@,-lcom_err,g"		\
-		-e "s,@INCLUDE_des@,,g"			\
-		${.ALLSRC} > ${.TARGET}
+	sed -e "s,@PACKAGE\@,FreeBSD heimdal,g" \
+	    -e "s,@VERSION\@,0.6,g" \
+	    -e "s,@prefix\@,/usr,g" \
+	    -e "s,@exec_prefix\@,/usr,g" \
+	    -e "s,@libdir\@,${LIBDIR},g" \
+	    -e "s,@includedir\@,${INCLUDEDIR},g" \
+	    -e "s,@LIB_crypt\@,-lcrypt,g" \
+	    -e "s,@LIB_dbopen\@,,g" \
+	    -e "s,@LIB_des_appl\@,-lcrypto,g" \
+	    -e "s,@LIBS\@,-lcom_err,g" \
+	    -e "s,@INCLUDE_des@,,g" \
+	    ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/tools
+.PATH: ${KRB5DIR}/tools
diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index 43391d9..93f9e21 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,24 +1,18 @@
 # $FreeBSD$
 
 PROG=	ksu
-
+.if defined(ENABLE_SUID_K5SU)
+BINMODE=4555
+INSTALLFLAGS=-fschg
+.endif
+NOMAN=
 SRCS=	su.c
-
 CFLAGS+=-I${KRB5DIR}/lib/roken
-
-LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-NOMAN=	true
-
-.if defined(ENABLE_SUID_K5SU)
-BINMODE=4555
-.endif
-INSTALLFLAGS=-fschg
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/appl/su
+.PATH: ${KRB5DIR}/appl/su
diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile
index c3c4183..7acce0e 100644
--- a/kerberos5/usr.bin/verify_krb5_conf/Makefile
+++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile
@@ -1,19 +1,13 @@
 # $FreeBSD$
 
 PROG=	verify_krb5_conf
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1
-
-LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err
-
+MAN=	verify_krb5_conf.8
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-
-MAN=	verify_krb5_conf.8
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
-.PATH:	${KRB5DIR}/lib/krb5
+.PATH: ${KRB5DIR}/lib/krb5