style.Makefile(5).

OK'ed by:	nectar

kerberos5/Makefile.inc

@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 DISTRIBUTION?=	crypto
-NOLINT=		true
+NOLINT=
 
 KRB5DIR=	${.CURDIR}/../../../crypto/heimdal
 
-CFLAGS+=	-I${.CURDIR}/../../include -DHAVE_CONFIG_H
+CFLAGS+=	-DHAVE_CONFIG_H -I${.CURDIR}/../../include
-
 CFLAGS+=	-DINET6
 
 .if defined(WITH_OPENLDAP)

kerberos5/lib/libasn1/Makefile

@@ -1,25 +1,22 @@
 # $FreeBSD$
 
 LIB=	asn1
+INCS=	asn1_err.h krb5_asn1.h
 
-SRCS=	\
+SRCS=	asn1_err.c \
-	der_get.c				\
-	der_put.c				\
-	der_free.c				\
-	der_length.c				\
-	der_copy.c				\
-	timegm.c				\
-	asn1_err.c				\
 	asn1_err.h \
+	der_copy.c \
+	der_free.c \
+	der_get.c \
+	der_length.c \
+	der_put.c \
 	krb5_asn1.h \
+	timegm.c \
 	${GEN:S/.x$/.c/}
 
-CFLAGS+=-I${KRB5DIR}/lib/asn1			\
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
-	-I${KRB5DIR}/lib/roken			\
-	-I.
 
-GEN=						\
+GEN=	asn1_APOptions.x \
-	asn1_APOptions.x			\
 	asn1_AP_REP.x \
 	asn1_AP_REQ.x \
 	asn1_AS_REP.x \
@@ -53,8 +50,8 @@ GEN=						\
 	asn1_KRB_SAFE_BODY.x \
 	asn1_KerberosTime.x \
 	asn1_KrbCredInfo.x \
-	asn1_LastReq.x				\
 	asn1_LR_TYPE.x \
+	asn1_LastReq.x \
 	asn1_MESSAGE_TYPE.x \
 	asn1_METHOD_DATA.x \
 	asn1_NAME_TYPE.x \
@@ -71,8 +68,6 @@ GEN=						\
 	asn1_TransitedEncoding.x \
 	asn1_UNSIGNED.x
 
-INCS=	krb5_asn1.h asn1_err.h 
-
 CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} krb5_asn1.h asn1_files
 
 .ORDER: ${GEN} krb5_asn1.h

kerberos5/lib/libgssapi/Makefile

@@ -1,66 +1,10 @@
 # $FreeBSD$
 
 LIB=	gssapi
-
-SRCS=	\
-	8003.c				\
-	accept_sec_context.c		\
-	acquire_cred.c			\
-	add_cred.c			\
-	add_oid_set_member.c		\
-	canonicalize_name.c		\
-	compare_name.c			\
-	compat.c			\
-	context_time.c			\
-	copy_ccache.c			\
-	create_emtpy_oid_set.c		\
-	decapsulate.c			\
-	delete_sec_context.c		\
-	display_name.c			\
-	display_status.c		\
-	duplicate_name.c		\
-	encapsulate.c			\
-	export_name.c			\
-	export_sec_context.c		\
-	external.c			\
-	get_mic.c			\
-	gssapi.h			\
-	import_name.c			\
-	import_sec_context.c		\
-	indicate_mechs.c		\
-	init.c				\
-	init_sec_context.c		\
-	inquire_context.c		\
-	inquire_cred.c			\
-	inquire_cred_by_mech.c		\
-	inquire_mechs_for_name.c	\
-	inquire_names_for_mech.c	\
-	process_context_token.c		\
-	release_buffer.c		\
-	release_cred.c			\
-	release_name.c			\
-	release_oid_set.c		\
-	test_oid_set_member.c		\
-	unwrap.c			\
-	v1.c				\
-	verify_mic.c			\
-        wrap.c				\
-        address_to_krb5addr.c
-
-CFLAGS+=-I${KRB5DIR}/lib/gssapi		\
-	-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/roken		\
-	-I.
-
 INCS=	gssapi.h
+MAN=	gss_acquire_cred.3 gssapi.3
 
