style.Makefile(5) police

(I've tried to keep to the spirit of the original formatting)

Reviewed by:	des

28 files changed, 223 insertions, 221 deletions

diff --git a/lib/libpam/Makefile b/lib/libpam/Makefile
index 8e99888..088e8a0 100644
--- a/lib/libpam/Makefile
+++ b/lib/libpam/Makefile
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 # The modules must be built first, because they are built into the
 # static version of libpam.
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index e61e062e..066ea4f 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -22,7 +22,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 SHLIB_MAJOR=	2
 
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index 76d8318..a096c24 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -34,123 +34,118 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
-#
 
-OPENPAM		 = ${.CURDIR}/../../../contrib/openpam
+OPENPAM=	${.CURDIR}/../../../contrib/openpam
+.PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man
 
-LIB		 = pam
+LIB=	pam
+NOPROFILE=	YES
 
-CFLAGS		+= -I${.CURDIR} -I${OPENPAM}/include
-CFLAGS		+= -DLIB_MAJ=${SHLIB_MAJOR}
-NOPROFILE	 = YES
-WARNS		?= 4
+SRCS=	openpam_borrow_cred.c \
+	openpam_configure.c \
+	openpam_dispatch.c \
+	openpam_dynamic.c \
+	openpam_findenv.c \
+	openpam_free_data.c \
+	openpam_get_option.c \
+	openpam_load.c \
+	openpam_log.c \
+	openpam_nullconv.c \
+	openpam_restore_cred.c \
+	openpam_set_option.c \
+	openpam_ttyconv.c \
+	pam_acct_mgmt.c \
+	pam_authenticate.c \
+	pam_chauthtok.c \
+	pam_close_session.c \
+	pam_end.c \
+	pam_error.c \
+	pam_get_authtok.c \
+	pam_get_data.c \
+	pam_get_item.c \
+	pam_get_user.c \
+	pam_getenv.c \
+	pam_getenvlist.c \
+	pam_info.c \
+	pam_open_session.c \
+	pam_prompt.c \
+	pam_putenv.c \
+	pam_set_data.c \
+	pam_set_item.c \
+	pam_setcred.c \
+	pam_setenv.c \
+	pam_start.c \
+	pam_strerror.c \
+	pam_verror.c \
+	pam_vinfo.c \
+	pam_vprompt.c
+# Local additions
+SRCS+=	pam_debug_log.c \
+	pam_std_option.c
 
-SRCS		 =
-SRCS		+= openpam_borrow_cred.c
-SRCS		+= openpam_configure.c
-SRCS		+= openpam_dispatch.c
-SRCS		+= openpam_dynamic.c
-SRCS		+= openpam_findenv.c
-SRCS		+= openpam_free_data.c
-SRCS		+= openpam_get_option.c
-SRCS		+= openpam_load.c
-SRCS		+= openpam_log.c
-SRCS		+= openpam_nullconv.c
-SRCS		+= openpam_restore_cred.c
-SRCS		+= openpam_set_option.c
-SRCS		+= openpam_ttyconv.c
-SRCS		+= pam_acct_mgmt.c
-SRCS		+= pam_authenticate.c
-SRCS		+= pam_chauthtok.c
-SRCS		+= pam_close_session.c
-SRCS		+= pam_end.c
-SRCS		+= pam_error.c
-SRCS		+= pam_get_authtok.c
-SRCS		+= pam_get_data.c
-SRCS		+= pam_get_item.c
-SRCS		+= pam_get_user.c
-SRCS		+= pam_getenv.c
-SRCS		+= pam_getenvlist.c
-SRCS		+= pam_info.c
-SRCS		+= pam_open_session.c
-SRCS		+= pam_prompt.c
-SRCS		+= pam_putenv.c
-SRCS		+= pam_set_data.c
-SRCS		+= pam_set_item.c
-SRCS		+= pam_setcred.c
-SRCS		+= pam_setenv.c
-SRCS		+= pam_start.c
-SRCS		+= pam_strerror.c
-SRCS		+= pam_verror.c
-SRCS		+= pam_vinfo.c
-SRCS		+= pam_vprompt.c
+MAN=	openpam.3 \
+	openpam_borrow_cred.3 \
+	openpam_free_data.3 \
+	openpam_get_option.3 \
+	openpam_log.3 \
+	openpam_nullconv.3 \
+	openpam_restore_cred.3 \
+	openpam_set_option.3 \
+	openpam_ttyconv.3 \
+	pam.3 \
+	pam_acct_mgmt.3 \
+	pam_authenticate.3 \
+	pam_chauthtok.3 \
+	pam_close_session.3 \
+	pam_conv.3 \
+	pam_end.3 \
+	pam_error.3 \
+	pam_get_authtok.3 \
+	pam_get_data.3 \
+	pam_get_item.3 \
+	pam_get_user.3 \
+	pam_getenv.3 \
+	pam_getenvlist.3 \
+	pam_info.3 \
+	pam_open_session.3 \
+	pam_prompt.3 \
+	pam_putenv.3 \
+	pam_set_data.3 \
+	pam_set_item.3 \
+	pam_setcred.3 \
+	pam_setenv.3 \
+	pam_sm_acct_mgmt.3 \
+	pam_sm_authenticate.3 \
+	pam_sm_chauthtok.3 \
+	pam_sm_close_session.3 \
+	pam_sm_open_session.3 \
+	pam_sm_setcred.3 \
+	pam_start.3 \
+	pam_strerror.3 \
+	pam_verror.3 \
+	pam_vinfo.3 \
+	pam_vprompt.3
 
-MAN		 =
-MAN		+= openpam.3
-MAN		+= openpam_borrow_cred.3
-MAN		+= openpam_free_data.3
-MAN		+= openpam_get_option.3
-MAN		+= openpam_log.3
-MAN		+= openpam_nullconv.3
-MAN		+= openpam_restore_cred.3
-MAN		+= openpam_set_option.3
-MAN		+= openpam_ttyconv.3
-MAN		+= pam.3
-MAN		+= pam_acct_mgmt.3
-MAN		+= pam_authenticate.3
-MAN		+= pam_chauthtok.3
-MAN		+= pam_close_session.3
-MAN		+= pam_conv.3
-MAN		+= pam_end.3
-MAN		+= pam_error.3
-MAN		+= pam_get_authtok.3
-MAN		+= pam_get_data.3
-MAN		+= pam_get_item.3
-MAN		+= pam_get_user.3
-MAN		+= pam_getenv.3
-MAN		+= pam_getenvlist.3
-MAN		+= pam_info.3
-MAN		+= pam_open_session.3
-MAN		+= pam_prompt.3
-MAN		+= pam_putenv.3
-MAN		+= pam_set_data.3
-MAN		+= pam_set_item.3
-MAN		+= pam_setcred.3
-MAN		+= pam_setenv.3
-MAN		+= pam_sm_acct_mgmt.3
-MAN		+= pam_sm_authenticate.3
-MAN		+= pam_sm_chauthtok.3
-MAN		+= pam_sm_close_session.3
-MAN		+= pam_sm_open_session.3
-MAN		+= pam_sm_setcred.3
-MAN		+= pam_start.3
-MAN		+= pam_strerror.3
-MAN		+= pam_verror.3
-MAN		+= pam_vinfo.3
-MAN		+= pam_vprompt.3
+WARNS?=	4
+CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include
+CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR}
 
