From owner-svn-src-head@FreeBSD.ORG  Sat May 19 18:05:01 2012
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 91440106564A;
	Sat, 19 May 2012 18:05:01 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BBA88FC0A;
	Sat, 19 May 2012 18:05:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4JI51Iv037130;
	Sat, 19 May 2012 18:05:01 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4JI513M037128;
	Sat, 19 May 2012 18:05:01 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201205191805.q4JI513M037128@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 19 May 2012 18:05:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235655 - in head: bin/ls share/mk
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 19 May 2012 18:05:01 -0000

Author: marcel
Date: Sat May 19 18:05:00 2012
New Revision: 235655
URL: http://svn.freebsd.org/changeset/base/235655

Log:
  Add build opton MK_LS_COLORS to control whether ls(1) supports colors
  (and thus needs to depend on libtermcap). Embedded systems may not
  want or need colors.
  
  Obtained from:	Juniper Networks, Inc.

Modified:
  head/bin/ls/Makefile
  head/share/mk/bsd.own.mk

Modified: head/bin/ls/Makefile
==============================================================================
--- head/bin/ls/Makefile	Sat May 19 17:55:49 2012	(r235654)
+++ head/bin/ls/Makefile	Sat May 19 18:05:00 2012	(r235655)
@@ -1,12 +1,15 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
-.if !defined(RELEASE_CRUNCH)
+.if !defined(RELEASE_CRUNCH) && \
+	${MK_LS_COLORS} != no
 CFLAGS+= -DCOLORLS
 DPADD+=	${LIBTERMCAP}
 LDADD+=	-ltermcap

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat May 19 17:55:49 2012	(r235654)
+++ head/share/mk/bsd.own.mk	Sat May 19 18:05:00 2012	(r235655)
@@ -367,6 +367,7 @@ __DEFAULT_YES_OPTIONS = \
     LOCALES \
     LOCATE \
     LPR \
+    LS_COLORS \
     MAIL \
     MAILWRAPPER \
     MAKE \