From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 09:30:20 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 524C9B36
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:30:20 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F1D72CFE
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:30:20 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s749UKPC015972
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 09:30:20 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s749UJ1M015592
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 09:30:19 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 4 Aug 2014 09:30:19 GMT
Message-Id: <201408040930.s749UJ1M015592@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 zkorchev@FreeBSD.org using -f
From: zkorchev@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271837 - soc2014/zkorchev/freebsd_head/bin/ls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 09:30:20 -0000

Author: zkorchev
Date: Mon Aug  4 09:30:19 2014
New Revision: 271837
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271837

Log:
  removed outdated ls usage option; fixed Makefile

Modified:
  soc2014/zkorchev/freebsd_head/bin/ls/Makefile
  soc2014/zkorchev/freebsd_head/bin/ls/ls.c

Modified: soc2014/zkorchev/freebsd_head/bin/ls/Makefile
==============================================================================
--- soc2014/zkorchev/freebsd_head/bin/ls/Makefile	Mon Aug  4 09:29:48 2014	(r271836)
+++ soc2014/zkorchev/freebsd_head/bin/ls/Makefile	Mon Aug  4 09:30:19 2014	(r271837)
@@ -6,8 +6,8 @@
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
 DPADD=	${LIBUTIL}
-LDADD= -L/usr/local/lib -lutil -lsol
-CFLAGS+= -DSOL_ON -I/usr/local/include -Wno-format-invalid-specifier
+LDADD= -lutil -lsol
+CFLAGS+= -DSOL_ON -Wno-format-invalid-specifier
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no

Modified: soc2014/zkorchev/freebsd_head/bin/ls/ls.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/bin/ls/ls.c	Mon Aug  4 09:29:48 2014	(r271836)
+++ soc2014/zkorchev/freebsd_head/bin/ls/ls.c	Mon Aug  4 09:30:19 2014	(r271837)
@@ -196,7 +196,7 @@
 	if (getenv("LS_SAMESORT"))
 		f_samesort = 1;
 	while ((ch = getopt(argc, argv,
-	    "1ABCD:FGHILOPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {
+	    "1ABCD:FGHILPRSTUWXZabcdfghiklmnopqrstuwxy,")) != -1) {
 		switch (ch) {
 		/*
 		 * The -1, -C, -x and -l options all override each other so