Index: stable/8/kerberos5/usr.bin/kpasswd/Makefile
===================================================================
--- stable/8/kerberos5/usr.bin/kpasswd/Makefile	(revision 203840)
+++ stable/8/kerberos5/usr.bin/kpasswd/Makefile	(revision 203841)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PROG=	kpasswd
 CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD=	${LIBKRB5} ${LIBHX509 ${LIBROKEN} ${LIBVERS} \
+DPADD=	${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 LDADD=	-lkrb5 -lhx509 -lroken ${LIBVERS} \
 	-lasn1 -lcrypto -lcrypt -lcom_err
 
 .include <bsd.prog.mk>
 
 .PATH: ${KRB5DIR}/kpasswd
Index: stable/8/kerberos5/usr.bin/kpasswd
===================================================================
--- stable/8/kerberos5/usr.bin/kpasswd	(revision 203840)
+++ stable/8/kerberos5/usr.bin/kpasswd	(revision 203841)

Property changes on: stable/8/kerberos5/usr.bin/kpasswd
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +0,3 ##
   Merged /vendor/resolver/dist/kerberos5/usr.bin/kpasswd:r1540-186085
   Merged /head/sys/kerberos5/usr.bin/kpasswd:r196863
   Merged /head/kerberos5/usr.bin/kpasswd:r196879,198020,198480,198483,198897,199747,199799,199821-199822,200171,200182,200275,200295,200359,201919