svn commit: r278642 - in head/usr.bin: chpass passwd

[Baptiste Daroussin]

Author: bapt
Date: Thu Feb 12 23:08:27 2015
New Revision: 278642
URL: https://svnweb.freebsd.org/changeset/base/278642

Log:
  Use PRECIOUSPROG instead of custom code to handle schg
  
  This allows to preserve schg when installed with -DNO_ROOT
  
  MFC after:	1 week

Modified:
  head/usr.bin/chpass/Makefile
  head/usr.bin/passwd/Makefile

Modified: head/usr.bin/chpass/Makefile
==============================================================================
--- head/usr.bin/chpass/Makefile	Thu Feb 12 23:00:31 2015	(r278641)
+++ head/usr.bin/chpass/Makefile	Thu Feb 12 23:08:27 2015	(r278642)
@@ -9,6 +9,7 @@ PROG=	chpass
 SRCS=	chpass.c edit.c field.c pw_scan.c table.c util.c
 BINOWN=	root
 BINMODE=4555
+PRECIOUSPROG=
 .if ${MK_NIS} != "no"
 CFLAGS+= -DYP
 .endif
@@ -34,16 +35,4 @@ MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
 MLINKS+= chpass.1 ypchpass.1 chpass.1 ypchfn.1 chpass.1 ypchsh.1
 .endif
 
-beforeinstall:
-.for i in chpass chfn chsh ypchpass ypchfn ypchsh
-.if exists(${DESTDIR}${BINDIR}/$i)
-	-chflags noschg ${DESTDIR}${BINDIR}/$i
-.endif
-.endfor
-
-.if !defined(NO_FSCHG)
-afterinstall:
-	-chflags schg ${DESTDIR}${BINDIR}/chpass
-.endif
-
 .include <bsd.prog.mk>

Modified: head/usr.bin/passwd/Makefile
==============================================================================
--- head/usr.bin/passwd/Makefile	Thu Feb 12 23:00:31 2015	(r278641)
+++ head/usr.bin/passwd/Makefile	Thu Feb 12 23:08:27 2015	(r278642)
@@ -7,20 +7,10 @@ PROG	 = passwd
 BINOWN	 = root
 BINMODE	 = 4555
 LIBADD   = pam
+PRECIOUSPROG=
 .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>