Index: head/kerberos5/lib/libasn1/Makefile
===================================================================
--- head/kerberos5/lib/libasn1/Makefile	(revision 262254)
+++ head/kerberos5/lib/libasn1/Makefile	(revision 262255)
@@ -1,124 +1,124 @@
 # $FreeBSD$
 
 LIB=	asn1
 LDFLAGS=	-Wl,--no-undefined
 INCS=	asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h
 LDADD=	-lcom_err -lroken
 DPADD=	${LIBCOM_ERR} ${LIBROKEN}
 VERSION_MAP=	${.CURDIR}/version.map
 
 SRCS=	asn1_err.c \
 	asn1_err.h \
 	der.c \
 	der_copy.c \
 	der_cmp.c \
 	der_free.c \
 	der_format.c \
 	der_get.c \
 	der_length.c \
 	der_put.c \
 	extra.c \
 	template.c \
 	timegm.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I.
 
 GEN_RFC2459=	asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx
 GEN_CMS= 	asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx
 GEN_K5=		asn1_krb5_asn1.x krb5_asn1.hx krb5_asn1-priv.hx
 GEN_PKINIT= 	asn1_pkinit_asn1.x pkinit_asn1.hx pkinit_asn1-priv.hx
 GEN_PKCS8=	asn1_pkcs8_asn1.x pkcs8_asn1.hx pkcs8_asn1-priv.hx
 GEN_PKCS9=	asn1_pkcs9_asn1.x pkcs9_asn1.hx pkcs9_asn1-priv.hx
 GEN_PKCS12=	asn1_pkcs12_asn1.x pkcs12_asn1.hx pkcs12_asn1-priv.hx
 GEN_DIGEST=	asn1_digest_asn1.x digest_asn1.hx digest_asn1-priv.hx
 GEN_KX509=	asn1_kx509_asn1.x kx509_asn1.hx kx509_asn1-priv.hx
 
 GEN+=	${GEN_RFC2459}
 GEN+=	${GEN_CMS}
 GEN+=	${GEN_K5}
 GEN+=	${GEN_PKINIT}
 GEN+=	${GEN_PKCS8}
 GEN+=	${GEN_PKCS9}
 GEN+=	${GEN_PKCS12}
 GEN+=	${GEN_DIGEST}
 GEN+=	${GEN_KX509}
 
 CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} *_asn1_files
 
 INCS+=	krb5_asn1.h \
 	pkinit_asn1.h \
 	cms_asn1.h \
 	rfc2459_asn1.h \
 	pkcs8_asn1.h \
 	pkcs9_asn1.h \
 	pkcs12_asn1.h \
 	digest_asn1.h \
 	kx509_asn1.h
 
 .ORDER: ${GEN_CMS}
 ${GEN_CMS}: cms.asn1 cms.opt
 	${ASN1_COMPILE} --one-code-file \
 		--option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1
 
 .ORDER: ${GEN_RFC2459}
 ${GEN_RFC2459}: rfc2459.asn1
 	${ASN1_COMPILE} \
 		--one-code-file \
 		--preserve-binary=TBSCertificate \
 		--preserve-binary=TBSCRLCertList \
 		--preserve-binary=Name \
 		--sequence=GeneralNames \
 		--sequence=Extensions \
 		--sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1
 
 .ORDER: ${GEN_K5}
 ${GEN_K5}: krb5.asn1 krb5.opt
 	${ASN1_COMPILE} \
 		--one-code-file \
 		--option-file=${.ALLSRC:M*.opt} \
 		${.ALLSRC:M*.asn1} krb5_asn1
 
 .ORDER: ${GEN_PKINIT}
 ${GEN_PKINIT}: pkinit.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkinit_asn1
 
 .ORDER: ${GEN_PKCS8}
 ${GEN_PKCS8}: pkcs8.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs8_asn1
 
 .ORDER: ${GEN_PKCS9}
 ${GEN_PKCS9}: pkcs9.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs9_asn1
 
 .ORDER: ${GEN_PKCS12}
 ${GEN_PKCS12}: pkcs12.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} pkcs12_asn1
 
 .ORDER: ${GEN_DIGEST}
 ${GEN_DIGEST}: digest.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} digest_asn1
 
 .ORDER: ${GEN_KX509}
 ${GEN_KX509}: kx509.asn1
 	${ASN1_COMPILE} --one-code-file \
 		${.ALLSRC:M*.asn1} kx509_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 	
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/asn1
Index: head/kerberos5/lib/libgssapi_spnego/Makefile
===================================================================
--- head/kerberos5/lib/libgssapi_spnego/Makefile	(revision 262254)
+++ head/kerberos5/lib/libgssapi_spnego/Makefile	(revision 262255)
@@ -1,58 +1,58 @@
 # $FreeBSD$
 
 LIB=	gssapi_spnego
 LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined
 LDADD=	-lgssapi -lheimbase -lasn1 -lroken
 DPADD=	${LIBGSSAPI} ${LIBHEIMBASE} ${LIBASN1} ${LIBROKEN}
 SHLIB_MAJOR=	10
 
 SRCS=	accept_sec_context.c \
 	compat.c \
 	context_stubs.c \
 	cred_stubs.c \
 	external.c \
 	init_sec_context.c \
 	freebsd_compat.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/} \
 	gss_oid.c
 
 GEN=	asn1_ContextFlags.x \
 	asn1_MechType.x \
 	asn1_MechTypeList.x \
 	asn1_NegotiationToken.x \
 	asn1_NegotiationTokenWin.x \
 	asn1_NegHints.x \
 	asn1_NegTokenInit.x \
 	asn1_NegTokenInitWin.x \
 	asn1_NegTokenResp.x \
 	spnego_asn1.hx \
 	spnego_asn1-priv.hx
 
 CFLAGS+=-I${KRB5DIR}/lib/gssapi
 CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
 CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego
 CFLAGS+=-I${KRB5DIR}/lib/asn1
 CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi
 CFLAGS+=-I${KRB5DIR}/lib/roken -I.
 
 CLEANFILES=	${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \
 		spnego_asn1_files spnego_asn1-template.c
 
 .ORDER: ${GEN}
 ${GEN}: spnego.asn1 spnego.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 		${.ALLSRC:M*.asn1} spnego_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5
Index: head/kerberos5/lib/libhdb/Makefile
===================================================================
--- head/kerberos5/lib/libhdb/Makefile	(revision 262254)
+++ head/kerberos5/lib/libhdb/Makefile	(revision 262255)
@@ -1,103 +1,103 @@
 # $FreeBSD$
 
 LIB=	hdb
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP=	${KRB5DIR}/lib/hdb/version-script.map
 LDADD=	-lasn1 -lcom_err -lkrb5 -lroken -lheimsqlite
 DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBKRB5} ${LIBROKEN} ${LIBHEIMSQLITE} ${LDAPDPADD}
 
 MAN=	HDB.3 hdb_entry_ex.3
 
 MLINKS=	HDB.3 hdb__del.3 \
 	HDB.3 hdb__get.3 \
 	HDB.3 hdb__put.3 \
 	HDB.3 hdb_auth_status.3 \
 	HDB.3 hdb_check_constrained_delegation.3 \
 	HDB.3 hdb_check_pkinit_ms_upn_match.3 \
 	HDB.3 hdb_check_s4u2self.3 \
 	HDB.3 hdb_close.3 \
 	HDB.3 hdb_destroy.3 \
 	HDB.3 hdb_fetch_kvno.3 \
 	HDB.3 hdb_firstkey.3 \
 	HDB.3 hdb_free.3 \
 	HDB.3 hdb_get_realms.3 \
 	HDB.3 hdb_lock.3 \
 	HDB.3 hdb_name.3 \
 	HDB.3 hdb_nextkey.3 \
 	HDB.3 hdb_open.3 \
 	HDB.3 hdb_password.3 \
 	HDB.3 hdb_remove.3 \
 	HDB.3 hdb_rename.3 \
 	HDB.3 hdb_store.3 \
 	HDB.3 hdb_unlock.3
 
 INCS=	hdb-protos.h \
 	hdb.h \
 	hdb_asn1.h \
 	hdb_err.h
 
 SRCS=	common.c \
 	db.c \
 	db3.c \
 	dbinfo.c \
 	ext.c \
 	hdb-ldap.c \
 	hdb.c \
 	hdb_err.c \
 	hdb_err.h \
 	hdb-sqlite.c \
 	hdb-keytab.c \
 	hdb-mitdb.c \
 	keys.c \
 	keytab.c \
 	mkey.c \
 	ndbm.c \
 	print.c \
 	${GEN:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
 	-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sqlite \
 	-I${KRB5DIR}/lib/krb5 \
 	-I. ${LDAPCFLAGS}
 CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
 
 GEN=	asn1_Salt.x \
 	asn1_Key.x \
 	asn1_Event.x \
 	asn1_HDBFlags.x \
 	asn1_GENERATION.x \
 	asn1_HDB_Ext_PKINIT_acl.x \
 	asn1_HDB_Ext_PKINIT_cert.x \
 	asn1_HDB_Ext_PKINIT_hash.x \
 	asn1_HDB_Ext_Constrained_delegation_acl.x \
 	asn1_HDB_Ext_Lan_Manager_OWF.x \
 	asn1_HDB_Ext_Password.x \
 	asn1_HDB_Ext_Aliases.x \
 	asn1_HDB_extension.x \
 	asn1_HDB_extensions.x \
 	asn1_hdb_entry.x \
 	asn1_hdb_entry_alias.x \
 	asn1_hdb_keyset.x \
 	hdb_asn1.hx \
 	hdb_asn1-priv.hx
 
 CLEANFILES=	${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \
 		hdb_asn1-template.[ch]*
 
 .ORDER: ${GEN}
 ${GEN}: hdb.asn1
 	${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/hdb ${KRB5DIR}/doc/doxyout/hdb/man/man3/
Index: head/kerberos5/lib/libhx509/Makefile
===================================================================
--- head/kerberos5/lib/libhx509/Makefile	(revision 262254)
+++ head/kerberos5/lib/libhx509/Makefile	(revision 262255)
@@ -1,298 +1,298 @@
 # $FreeBSD$
 
 LIB=	hx509
 LDFLAGS=	-Wl,--no-undefined
 VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map
 LDADD=	-lasn1 -lcom_err -lcrypto -lroken -lwind
 DPADD=	${LIBASN1} ${LIBCOM_ERR} ${LIBCRYPTO} ${LIBROKEN} ${LIBWIND}
 
 MAN=	hx509.3 \
 	hx509_ca.3 \
 	hx509_cert.3 \
 	hx509_cms.3 \
 	hx509_crypto.3 \
 	hx509_env.3 \
 	hx509_error.3 \
 	hx509_keyset.3 \
 	hx509_lock.3 \
 	hx509_misc.3 \
 	hx509_name.3 \
 	hx509_peer.3 \
 	hx509_print.3 \
 	hx509_query.3 \
 	hx509_revoke.3 \
 	hx509_verify.3
 
 MLINKS=	hx509.3 hx509_context_free.3 \
 	hx509.3 hx509_context_init.3 \
 	hx509_ca.3 hx509_ca_sign.3 \
 	hx509_ca.3 hx509_ca_sign_self.3 \
 	hx509_ca.3 hx509_ca_tbs_add_crl_dp_uri.3 \
 	hx509_ca.3 hx509_ca_tbs_add_eku.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_hostname.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_jid.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_ms_upn.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_otherName.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_pkinit.3 \
 	hx509_ca.3 hx509_ca_tbs_add_san_rfc822name.3 \
 	hx509_ca.3 hx509_ca_tbs_free.3 \
 	hx509_ca.3 hx509_ca_tbs_init.3 \
 	hx509_ca.3 hx509_ca_tbs_set_ca.3 \
 	hx509_ca.3 hx509_ca_tbs_set_domaincontroller.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notAfter.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notAfter_lifetime.3 \
 	hx509_ca.3 hx509_ca_tbs_set_notBefore.3 \
 	hx509_ca.3 hx509_ca_tbs_set_proxy.3 \
 	hx509_ca.3 hx509_ca_tbs_set_serialnumber.3 \
 	hx509_ca.3 hx509_ca_tbs_set_spki.3 \
 	hx509_ca.3 hx509_ca_tbs_set_subject.3 \
 	hx509_ca.3 hx509_ca_tbs_set_template.3 \
 	hx509_ca.3 hx509_ca_tbs_set_unique.3 \
 	hx509_ca.3 hx509_ca_tbs_subject_expand.3 \
 	hx509_ca.3 hx509_ca_tbs_template_units.3 \
 	hx509_cert.3 hx509_cert_binary.3 \
 	hx509_cert.3 hx509_cert_check_eku.3 \
 	hx509_cert.3 hx509_cert_cmp.3 \
 	hx509_cert.3 hx509_cert_find_subjectAltName_otherName.3 \
 	hx509_cert.3 hx509_cert_free.3 \
 	hx509_cert.3 hx509_cert_get_SPKI.3 \
 	hx509_cert.3 hx509_cert_get_SPKI_AlgorithmIdentifier.3 \
 	hx509_cert.3 hx509_cert_get_attribute.3 \
 	hx509_cert.3 hx509_cert_get_base_subject.3 \
 	hx509_cert.3 hx509_cert_get_friendly_name.3 \
 	hx509_cert.3 hx509_cert_get_issuer.3 \
 	hx509_cert.3 hx509_cert_get_issuer_unique_id.3 \
 	hx509_cert.3 hx509_cert_get_notAfter.3 \
 	hx509_cert.3 hx509_cert_get_notBefore.3 \
 	hx509_cert.3 hx509_cert_get_serialnumber.3 \
 	hx509_cert.3 hx509_cert_get_subject.3 \
 	hx509_cert.3 hx509_cert_get_subject_unique_id.3 \
 	hx509_cert.3 hx509_cert_init.3 \
 	hx509_cert.3 hx509_cert_init_data.3 \
 	hx509_cert.3 hx509_cert_ref.3 \
 	hx509_cert.3 hx509_cert_set_friendly_name.3 \
 	hx509_cert.3 hx509_print_cert.3 \
 	hx509_cert.3 hx509_query_alloc.3 \
 	hx509_cert.3 hx509_query_free.3 \
 	hx509_cert.3 hx509_query_match_cmp_func.3 \
 	hx509_cert.3 hx509_query_match_eku.3 \
 	hx509_cert.3 hx509_query_match_friendly_name.3 \
 	hx509_cert.3 hx509_query_match_issuer_serial.3 \
 	hx509_cert.3 hx509_query_match_option.3 \
 	hx509_cert.3 hx509_query_statistic_file.3 \
 	hx509_cert.3 hx509_query_unparse_stats.3 \
 	hx509_cert.3 hx509_verify_ctx_f_allow_default_trustanchors.3 \
 	hx509_cert.3 hx509_verify_hostname.3 \
 	hx509_cms.3 hx509_cms_create_signed_1.3 \
 	hx509_cms.3 hx509_cms_envelope_1.3 \
 	hx509_cms.3 hx509_cms_unenvelope.3 \
 	hx509_cms.3 hx509_cms_unwrap_ContentInfo.3 \
 	hx509_cms.3 hx509_cms_verify_signed.3 \
 	hx509_cms.3 hx509_cms_wrap_ContentInfo.3 \
 	hx509_crypto.3 hx509_verify_signature.3 \
 	hx509_env.3 hx509_env_add.3 \
 	hx509_env.3 hx509_env_add_binding.3 \
 	hx509_env.3 hx509_env_find.3 \
 	hx509_env.3 hx509_env_find_binding.3 \
 	hx509_env.3 hx509_env_free.3 \
 	hx509_env.3 hx509_env_lfind.3 \
 	hx509_error.3 hx509_clear_error_string.3 \
 	hx509_error.3 hx509_err.3 \
 	hx509_error.3 hx509_free_error_string.3 \
 	hx509_error.3 hx509_get_error_string.3 \
 	hx509_error.3 hx509_set_error_string.3 \
 	hx509_error.3 hx509_set_error_stringv.3 \
 	hx509_keyset.3 hx509_certs_add.3 \
 	hx509_keyset.3 hx509_certs_append.3 \
 	hx509_keyset.3 hx509_certs_end_seq.3 \
 	hx509_keyset.3 hx509_certs_filter.3 \
 	hx509_keyset.3 hx509_certs_find.3 \
 	hx509_keyset.3 hx509_certs_free.3 \
 	hx509_keyset.3 hx509_certs_info.3 \
 	hx509_keyset.3 hx509_certs_init.3 \
 	hx509_keyset.3 hx509_certs_iter_f.3 \
 	hx509_keyset.3 hx509_certs_merge.3 \
 	hx509_keyset.3 hx509_certs_next_cert.3 \
 	hx509_keyset.3 hx509_certs_start_seq.3 \
 	hx509_keyset.3 hx509_certs_store.3 \
 	hx509_keyset.3 hx509_ci_print_names.3 \
 	hx509_keyset.3 hx509_get_one_cert.3 \
 	hx509_misc.3 hx509_free_octet_string_list.3 \
 	hx509_misc.3 hx509_xfree.3 \
 	hx509_name.3 hx509_general_name_unparse.3 \
 	hx509_name.3 hx509_name_binary.3 \
 	hx509_name.3 hx509_name_cmp.3 \
 	hx509_name.3 hx509_name_copy.3 \
 	hx509_name.3 hx509_name_expand.3 \
 	hx509_name.3 hx509_name_free.3 \
 	hx509_name.3 hx509_name_is_null_p.3 \
 	hx509_name.3 hx509_name_to_Name.3 \
 	hx509_name.3 hx509_name_to_string.3 \
 	hx509_name.3 hx509_parse_name.3 \
 	hx509_name.3 hx509_unparse_der_name.3 \
 	hx509_peer.3 hx509_peer_info_add_cms_alg.3 \
 	hx509_peer.3 hx509_peer_info_alloc.3 \
 	hx509_peer.3 hx509_peer_info_free.3 \
 	hx509_peer.3 hx509_peer_info_set_cert.3 \
 	hx509_peer.3 hx509_peer_info_set_cms_algs.3 \
 	hx509_print.3 hx509_bitstring_print.3 \
 	hx509_print.3 hx509_cert_keyusage_print.3 \
 	hx509_print.3 hx509_oid_print.3 \
 	hx509_print.3 hx509_oid_sprint.3 \
 	hx509_print.3 hx509_print_stdout.3 \
 	hx509_print.3 hx509_validate_cert.3 \
 	hx509_print.3 hx509_validate_ctx_add_flags.3 \
 	hx509_print.3 hx509_validate_ctx_free.3 \
 	hx509_print.3 hx509_validate_ctx_init.3 \
 	hx509_print.3 hx509_validate_ctx_set_print.3 \
 	hx509_revoke.3 hx509_ocsp_request.3 \
 	hx509_revoke.3 hx509_revoke_add_crl.3 \
 	hx509_revoke.3 hx509_revoke_add_ocsp.3 \
 	hx509_revoke.3 hx509_revoke_free.3 \
 	hx509_revoke.3 hx509_revoke_init.3 \
 	hx509_revoke.3 hx509_revoke_ocsp_print.3 \
 	hx509_revoke.3 hx509_revoke_verify.3 \
 	hx509_verify.3 hx509_context_set_missing_revoke.3 \
 	hx509_verify.3 hx509_crl_add_revoked_certs.3 \
 	hx509_verify.3 hx509_crl_alloc.3 \
 	hx509_verify.3 hx509_crl_free.3 \
 	hx509_verify.3 hx509_crl_lifetime.3 \
 	hx509_verify.3 hx509_crl_sign.3 \
 	hx509_verify.3 hx509_ocsp_verify.3 \
 	hx509_verify.3 hx509_verify_attach_anchors.3 \
 	hx509_verify.3 hx509_verify_attach_revoke.3 \
 	hx509_verify.3 hx509_verify_destroy_ctx.3 \
 	hx509_verify.3 hx509_verify_init_ctx.3 \
 	hx509_verify.3 hx509_verify_path.3 \
 	hx509_verify.3 hx509_verify_set_max_depth.3 \
 	hx509_verify.3 hx509_verify_set_proxy_certificate.3 \
 	hx509_verify.3 hx509_verify_set_strict_rfc3280_verification.3 \
 	hx509_verify.3 hx509_verify_set_time.3
 
 INCS=	hx509-private.h \
 	hx509-protos.h \
 	hx509.h \
 	hx509_err.h
 
 SRCS=	ca.c \
 	cert.c \
 	cms.c \
 	collector.c \
 	crypto.c \
 	doxygen.c \
 	error.c \
 	env.c \
 	file.c \
 	sel.c \
 	sel-gram.y \
 	sel-lex.l \
 	keyset.c \
 	ks_dir.c \
 	ks_file.c \
 	ks_mem.c \
 	ks_null.c \
 	ks_p11.c \
 	ks_p12.c \
 	ks_keychain.c \
 	lock.c \
 	name.c \
 	peer.c \
 	print.c \
 	softp11.c \
 	req.c \
 	revoke.c
 
 SRCS+=	hx509_err.c \
 	hx509_err.h
 
 SRCS+=	${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \
 	${GEN_PKCS10:S/.x$/.c/:S/.hx$/.h/}
 
 CFLAGS+=-I${KRB5DIR}/lib/hx509
 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
 CFLAGS+=-I${KRB5DIR}/lib/asn1
 CFLAGS+=-I${KRB5DIR}/lib/wind
 CFLAGS+=-I${KRB5DIR}/lib/roken -I.
 
 GEN_OCSP= \
 	asn1_OCSPBasicOCSPResponse.x \
 	asn1_OCSPCertID.x \
 	asn1_OCSPCertStatus.x \
 	asn1_OCSPInnerRequest.x \
 	asn1_OCSPKeyHash.x \
 	asn1_OCSPRequest.x \
 	asn1_OCSPResponderID.x \
 	asn1_OCSPResponse.x \
 	asn1_OCSPResponseBytes.x \
 	asn1_OCSPResponseData.x \
 	asn1_OCSPResponseStatus.x \
 	asn1_OCSPSignature.x \
 	asn1_OCSPSingleResponse.x \
 	asn1_OCSPTBSRequest.x \
 	asn1_OCSPVersion.x \
 	asn1_id_pkix_ocsp.x \
 	asn1_id_pkix_ocsp_basic.x \
 	asn1_id_pkix_ocsp_nonce.x \
 	ocsp_asn1.hx \
 	ocsp_asn1-priv.hx
 
 GEN_PKCS10= \
 	asn1_CertificationRequestInfo.x \
 	asn1_CertificationRequest.x \
 	pkcs10_asn1.hx \
 	pkcs10_asn1-priv.hx
 
 GEN_CRMF= \
 	asn1_CRMFRDNSequence.x \
 	asn1_CertReqMessages.x \
 	asn1_CertReqMsg.x \
 	asn1_CertRequest.x \
 	asn1_CertTemplate.x \
 	asn1_Controls.x \
 	asn1_PBMParameter.x \
 	asn1_PKMACValue.x \
 	asn1_POPOPrivKey.x \
 	asn1_POPOSigningKey.x \
 	asn1_POPOSigningKeyInput.x \
 	asn1_ProofOfPossession.x \
 	asn1_SubsequentMessage.x \
 	crmf_asn1.hx \
 	crmf_asn1-priv.hx
 
 GEN+=	${GEN_OCSP}
 GEN+=	${GEN_PKCS10}
 GEN+=	${GEN_CRMF}
 
 CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \
 	pkcs10_asn1_files crmf_asn1_files ocsp_asn1-template.[ch]* \
 	pkcs10_asn1-template.[ch]* crmf_asn1-template.[ch]*
 
 INCS+=	ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h
 
 .ORDER: ${GEN_OSCP}
 ${GEN_OCSP}: ocsp.asn1 ocsp.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	 ${.ALLSRC:M*.asn1} ocsp_asn1
 
 .ORDER: ${GEN_PKCS10}
 ${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt
 	${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \
 	${.ALLSRC:M*.asn1} pkcs10_asn1
 
 .ORDER: ${GEN_CRMF}
 ${GEN_CRMF}: crmf.asn1
 	${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1
 
 .SUFFIXES: .h .c .x .hx
 
 .x.c:   
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .hx.h:
-	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cat ${.IMPSRC} > ${.TARGET}
+	cmp -s ${.IMPSRC} ${.TARGET} 2> /dev/null || cp ${.IMPSRC} ${.TARGET}
 
 .include <bsd.lib.mk>
 
 .SUFFIXES: .h .c .x .hx
 
 .PATH: ${KRB5DIR}/lib/hx509 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/doc/doxyout/hx509/man/man3