-MAN=	\
+MLINKS=	gss_acquire_cred.3 gss_accept_sec_context.3 \
-	gss_acquire_cred.3		\
-	gssapi.3
-
-MLINKS=	\
-	gss_acquire_cred.3 gss_accept_sec_context.3	\
 	gss_acquire_cred.3 gss_add_cred.3 \
 	gss_acquire_cred.3 gss_add_oid_set_member.3 \
 	gss_acquire_cred.3 gss_canonicalize_name.3 \
@@ -100,6 +44,53 @@ MLINKS=	\
 	gss_acquire_cred.3 gss_wrap.3 \
 	gss_acquire_cred.3 gss_wrap_size_limit.3
 
+SRCS=	8003.c \
+	accept_sec_context.c \
+	acquire_cred.c \
+	add_cred.c \
+	add_oid_set_member.c \
+	address_to_krb5addr.c \
+	canonicalize_name.c \
+	compare_name.c \
+	compat.c \
+	context_time.c \
+	copy_ccache.c \
+	create_emtpy_oid_set.c \
+	decapsulate.c \
+	delete_sec_context.c \
+	display_name.c \
+	display_status.c \
+	duplicate_name.c \
+	encapsulate.c \
+	export_name.c \
+	export_sec_context.c \
+	external.c \
+	get_mic.c \
+	gssapi.h \
+	import_name.c \
+	import_sec_context.c \
+	indicate_mechs.c \
+	init.c \
+	init_sec_context.c \
+	inquire_context.c \
+	inquire_cred.c \
+	inquire_cred_by_mech.c \
+	inquire_mechs_for_name.c \
+	inquire_names_for_mech.c \
+	process_context_token.c \
+	release_buffer.c \
+	release_cred.c \
+	release_name.c \
+	release_oid_set.c \
+	test_oid_set_member.c \
+	unwrap.c \
+	v1.c \
+	verify_mic.c \
+	wrap.c
+
+CFLAGS+=-I${KRB5DIR}/lib/gssapi -I${KRB5DIR}/lib/krb5 \
+	-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/gssapi

kerberos5/lib/libhdb/Makefile

@@ -2,41 +2,35 @@
 
 LIB=	hdb
 
-INCS=	\
+INCS=	hdb-private.h \
-	hdb-private.h	\
 	hdb-protos.h \
 	hdb.h \
 	hdb_asn1.h \
 	hdb_err.h
 
-SRCS=	\
+SRCS=	common.c \
-	common.c			\
 	db.c \
 	db3.c \
 	hdb-ldap.c \
 	hdb.c \
+	hdb_asn1.h \
+	hdb_err.c \
+	hdb_err.h \
 	keytab.c \
 	mkey.c \
 	ndbm.c \
 	print.c \
-	hdb_err.c			\
-	hdb_err.h			\
-	hdb_asn1.h			\
 	${GEN:S/.x$/.c/}
 
-CFLAGS+=-I${KRB5DIR}/lib/hdb		\
+CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/asn1		\
+	-I${KRB5DIR}/lib/roken -I. ${LDAPCFLAGS}
-	-I${KRB5DIR}/lib/roken		\
-	-I.				\
-	${LDAPCFLAGS}
 
-GEN=					\
+GEN=	asn1_Event.x \
-	asn1_Key.x			\
 	asn1_GENERATION.x \
-	asn1_Event.x			\
 	asn1_HDBFlags.x \
-	asn1_hdb_entry.x		\
+	asn1_Key.x \
-	asn1_Salt.x
+	asn1_Salt.x \
+	asn1_hdb_entry.x
 
 CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} hdb_asn1.h asn1_files
 

kerberos5/lib/libkadm5clnt/Makefile

@@ -2,16 +2,16 @@
 
 LIB=	kadm5clnt
 
-INCS=	\
+INCS=	admin.h \
-	admin.h			\
 	kadm5-private.h \
 	kadm5-protos.h \
 	kadm5_err.h \
 	private.h
+
 INCSDIR=${INCLUDEDIR}/kadm5
 
-SRCS=	\
+SRCS=	chpass_c.c \
-	chpass_c.c			\
+	client_glue.c \
 	common_glue.c \
 	create_c.c \
 	delete_c.c \
