From 9f65be6caf212fb7ea4cba8cff3ac94e89dda05d Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 12 Feb 2015 23:08:27 +0000
Subject: [PATCH] Use PRECIOUSPROG instead of custom code to handle schg

This allows to preserve schg when installed with -DNO_ROOT

MFC after:	1 week
---
 usr.bin/chpass/Makefile | 13 +------------
 usr.bin/passwd/Makefile | 12 +-----------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 9b3e878d8656..c0cf46cc9690 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -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>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index f1fff4668709..d914060f53b6 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -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>