From owner-svn-src-projects@freebsd.org  Thu Jan 28 01:15:58 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C9F10A704C6
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 28 Jan 2016 01:15:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 928621AA6;
 Thu, 28 Jan 2016 01:15:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0S1FvJN068630;
 Thu, 28 Jan 2016 01:15:57 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0S1Fv5v068629;
 Thu, 28 Jan 2016 01:15:57 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201601280115.u0S1Fv5v068629@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 28 Jan 2016 01:15:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294966 - projects/release-pkg/usr.bin/chpass
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2016 01:15:58 -0000

Author: gjb
Date: Thu Jan 28 01:15:57 2016
New Revision: 294966
URL: https://svnweb.freebsd.org/changeset/base/294966

Log:
  Ensure mtree(8) recognizes chpass(1) is schg.
  
  Convert hard links to symbolic links, and remove the
  'beforeinstall' and 'afterinstall' chflags(8) execution.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/usr.bin/chpass/Makefile

Modified: projects/release-pkg/usr.bin/chpass/Makefile
==============================================================================
--- projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 00:51:17 2016	(r294965)
+++ projects/release-pkg/usr.bin/chpass/Makefile	Thu Jan 28 01:15:57 2016	(r294966)
@@ -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
@@ -21,12 +22,12 @@ LIBADD=	crypt util
 LIBADD+=	ypclnt
 .endif 
 
-LINKS=	${BINDIR}/chpass ${BINDIR}/chfn
-LINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
+SYMLINKS=	${BINDIR}/chpass ${BINDIR}/chfn
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/chsh
 .if ${MK_NIS} != "no"
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
-LINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchpass
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchfn
+SYMLINKS+=	${BINDIR}/chpass ${BINDIR}/ypchsh
 .endif
 
 MLINKS=	chpass.1 chfn.1 chpass.1 chsh.1
@@ -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>