@@ -22,19 +22,15 @@ SRCS=	\
 	get_princs_c.c \
 	init_c.c \
 	kadm5_err.c \
+	kadm5_err.h \
 	marshall.c \
 	modify_c.c \
 	privs_c.c \
 	randkey_c.c \
 	rename_c.c \
-	send_recv.c			\
+	send_recv.c
-	client_glue.c			\
-	kadm5_err.h
 
-CFLAGS+=-I${KRB5DIR}/lib/kadm5		\
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
-	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/roken		\
-	-I.
 
 .include <bsd.lib.mk>
 

kerberos5/lib/libkadm5srv/Makefile

@@ -2,8 +2,7 @@
 
 LIB=	kadm5srv
 
-SRCS=	\
+SRCS=	acl.c \
-	acl.c				\
 	bump_pw_expire.c \
 	chpass_s.c \
 	common_glue.c \
@@ -24,18 +23,15 @@ SRCS=	\
 	log.c \
 	marshall.c \
 	modify_s.c \
+	password_quality.c \
 	privs_s.c \
 	randkey_s.c \
 	rename_s.c \
+	server_glue.c \
 	set_keys.c \
-	set_modifier.c			\
+	set_modifier.c
-	password_quality.c		\
-	server_glue.c
 
-CFLAGS+=-I${KRB5DIR}/lib/kadm5		\
+CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
-	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/roken		\
-	-I.
 
 .include <bsd.lib.mk>
 

kerberos5/lib/libkafs5/Makefile

@@ -1,16 +1,10 @@
 # $FreeBSD$
 
 LIB=	kafs5
-CFLAGS+=-I${KRB5DIR}/lib/kafs \
-	-I${KRB5DIR}/lib/krb5 \
-	-I${KRB5DIR}/lib/roken
 INCS=	kafs.h
-SRCS=	afssys.c afskrb5.c common.c
-
 MAN=	kafs5.3
 
-MLINKS=	\
+MLINKS=	kafs5.3 k_afs_cell_of_file.3 \
-	kafs5.3 k_afs_cell_of_file.3	\
 	kafs5.3 k_hasafs.3 \
 	kafs5.3 k_pioctl.3 \
 	kafs5.3 k_setpag.3 \
@@ -25,6 +19,9 @@ MLINKS=	\
 	kafs5.3 krb_afslog.3 \
 	kafs5.3 krb_afslog_uid.3
 
+SRCS=	afssys.c afskrb5.c common.c
+CFLAGS+=-I${KRB5DIR}/lib/kafs -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
+
 CLEANFILES= kafs5.3
 
 kafs5.3: kafs.3

kerberos5/lib/libkrb5/Makefile

@@ -2,121 +2,14 @@
 
 LIB=	krb5
 
-SRCS=	\
+INCS=	heim_err.h \
-	acl.c				\
-	add_et_list.c			\
-	addr_families.c			\
-	aname_to_localname.c		\
-	appdefault.c			\
-	asn1_glue.c			\
-	auth_context.c			\
-	build_ap_req.c			\
-	build_auth.c			\
-	cache.c				\
-	changepw.c			\
-	codec.c				\
-	config_file.c			\
-	config_file_netinfo.c		\
-	convert_creds.c			\
-	constants.c			\
-	context.c			\
-	copy_host_realm.c		\
-	crc.c				\
-	creds.c				\
-	crypto.c			\
-	data.c				\
-	eai_to_heim_errno.c		\
-	error_string.c			\
-	expand_hostname.c		\
-	fcache.c			\
-	free.c				\
-	free_host_realm.c		\
-	generate_seq_number.c		\
-	generate_subkey.c		\
-	get_addrs.c			\
-	get_cred.c			\
-	get_default_principal.c		\
-	get_default_realm.c		\
-	get_for_creds.c			\
-	get_host_realm.c		\
-	get_in_tkt.c			\
-	get_in_tkt_pw.c			\
-	get_in_tkt_with_keytab.c	\
-	get_in_tkt_with_skey.c		\
-	get_port.c			\
-	init_creds.c			\
-	init_creds_pw.c			\
-	keyblock.c			\
-	keytab.c			\
-	keytab_any.c			\
-	keytab_file.c			\
-	keytab_memory.c			\
-	keytab_keyfile.c		\
-	keytab_krb4.c			\
-	krbhst.c			\
-	kuserok.c			\
-	log.c				\
-	mcache.c			\
-	misc.c				\
-	mk_error.c			\
-	mk_priv.c			\
-	mk_rep.c			\
-	mk_req.c			\
-	mk_req_ext.c			\
-	mk_safe.c			\
-	net_read.c			\
-	net_write.c			\
-	n-fold.c			\
-	padata.c			\
-	principal.c			\
-	prog_setup.c			\
-	prompter_posix.c		\
-	rd_cred.c			\
-	rd_error.c			\
-	rd_priv.c			\
-	rd_rep.c			\
-	rd_req.c			\
-	rd_safe.c			\
-	read_message.c			\
-	recvauth.c			\
-	replay.c			\
-	send_to_kdc.c			\
-	sendauth.c			\
-	set_default_realm.c		\
-	sock_principal.c		\
-	store.c				\
-	store_emem.c			\
-	store_fd.c			\
-	store_mem.c			\
-	ticket.c			\
-	time.c				\
-	transited.c			\
-	verify_init.c			\
-	verify_user.c			\
-	version.c			\
-	warn.c				\
-	write_message.c			\
-	krb5_err.c			\
-	krb5_err.h			\
-	k524_err.c			\
 	k524_err.h \
