From owner-svn-src-all@freebsd.org  Sun Jul 12 18:40:32 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 72AD79999AA;
 Sun, 12 Jul 2015 18:40:32 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 6370019B6;
 Sun, 12 Jul 2015 18:40:32 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6CIeWDL059595;
 Sun, 12 Jul 2015 18:40:32 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6CIeWuq059576;
 Sun, 12 Jul 2015 18:40:32 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201507121840.t6CIeWuq059576@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 12 Jul 2015 18:40:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285425 - head/bin/ls
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jul 2015 18:40:32 -0000

Author: marius
Date: Sun Jul 12 18:40:31 2015
New Revision: 285425
URL: https://svnweb.freebsd.org/changeset/base/285425

Log:
  Since r284198, ls(1) just always depends libxo(3), not only in case of
  MK_LS_COLORS or !RELEASE_CRUNCH.

Modified:
  head/bin/ls/Makefile

Modified: head/bin/ls/Makefile
==============================================================================
--- head/bin/ls/Makefile	Sun Jul 12 18:38:17 2015	(r285424)
+++ head/bin/ls/Makefile	Sun Jul 12 18:40:31 2015	(r285425)
@@ -5,12 +5,12 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	util
+LIBADD=	util xo
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
-LIBADD+=	termcapw xo
+LIBADD+=	termcapw
 .endif
 
 .include <bsd.prog.mk>