From owner-svn-src-head@FreeBSD.ORG  Fri Jan 11 18:37:52 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 6AE29BF1;
 Fri, 11 Jan 2013 18:37:52 +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 5C8ACA74;
 Fri, 11 Jan 2013 18:37:52 +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 r0BIbqxO095754;
 Fri, 11 Jan 2013 18:37:52 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0BIbq3v095752;
 Fri, 11 Jan 2013 18:37:52 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301111837.r0BIbq3v095752@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 11 Jan 2013 18:37:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245309 - in head: . share/zoneinfo
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.14
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, 11 Jan 2013 18:37:52 -0000

Author: brooks
Date: Fri Jan 11 18:37:51 2013
New Revision: 245309
URL: http://svnweb.freebsd.org/changeset/base/245309

Log:
  Use find -exec to install zoneinfo instead of requiring xargs to be an
  install tool.
  
  Suggested by:	delphij

Modified:
  head/Makefile.inc1
  head/share/zoneinfo/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri Jan 11 17:51:03 2013	(r245308)
+++ head/Makefile.inc1	Fri Jan 11 18:37:51 2013	(r245309)
@@ -643,7 +643,7 @@ installcheck_UGID:
 _install-info=	install-info
 .endif
 .if ${MK_ZONEINFO} != "no"
-_zoneinfo=	zic tzsetup xargs
+_zoneinfo=	zic tzsetup
 .endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \

Modified: head/share/zoneinfo/Makefile
==============================================================================
--- head/share/zoneinfo/Makefile	Fri Jan 11 17:51:03 2013	(r245308)
+++ head/share/zoneinfo/Makefile	Fri Jan 11 18:37:51 2013	(r245309)
@@ -79,9 +79,9 @@ zoneinfo: yearistype ${TDATA}
 
 beforeinstall:
 	cd ${TZBUILDDIR} && \
-	    find . -type f -print | xargs -I _FILE_ ${INSTALL} \
+	    find . -type f -print -exec ${INSTALL} \
 	    -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    _FILE_ ${DESTDIR}/usr/share/zoneinfo/_FILE_
+	    \{} ${DESTDIR}/usr/share/zoneinfo/\{} \;
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/