-	heim_err.c			\
-	heim_err.h
-
-CFLAGS+=-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/asn1		\
-	-I${KRB5DIR}/lib/roken		\
-	-I.
-
-INCS=	krb5.h				\
 	krb5-protos.h \
 	krb5-types.h \
-	heim_err.h			\
+	krb5.h \
-	krb5_err.h			\
+	krb5_err.h
-	k524_err.h
 
-MAN=	\
+MAN=	krb5.3 \
-	krb5.3				\
 	krb5_425_conv_principal.3 \
 	krb5_address.3 \
 	krb5_aname_to_localname.3 \
@@ -147,12 +40,10 @@ MAN=	\
 	krb5_unparse_name.3 \
 	krb5_verify_user.3 \
 	krb5_warn.3
-
 MAN+=	krb5.conf.5
 MAN+=	kerberos.8
 
-MLINKS=	\
+MLINKS=	krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3 \
-	krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3	\
 	krb5_425_conv_principal.3 krb5_524_conv_principal.3 \
 	krb5_address.3 krb5_addr2sockaddr.3 \
 	krb5_address.3 krb5_address_compare.3 \
@@ -318,7 +209,108 @@ MLINKS=	\
 	krb5_warn.3 krb5_vwarnx.3 \
 	krb5_warn.3 krb5_warnx.3
 
+SRCS=	acl.c \
+	add_et_list.c \
+	addr_families.c \
+	aname_to_localname.c \
+	appdefault.c \
+	asn1_glue.c \
+	auth_context.c \
+	build_ap_req.c \
+	build_auth.c \
+	cache.c \
+	changepw.c \
+	codec.c \
+	config_file.c \
+	config_file_netinfo.c \
+	constants.c \
+	context.c \
+	convert_creds.c \
+	copy_host_realm.c \
+	crc.c \
+	creds.c \
+	crypto.c \
+	data.c \
+	eai_to_heim_errno.c \
+	error_string.c \
+	expand_hostname.c \
+	fcache.c \
+	free.c \
+	free_host_realm.c \
+	generate_seq_number.c \
+	generate_subkey.c \
+	get_addrs.c \
+	get_cred.c \
+	get_default_principal.c \
+	get_default_realm.c \
+	get_for_creds.c \
+	get_host_realm.c \
+	get_in_tkt.c \
+	get_in_tkt_pw.c \
+	get_in_tkt_with_keytab.c \
+	get_in_tkt_with_skey.c \
+	get_port.c \
+	heim_err.c \
+	heim_err.h \
+	init_creds.c \
+	init_creds_pw.c \
+	k524_err.c \
+	k524_err.h \
+	keyblock.c \
+	keytab.c \
+	keytab_any.c \
+	keytab_file.c \
+	keytab_keyfile.c \
+	keytab_krb4.c \
+	keytab_memory.c \
+	krb5_err.c \
+	krb5_err.h \
+	krbhst.c \
+	kuserok.c \
+	log.c \
+	mcache.c \
+	misc.c \
+	mk_error.c \
+	mk_priv.c \
+	mk_rep.c \
+	mk_req.c \
+	mk_req_ext.c \
+	mk_safe.c \
+	n-fold.c \
+	net_read.c \
+	net_write.c \
+	padata.c \
+	principal.c \
+	prog_setup.c \
+	prompter_posix.c \
+	rd_cred.c \
+	rd_error.c \
+	rd_priv.c \
+	rd_rep.c \
+	rd_req.c \
+	rd_safe.c \
+	read_message.c \
+	recvauth.c \
+	replay.c \
+	send_to_kdc.c \
+	sendauth.c \
+	set_default_realm.c \
+	sock_principal.c \
+	store.c \
+	store_emem.c \
+	store_fd.c \
+	store_mem.c \
+	ticket.c \
+	time.c \
+	transited.c \
+	verify_init.c \
+	verify_user.c \
+	version.c \
+	warn.c \
+	write_message.c
+
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
+
 .include <bsd.lib.mk>
 