-# Local additions
-SRCS		+= pam_debug_log.c
-SRCS		+= pam_std_option.c
+HEADERS=	security/openpam.h \
+		security/openpam_version.h \
+		security/pam_appl.h \
+		security/pam_constants.h \
+		security/pam_modules.h \
+		security/pam_types.h \
 
-HEADERS		 =
-HEADERS		+= security/openpam.h
-HEADERS		+= security/openpam_version.h
-HEADERS		+= security/pam_appl.h
-HEADERS		+= security/pam_constants.h
-HEADERS		+= security/pam_modules.h
-HEADERS		+= security/pam_types.h
-
-ADD_HEADERS	 = security/pam_mod_misc.h
+ADD_HEADERS=	security/pam_mod_misc.h
 
 # Static modules
-MODULE_DIR	 = ../modules
+MODULE_DIR=	../modules
 .include "${.CURDIR}/${MODULE_DIR}/modules.inc"
-STATIC_MODULES	 = ${MODULES:C/.*/${MODULE_DIR}\/&\/lib&.a/}
-STATICOBJS	+= openpam_static_modules.o
-CLEANFILES	+= openpam_static.o
-
-CLEANFILES+=	openpam_static_modules.o
+STATIC_MODULES=	${MODULES:C/.*/${MODULE_DIR}\/&\/lib&.a/}
+STATICOBJS+=	openpam_static_modules.o
+CLEANFILES+=	openpam_static.o \
+		openpam_static_modules.o
 
 openpam_static_modules.o: openpam_static.o ${STATIC_MODULES}
 	${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC}
