Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto
 - Fix for default mtree style
 - Update libelf
 - Importing libexecinfo
 - Resynchronize GCC, mpc, gmp, mpfr
 - build.sh: Replace params with show-params.
     This has been done as the make target has been renamed in the same
     way, while a new target named params has been added. This new
     target generates a file containing all the parameters, instead of
     printing it on the console.
 - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
     get getservbyport() out of the inner loop

Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091

usr.bin/passwd/Makefile

@@ -1,12 +1,8 @@
-#	$NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
+#	$NetBSD: Makefile,v 1.44 2013/02/13 23:19:14 christos Exp $
 #	from: @(#)Makefile    8.3 (Berkeley) 4/2/94
 
 .include <bsd.own.mk>
 
-.if defined(__MINIX)
-WARNS=3
-.endif
-
 USE_FORT?= yes	# setuid
 PROG=	passwd
 SRCS=	local_passwd.c passwd.c
@@ -36,9 +32,11 @@ SRCS+=	krb5_passwd.c
 
 DPADD+=	${LIBKRB5} ${LIBCRYPTO} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBCRYPT}
 LDADD+=	-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lcrypt
+.ifdef OVERRIDE_HEIMDAL_KPASSWD
 LINKS+=	${BINDIR}/passwd ${BINDIR}/kpasswd
 MAN+=	kpasswd.1
 .endif
+.endif
 
 .if (${USE_PAM} != "no")
 CPPFLAGS+=-DUSE_PAM