From owner-svn-src-head@FreeBSD.ORG  Fri Feb 13 09:02:16 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3FE0F95;
 Fri, 13 Feb 2015 09:02:16 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8F623FA3;
 Fri, 13 Feb 2015 09:02:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1D92GKS046623;
 Fri, 13 Feb 2015 09:02:16 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1D92Gin046622;
 Fri, 13 Feb 2015 09:02:16 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201502130902.t1D92Gin046622@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 13 Feb 2015 09:02:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278669 - head/usr.bin/passwd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Feb 2015 09:02:16 -0000

Author: bapt
Date: Fri Feb 13 09:02:15 2015
New Revision: 278669
URL: https://svnweb.freebsd.org/changeset/base/278669

Log:
  Revert r278642
  
  install(1) does not handle chflags on hardlinks

Modified:
  head/usr.bin/passwd/Makefile

Modified: head/usr.bin/passwd/Makefile
==============================================================================
--- head/usr.bin/passwd/Makefile	Fri Feb 13 08:42:01 2015	(r278668)
+++ head/usr.bin/passwd/Makefile	Fri Feb 13 09:02:15 2015	(r278669)
@@ -7,10 +7,20 @@ 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>