@@ -160,9 +155,6 @@ INCS=		${HEADERS} ${ADD_HEADERS}
 INCSDIR=	${INCLUDEDIR}/security
 
 .include <bsd.lib.mk>
-.PATH: ${OPENPAM}/include
-.PATH: ${OPENPAM}/lib
-.PATH: ${OPENPAM}/doc/man
 
 # Can't put openpam_static.c in SRCS but want it in .depend.
 ${DEPENDFILE}: openpam_static.c
diff --git a/lib/libpam/modules/Makefile b/lib/libpam/modules/Makefile
index 9e7b91b..cacf011 100644
--- a/lib/libpam/modules/Makefile
+++ b/lib/libpam/modules/Makefile
@@ -22,9 +22,10 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$FreeBSD$
+# $FreeBSD$
 
 .include "modules.inc"
-SUBDIR		 = ${MODULES}
+
+SUBDIR=	${MODULES}
 
 .include <bsd.subdir.mk>
diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc
index cdfe599..b21a93d 100644
--- a/lib/libpam/modules/Makefile.inc
+++ b/lib/libpam/modules/Makefile.inc
@@ -5,10 +5,8 @@ PAMDIR=		${.CURDIR}/../../../../contrib/openpam
 NOINSTALLLIB=	yes
 NOPROFILE=	yes
 
-CFLAGS+=	-I${PAMDIR}/include
-CFLAGS+=	-I${.CURDIR}/../../libpam
-WARNS?=		4
-NO_WERROR=	yes
+CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
+WARNS?=	4
 
 # This is nasty.
 # For the static case, libpam.a depends on the modules.
@@ -21,4 +19,4 @@ DPADD+=		${LIBPAM}
 LDADD+=		-lpam
 .endif
 
-.include	"../Makefile.inc"
+.include "../Makefile.inc"
diff --git a/lib/libpam/modules/pam_deny/Makefile b/lib/libpam/modules/pam_deny/Makefile
index 005e00e..3bf8196 100644
--- a/lib/libpam/modules/pam_deny/Makefile
+++ b/lib/libpam/modules/pam_deny/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_deny
-SRCS=		pam_deny.c
-MAN=		pam_deny.8
+LIB=	pam_deny
+SRCS=	pam_deny.c
+MAN=	pam_deny.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile
index 915ddd8..6f23946 100644
--- a/lib/libpam/modules/pam_echo/Makefile
+++ b/lib/libpam/modules/pam_echo/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-LIB=		pam_echo
-SRCS=		pam_echo.c
-MAN=		pam_echo.8
+LIB=	pam_echo
+SRCS=	pam_echo.c
+MAN=	pam_echo.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile
index c1f5810..0cf4268 100644
--- a/lib/libpam/modules/pam_exec/Makefile
+++ b/lib/libpam/modules/pam_exec/Makefile
@@ -1,7 +1,9 @@
 # $FreeBSD$
 