-.PATH:		${KRB5DIR}/lib/krb5
+.PATH: ${KRB5DIR}/lib/krb5 ${.CURDIR}/../../include
-.PATH:		${.CURDIR}/../../include

kerberos5/lib/libroken/Makefile

@@ -1,11 +1,12 @@
 # $FreeBSD$
 
 LIB=	roken
+INCS=	roken.h roken-common.h
 
-SRCS=	\
+SRCS=	base64.c \
-	base64.c			\
 	bswap.c \
 	concat.c \
+	copyhostent.c \
 	ecalloc.c \
 	emalloc.c \
 	environment.c \
@@ -14,9 +15,9 @@ SRCS=	\
 	esetenv.c \
 	estrdup.c \
 	ewrite.c \
-	getaddrinfo_hostspec.c		\
 	get_default_username.c \
 	get_window_size.c \
+	getaddrinfo_hostspec.c \
 	getarg.c \
 	getnameinfo_verified.c \
 	hostent_find_fqdn.c \
@@ -31,32 +32,29 @@ SRCS=	\
 	parse_time.c \
 	parse_units.c \
 	resolve.c \
+	roken.h \
 	roken_gethostby.c \
 	rtbl.c \
 	simple_exec.c \
 	snprintf.c \
 	socket.c \
 	strcollect.c \
+	strlwr.c \
+	strndup.c \
+	strnlen.c \
+	strsep_copy.c \
+	strupr.c \
 	timeval.c \
 	tm2time.c \
 	unvis.c \
 	verify.c \
 	vis.c \
 	warnerr.c \
-	write_pid.c			\
+	write_pid.c
-	copyhostent.c			\
-	strlwr.c			\
-	strndup.c			\
-	strnlen.c			\
-	strsep_copy.c			\
-	strupr.c			\
-	roken.h
 
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
+CFLAGS+=-I${KRB5DIR}/lib/roken -I.
-	-I.
 
-INCS=	roken.h				\
+CLEANFILES= roken.h
-	roken-common.h
 
 roken.h: ../../tools/make-roken/make-roken
 	../../tools/make-roken/make-roken > ${.TARGET}
@@ -64,8 +62,6 @@ roken.h: ../../tools/make-roken/make-roken
 ../../tools/make-roken/make-roken:
 	cd ${.CURDIR}/../../tools/make-roken && ${MAKE}
 
-CLEANFILES= roken.h
-
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/roken

kerberos5/lib/libsl/Makefile

@@ -1,13 +1,10 @@
 # $FreeBSD$
 
 LIB=	sl
-
+INTERNALLIB=
 SRCS=	sl.c
-
 CFLAGS+=-I${KRB5DIR}/lib/sl
 
-INTERNALLIB= yes
-
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/sl

kerberos5/lib/libvers/Makefile

@@ -1,14 +1,11 @@
 # $FreeBSD$
 
 LIB=	vers
-
+INTERNALLIB=
-SRCS=	\
+SRCS=	print_version.c print_version.h
-	print_version.c			\
-	print_version.h
-
 CFLAGS+=-I.
 
