svn commit: r194266 - head/usr.bin/chpass

[Scott Long]

On Mar 4, 2010, at 5:02 AM, Ed Schouten wrote:
> * Scott Long <scottl at samsco.org> wrote:
>> What do you mean by "unconditionally"?  Most of the utilities that
>> install themselves with 'chflags schg' do so by unconditionally
>> ignoring errors. Chpass seems to be the only exception at the
>> moment.
> 
> No, I mean, don't set schg unconditionally. NO_FSCHG should still work
> afterwards. All applications currently honour this. If you create a
> FreeBSD jail and run `make installworld' a second time while inside the
> jail, this currently works, because there is not a single file which has
> schg set, which means `make installworld' can overwrite everything.
> 

Does this look good?

===================================================================
--- Makefile	(revision 204639)
+++ Makefile	(working copy)
@@ -43,7 +43,7 @@

.if !defined(NO_FSCHG)
afterinstall:
-	chflags schg ${DESTDIR}${BINDIR}/chpass
+	-chflags schg ${DESTDIR}${BINDIR}/chpass
.endif

.include <bsd.prog.mk>