-LIB=		pam_exec
-SRCS=		pam_exec.c
-MAN=		pam_exec.8
+LIB=	pam_exec
+SRCS=	pam_exec.c
+MAN=	pam_exec.8
+
+WARNS?=	0
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ftp/Makefile b/lib/libpam/modules/pam_ftp/Makefile
index c7536d3..2c8678f 100644
--- a/lib/libpam/modules/pam_ftp/Makefile
+++ b/lib/libpam/modules/pam_ftp/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_ftp
-SRCS=		pam_ftp.c
-MAN=		pam_ftp.8
+LIB=	pam_ftp
+SRCS=	pam_ftp.c
+MAN=	pam_ftp.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile
index 07e84ec..8bca1aa 100644
--- a/lib/libpam/modules/pam_ftpusers/Makefile
+++ b/lib/libpam/modules/pam_ftpusers/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-LIB=		pam_ftpusers
-SRCS=		pam_ftpusers.c
-MAN=		pam_ftpusers.8
+LIB=	pam_ftpusers
+SRCS=	pam_ftpusers.c
+MAN=	pam_ftpusers.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_krb5/Makefile b/lib/libpam/modules/pam_krb5/Makefile
index d65d3b4..8ace54c 100644
--- a/lib/libpam/modules/pam_krb5/Makefile
+++ b/lib/libpam/modules/pam_krb5/Makefile
@@ -24,13 +24,12 @@
 #
 # $FreeBSD$
 
