From owner-svn-src-projects@FreeBSD.ORG  Tue Jan  8 17:01:33 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 8E13FF9B;
 Tue,  8 Jan 2013 17:01:33 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 82500D7F;
 Tue,  8 Jan 2013 17:01:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08H1X31036579;
 Tue, 8 Jan 2013 17:01:33 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08H1Xxc036578;
 Tue, 8 Jan 2013 17:01:33 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301081701.r08H1Xxc036578@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 8 Jan 2013 17:01:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245167 - projects/mtree/tools/build
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.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jan 2013 17:01:33 -0000

Author: brooks
Date: Tue Jan  8 17:01:32 2013
New Revision: 245167
URL: http://svnweb.freebsd.org/changeset/base/245167

Log:
  Build the contrib versions of pwcache(3) and vis(3).  We need strsvis for
  getid.c in install and we having a full pwcache(3) implementation means
  we can use -N to eliminate bootstrapping problems when new users are
  added for new services.

Deleted:
  projects/mtree/tools/build/pwcache-stub.c
Modified:
  projects/mtree/tools/build/Makefile

Modified: projects/mtree/tools/build/Makefile
==============================================================================
--- projects/mtree/tools/build/Makefile	Tue Jan  8 15:23:38 2013	(r245166)
+++ projects/mtree/tools/build/Makefile	Tue Jan  8 17:01:32 2013	(r245167)
@@ -23,7 +23,18 @@ config.h: ${.CURDIR}/../../lib/libmagic/
 
 _WITH_PWCACHEDB!= grep -c pwcache_groupdb /usr/include/pwd.h || true
 .if ${_WITH_PWCACHEDB} == 0
-SRCS+=		pwcache-stub.c
+.PATH: ${.CURDIR}/../../contrib/libc-pwcache
+CFLAGS+=	-I${.CURDIR}/../../contrib/libc-pwcache \
+		-I${.CURDIR}/../../lib/libc/include
+SRCS+=		pwcache.c
+.endif
+
+_WITH_STRSVIS!=	grep -c strsvis /usr/include/vis.h || true
+.if ${_WITH_STRSVIS} == 0
+.PATH: ${.CURDIR}/../../contrib/libc-vis
+SRCS+=		vis.c
+CFLAGS+=	-I${.CURDIR}/../../contrib/libc-vis \
+		-I${.CURDIR}/../../lib/libc/include
 .endif
 
 .if empty(SRCS)