From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 09:28:06 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 8CFC4AD5
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:28:06 +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 795C62BD8
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 09:28:06 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s749S6Y9087198
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 09:28:06 GMT
 (envelope-from zkorchev@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s749S5Y7087015
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 09:28:05 GMT
 (envelope-from zkorchev@FreeBSD.org)
Date: Mon, 4 Aug 2014 09:28:05 GMT
Message-Id: <201408040928.s749S5Y7087015@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: r271834 - soc2014/zkorchev/freebsd_head/usr.bin/netstat
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:28:06 -0000

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

Log:
  removed outdated netstat usage option; fixed Makefile

Modified:
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/Makefile
  soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/Makefile
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/Makefile	Mon Aug  4 08:58:50 2014	(r271833)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/Makefile	Mon Aug  4 09:28:05 2014	(r271834)
@@ -31,12 +31,11 @@
 CFLAGS+=-DPF
 .endif
 
-CFLAGS+=-DSOL_ON -I/usr/local/include
-
 BINGRP=	kmem
 BINMODE=2555
 DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
 LDADD=	-lkvm -lmemstat -lutil -lsol
+CFLAGS+= -DSOL_ON
 
 .if ${MK_NETGRAPH_SUPPORT} != "no"
 SRCS+=	netgraph.c

Modified: soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c
==============================================================================
--- soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c	Mon Aug  4 08:58:50 2014	(r271833)
+++ soc2014/zkorchev/freebsd_head/usr.bin/netstat/main.c	Mon Aug  4 09:28:05 2014	(r271834)
@@ -326,7 +326,7 @@
 
 	af = AF_UNSPEC;
 
-	while ((ch = getopt(argc, argv, "46AaBbdF:f:ghI:iLlM:mN:nOp:Qq:RrSTsuWw:xz"))
+	while ((ch = getopt(argc, argv, "46AaBbdF:f:ghI:iLlM:mN:np:Qq:RrSTsuWw:xz"))
 	    != -1)
 		switch(ch) {
 		case '4':