Index: stable/9/usr.bin/passwd/Makefile
===================================================================
--- stable/9/usr.bin/passwd/Makefile	(revision 289943)
+++ stable/9/usr.bin/passwd/Makefile	(revision 289944)
@@ -1,25 +1,27 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
 DPADD	 = ${LIBPAM}
 LDADD	 = ${MINUSLPAM}
 .if ${MK_NIS} != "no"
 LINKS	 = ${BINDIR}/passwd ${BINDIR}/yppasswd
 MLINKS	 = passwd.1 yppasswd.1
 .endif
 
 beforeinstall:
 .for i in passwd yppasswd
 	[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
 		chflags noschg ${DESTDIR}${BINDIR}/$i || true
 .endfor
 
+.if !defined(NO_FSCHG)
 afterinstall:
 	-chflags schg ${DESTDIR}${BINDIR}/passwd
+.endif
 
 .include <bsd.prog.mk>
Index: stable/9/usr.bin/passwd
===================================================================
--- stable/9/usr.bin/passwd	(revision 289943)
+++ stable/9/usr.bin/passwd	(revision 289944)

Property changes on: stable/9/usr.bin/passwd
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin/passwd:r243617
Index: stable/9/usr.bin
===================================================================
--- stable/9/usr.bin	(revision 289943)
+++ stable/9/usr.bin	(revision 289944)

Property changes on: stable/9/usr.bin
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/usr.bin:r243617
Index: stable/9
===================================================================
--- stable/9	(revision 289943)
+++ stable/9	(revision 289944)

Property changes on: stable/9
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r243617