-INTERNALLIB=	YES
+CLEANFILES= print_version.h
 
 print_version.h: ../../tools/make-print-version/make-print-version
 	../../tools/make-print-version/make-print-version ${.TARGET}
@@ -16,8 +13,6 @@ print_version.h: ../../tools/make-print-version/make-print-version
 ../../tools/make-print-version/make-print-version:
 	cd ${.CURDIR}/../../tools/make-print-version && ${MAKE}
 
-CLEANFILES=	print_version.h
-
 .include <bsd.lib.mk>
 
 .PATH: ${KRB5DIR}/lib/vers

kerberos5/libexec/Makefile.inc

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 BINDIR=	/usr/libexec
 

kerberos5/libexec/hprop/Makefile

@@ -1,26 +1,15 @@
 # $FreeBSD$
 
 PROG=	hprop
-
+MAN=	hprop.8
-SRCS=	\
+SRCS=	hprop.c mit_dump.c v4_dump.c
-	hprop.c			\
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1
-	mit_dump.c		\
-	v4_dump.c
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1
-
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
-MAN=	hprop.8
-
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc

kerberos5/libexec/hpropd/Makefile

@@ -1,22 +1,15 @@
 # $FreeBSD$
 
 PROG=	hpropd
-
+MAN=	hpropd.8
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
 	${LDAPCFLAGS}
-
-LDADD=		-lhdb -lkrb5 -lroken ${LIBVERS} \
-		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
 LDFLAGS=${LDAPLDFLAGS}
 
-MAN=		hpropd.8
-
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kdc

kerberos5/libexec/ipropd-master/Makefile

@@ -1,26 +1,15 @@
 # $FreeBSD$
 
 PROG=	ipropd-master
-
+NOMAN=
-SRCS=	\
+SRCS=	ipropd_master.c kadm5_err.h
-	ipropd_master.c		\
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	kadm5_err.h
+	-I. ${LDAPCFLAGS}
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
-	-I.			\
-	${LDAPCFLAGS}
-
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-NOMAN=	yes
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/libexec/ipropd-slave/Makefile

@@ -1,26 +1,15 @@
 # $FreeBSD$
 
 PROG=	ipropd-slave
-
+NOMAN=
-SRCS=	\
+SRCS=	ipropd_slave.c kadm5_err.h
-	ipropd_slave.c		\
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	kadm5_err.h
+	-I. ${LDAPCFLAGS}
-
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
-	-I.			\
-	${LDAPCFLAGS}
-
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-NOMAN=	yes
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/libexec/kadmind/Makefile

@@ -1,25 +1,15 @@
 # $FreeBSD$
 
 PROG=	kadmind
-
+MAN=	kadmind.8
-SRCS=	kadmind.c			\
+SRCS=	kadm_conn.c kadmind.c server.c
-	server.c			\
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	kadm_conn.c
-
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
-	-I${KRB5DIR}/lib/krb5		\
-	-I${KRB5DIR}/lib/asn1		\
 	${LDAPCFLAGS}
-
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-MAN=	kadmind.8
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/libexec/kdc/Makefile

@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	kdc
+MAN=	kdc.8
 
-SRCS=	\
+SRCS=	524.c \
-	524.c			\
 	config.c \
 	connect.c \
 	kerberos4.c \
@@ -12,20 +12,13 @@ SRCS=	\
 	main.c \
 	misc.c
 
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
+CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
 	${LDAPCFLAGS}
-
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-MAN=	kdc.8
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/libexec/kpasswdd/Makefile

@@ -1,19 +1,13 @@
 # $FreeBSD$
 
 PROG=	kpasswdd
-
+MAN=	kpasswdd.8
-CFLAGS+=-I${KRB5DIR}/lib/roken		\
+CFLAGS+=-I${KRB5DIR}/lib/roken ${LDAPCFLAGS}
-	${LDAPCFLAGS}
-
-LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
-MAN=	kpasswdd.8
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/tools/asn1_compile/Makefile

@@ -3,8 +3,7 @@
 PROG=	asn1_compile
 NOMAN=
 
