From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 09:29:13 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 29257AFC
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:29:13 +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 15C6D2C65
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:29:13 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s749TCix000838
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 09:29:12 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s749TCPD000661
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 09:29:12 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 4 Aug 2014 09:29:12 GMT
Message-Id: <201408040929.s749TCPD000661@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: r271835 - soc2014/zkorchev/freebsd_head/usr.bin/vmstat
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:29:13 -0000

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

Log:
  removed outdated vmstat usage option; fixed Makefile

Modified:
  soc2014/zkorchev/freebsd_head/usr.bin/vmstat/Makefile
  soc2014/zkorchev/freebsd_head/usr.bin/vmstat/vmstat.c

Modified: soc2014/zkorchev/freebsd_head/usr.bin/vmstat/Makefile
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/vmstat/Makefile	Mon Aug  4 09:28:05 2014	(r271834)
+++ soc2014/zkorchev/freebsd_head/usr.bin/vmstat/Makefile	Mon Aug  4 09:29:11 2014	(r271835)
@@ -6,7 +6,7 @@
 MAN=	vmstat.8
 DPADD=	${LIBDEVSTAT} ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
 LDADD=	-ldevstat -lkvm -lmemstat -lutil -lsol
-CFLAGS+= -DSOL_ON -I/usr/local/include
+CFLAGS+= -DSOL_ON
 
 WARNS?=	1
 

Modified: soc2014/zkorchev/freebsd_head/usr.bin/vmstat/vmstat.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/vmstat/vmstat.c	Mon Aug  4 09:28:05 2014	(r271834)
+++ soc2014/zkorchev/freebsd_head/usr.bin/vmstat/vmstat.c	Mon Aug  4 09:29:11 2014	(r271835)
@@ -196,7 +196,7 @@
 	interval = reps = todo = 0;
 	maxshowdevs = 2;
 	hflag = isatty(1);
-	while ((c = getopt(argc, argv, "ac:fhHiM:mN:n:OPp:stw:z")) != -1) {
+	while ((c = getopt(argc, argv, "ac:fhHiM:mN:n:Pp:stw:z")) != -1) {
 		switch (c) {
 		case 'a':
 			aflag++;