-LIB=		pam_krb5
-SRCS=		pam_krb5.c
-NO_WERROR=	yes
-DPADD=		${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBCOM_ERR} ${LIBROKEN}
-LDADD=		-lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \
-		-lroken 
-MAN=		pam_krb5.8
+LIB=	pam_krb5
+SRCS=	pam_krb5.c
+MAN=	pam_krb5.8
+
+DPADD=	${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
+	${LIBCOM_ERR} ${LIBROKEN}
+LDADD=	-lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err -lroken 
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ksu/Makefile b/lib/libpam/modules/pam_ksu/Makefile
index 2c7b610..1cdafe8 100644
--- a/lib/libpam/modules/pam_ksu/Makefile
+++ b/lib/libpam/modules/pam_ksu/Makefile
@@ -24,12 +24,12 @@
 #
 # $FreeBSD$
 
-LIB=		pam_ksu
-SRCS=		pam_ksu.c
-DPADD=		${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
-		${LIBCOM_ERR} ${LIBROKEN}
-LDADD=		-lkrb5 -lasn1 -lcrypto -lcrypt \
-		-lcom_err -lroken
-MAN=		pam_ksu.8
+LIB=	pam_ksu
+SRCS=	pam_ksu.c
+MAN=	pam_ksu.8
+
+DPADD=	${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \
+	${LIBCOM_ERR} ${LIBROKEN}
+LDADD=	-lkrb5 -lasn1 -lcrypto -lcrypt -lcom_err -lroken
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index 1e7290e..f0b96c4 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -24,11 +24,11 @@
 #
 # $FreeBSD$
 
-LIB=		pam_lastlog
-SRCS=		pam_lastlog.c
-DPADD=		${LIBUTIL}
-LDADD=		-lutil
+LIB=	pam_lastlog
+SRCS=	pam_lastlog.c
+MAN=	pam_lastlog.8
 
-MAN=		pam_lastlog.8
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index d31d6cc..60e94f5 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_login_access
-SRCS=		pam_login_access.c login_access.c
-MAN=		pam_login_access.8
+LIB=	pam_login_access
+SRCS=	pam_login_access.c login_access.c
+MAN=	pam_login_access.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index a6129eb..ba5a7d4 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -24,10 +24,11 @@
 #
 # $FreeBSD$
 
-LIB=		pam_nologin
-SRCS=		pam_nologin.c
-DPADD=		${LIBUTIL}
-LDADD=		-lutil
-MAN=		pam_nologin.8
+LIB=	pam_nologin
+SRCS=	pam_nologin.c
+MAN=	pam_nologin.8
+
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_opie/Makefile b/lib/libpam/modules/pam_opie/Makefile
index c6f1708..fbc1278 100644
--- a/lib/libpam/modules/pam_opie/Makefile
+++ b/lib/libpam/modules/pam_opie/Makefile
@@ -25,10 +25,11 @@
 #
 # $FreeBSD$
 
-LIB=		pam_opie
-SRCS=		pam_opie.c
-DPADD=		${LIBOPIE}
-LDADD=		-lopie
-MAN=		pam_opie.8
+LIB=	pam_opie
+SRCS=	pam_opie.c
+MAN=	pam_opie.8
+
+DPADD=	${LIBOPIE}
+LDADD=	-lopie
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_opieaccess/Makefile b/lib/libpam/modules/pam_opieaccess/Makefile
index 6546845..1554a88 100644
--- a/lib/libpam/modules/pam_opieaccess/Makefile
+++ b/lib/libpam/modules/pam_opieaccess/Makefile
@@ -1,9 +1,10 @@
 # $FreeBSD$
 
-LIB=		pam_opieaccess
-SRCS=		${LIB}.c
-DPADD=		${LIBOPIE}
-LDADD=		-lopie
-MAN=		pam_opieaccess.8
+LIB=	pam_opieaccess
+SRCS=	${LIB}.c
+MAN=	pam_opieaccess.8
+
+DPADD=	${LIBOPIE}
+LDADD=	-lopie
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile
index 7c9bdd92..905afe1 100644
--- a/lib/libpam/modules/pam_passwdqc/Makefile
+++ b/lib/libpam/modules/pam_passwdqc/Makefile
@@ -1,15 +1,17 @@
 # $FreeBSD$
 
-SRCDIR=		${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+SRCDIR=	${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc
+.PATH: ${SRCDIR}
 
-LIB=		pam_passwdqc
-SRCS=		pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
-CFLAGS+=	-I${SRCDIR}
-NO_WERROR=	yes
-DPADD=		${LIBCRYPT}
-LDADD=		-lcrypt
-MAN=		pam_passwdqc.8
+LIB=	pam_passwdqc
+SRCS=	pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c
+MAN=	pam_passwdqc.8
+
+WARNS?=	0
+CFLAGS+= -I${SRCDIR}
+
+DPADD=	${LIBCRYPT}
+LDADD=	-lcrypt
 
 .include <bsd.lib.mk>
 
-.PATH:		${SRCDIR}
diff --git a/lib/libpam/modules/pam_permit/Makefile b/lib/libpam/modules/pam_permit/Makefile
index 7a60cd7..dbbd5b5 100644
--- a/lib/libpam/modules/pam_permit/Makefile
+++ b/lib/libpam/modules/pam_permit/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_permit
-SRCS=		pam_permit.c
-MAN=		pam_permit.8
+LIB=	pam_permit
+SRCS=	pam_permit.c
+MAN=	pam_permit.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_radius/Makefile b/lib/libpam/modules/pam_radius/Makefile
index af75f0b..bd3647d 100644
--- a/lib/libpam/modules/pam_radius/Makefile
+++ b/lib/libpam/modules/pam_radius/Makefile
@@ -24,11 +24,11 @@
 #
 # $FreeBSD$
 
-LIB=		pam_radius
-SRCS=		pam_radius.c
-DPADD=		${LIBRADIUS}
-LDADD=		-lradius
+LIB=	pam_radius
+SRCS=	pam_radius.c
+MAN=	pam_radius.8
 
-MAN=		pam_radius.8
+DPADD=	${LIBRADIUS}
+LDADD=	-lradius
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile
index 57eb563..866267e 100644
--- a/lib/libpam/modules/pam_rhosts/Makefile
+++ b/lib/libpam/modules/pam_rhosts/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-LIB=		pam_rhosts
-SRCS=		pam_rhosts.c
-MAN=		pam_rhosts.8
+LIB=	pam_rhosts
+SRCS=	pam_rhosts.c
+MAN=	pam_rhosts.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_rootok/Makefile b/lib/libpam/modules/pam_rootok/Makefile
index 74433fc..8582daa 100644
--- a/lib/libpam/modules/pam_rootok/Makefile
+++ b/lib/libpam/modules/pam_rootok/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_rootok
-SRCS=		pam_rootok.c
-MAN=		pam_rootok.8
+LIB=	pam_rootok
+SRCS=	pam_rootok.c
+MAN=	pam_rootok.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index adfd925..8eb3e6e 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_securetty
-SRCS=		pam_securetty.c
-MAN=		pam_securetty.8
+LIB=	pam_securetty
+SRCS=	pam_securetty.c
+MAN=	pam_securetty.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index 671ff1a..50718e1 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_self
-SRCS=		pam_self.c
-MAN=		pam_self.8
+LIB=	pam_self
+SRCS=	pam_self.c
+MAN=	pam_self.8
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 21a6078..38a6411 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -3,11 +3,13 @@
 
 SSHSRC=	${.CURDIR}/../../../../crypto/openssh
 
-LIB=		pam_ssh
-SRCS=		pam_ssh.c
-CFLAGS+=	-I${SSHSRC}
-DPADD=		${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
-LDADD=		-lssh -lcrypto -lcrypt
-MAN=		pam_ssh.8
+LIB=	pam_ssh
+MAN=	pam_ssh.8
+SRCS=	pam_ssh.c
+
+CFLAGS+= -I${SSHSRC}
+
+DPADD=	${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD=	-lssh -lcrypto -lcrypt
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_tacplus/Makefile b/lib/libpam/modules/pam_tacplus/Makefile
index 04f3764..053812a 100644
--- a/lib/libpam/modules/pam_tacplus/Makefile
+++ b/lib/libpam/modules/pam_tacplus/Makefile
@@ -24,10 +24,11 @@
 #
 # $FreeBSD$
 
-LIB=		pam_tacplus
-SRCS=		pam_tacplus.c
-DPADD=		${LIBTACPLUS}
-LDADD=		-ltacplus
-MAN=		pam_tacplus.8
+LIB=	pam_tacplus
+SRCS=	pam_tacplus.c
+MAN=	pam_tacplus.8
+
+DPADD=	${LIBTACPLUS}
+LDADD=	-ltacplus
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 790d7ec..f8501a7 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -34,11 +34,13 @@
 #
 # $FreeBSD$
 
-LIB=		pam_unix
-SRCS=		pam_unix.c
-CFLAGS+=	-DYP
-DPADD=		${LIBUTIL} ${LIBCRYPT} ${LIBYPCLNT}
-LDADD=		-lutil -lcrypt -lypclnt
-MAN=		pam_unix.8
+LIB=	pam_unix
+SRCS=	pam_unix.c
+MAN=	pam_unix.8
+
+CFLAGS+= -DYP
+
+DPADD=	${LIBUTIL} ${LIBCRYPT} ${LIBYPCLNT}
+LDADD=	-lutil -lcrypt -lypclnt
 
 .include <bsd.lib.mk>
diff --git a/lib/libpam/modules/pam_wheel/Makefile b/lib/libpam/modules/pam_wheel/Makefile
index 95479ce..c2224cd 100644
--- a/lib/libpam/modules/pam_wheel/Makefile
+++ b/lib/libpam/modules/pam_wheel/Makefile
@@ -24,8 +24,8 @@
 #
 # $FreeBSD$
 
-LIB=		pam_wheel
-SRCS=		pam_wheel.c
-MAN=		pam_wheel.8
+LIB=	pam_wheel
+SRCS=	pam_wheel.c
+MAN=	pam_wheel.8
 
 .include <bsd.lib.mk>