-SRCS=	\
+SRCS=	gen.c \
-	gen.c \
 	gen_copy.c \
 	gen_decode.c \
 	gen_encode.c \
@@ -27,6 +26,8 @@ SRCS=	\
 
 CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I.
 
+CLEANFILES= print_version.h roken.h
+
 print_version.h: ../make-print-version/make-print-version
 	../make-print-version/make-print-version ${.TARGET}
 
@@ -39,8 +40,6 @@ roken.h: ../make-roken/make-roken
 ../make-roken/make-roken:
 	cd ${.CURDIR}/../make-roken && ${MAKE}
 
-CLEANFILES= print_version.h roken.h
-
 .include <bsd.prog.mk>
 
 # There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers,

kerberos5/usr.bin/kadmin/Makefile

@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	kadmin
+MAN=	kadmin.8
 
-SRCS=	\
+SRCS=	ank.c \
-	ank.c				\
 	cpw.c \
 	del.c \
 	del_enctype.c \
@@ -14,29 +14,21 @@ SRCS=	\
 	kadmin.c \
 	load.c \
 	mod.c \
+	random_password.c \
 	rename.c \
-	util.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		\
-	-lreadline -lncurses ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
 
+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 \
-MAN=	kadmin.8
+	${LIBSL} -lroken ${LIBVERS} -lasn1 \
+	-lcrypto -lcrypt -lcom_err \
+	-lreadline -lncurses ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/usr.bin/kdestroy/Makefile

@@ -1,14 +1,11 @@
 # $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>
 

kerberos5/usr.bin/kinit/Makefile

@@ -1,14 +1,11 @@
 # $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>
 

kerberos5/usr.bin/klist/Makefile

@@ -1,14 +1,11 @@
 # $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>
 

kerberos5/usr.bin/kpasswd/Makefile

@@ -1,14 +1,11 @@
 # $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>
 

kerberos5/usr.bin/krb5-config/Makefile

@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 SCRIPTS=krb5-config
-
 MAN=	krb5-config.1
 
 CLEANFILES= krb5-config

kerberos5/usr.bin/ksu/Makefile

@@ -1,23 +1,17 @@
 # $FreeBSD$
 
 PROG=	ksu
-
-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
+.endif
+NOMAN=
+SRCS=	su.c
+CFLAGS+=-I${KRB5DIR}/lib/roken
+DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
+LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 

kerberos5/usr.bin/verify_krb5_conf/Makefile

@@ -1,18 +1,12 @@
 # $FreeBSD$
 
 PROG=	verify_krb5_conf
-
+MAN=	verify_krb5_conf.8
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1
-
-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} \
-MAN=	verify_krb5_conf.8
+	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 

kerberos5/usr.sbin/kstash/Makefile

@@ -1,21 +1,14 @@
 # $FreeBSD$
 
 PROG=	kstash
-
+MAN=	kstash.8
-CFLAGS+=-I${KRB5DIR}/lib/roken	\
+CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-	-I${KRB5DIR}/lib/krb5	\
-	-I${KRB5DIR}/lib/asn1	\
 	${LDAPCFLAGS}
-
-LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
-
-LDFLAGS=${LDAPLDFLAGS}
-
 DPADD=	${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
-
+LDADD=	-lhdb -lkrb5 -lroken ${LIBVERS} \
-MAN=	kstash.8
+	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
+LDFLAGS=${LDAPLDFLAGS}
 
 .include <bsd.prog.mk>
 

kerberos5/usr.sbin/ktutil/Makefile

@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PROG=	ktutil
+MAN=	ktutil.8
 
-SRCS=		\
+SRCS=	add.c \
-		add.c				\
 	change.c \
 	copy.c \
 	get.c \
@@ -13,19 +13,14 @@ SRCS=		\
 	remove.c \
 	rename.c
 
-CFLAGS+=	-I${KRB5DIR}/lib/roken \
+CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl
-		-I${KRB5DIR}/lib/sl \
+DPADD=	${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
-
+	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
+	${LIBREADLINE} ${LIBNCURSES}
 LDADD=	-lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err \
 	-lreadline -lncurses
 
-DPADD=		${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \
-		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \
-		${LIBREADLINE} ${LIBNCURSES}
-
-MAN=		ktutil.8
-
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/admin