Module Name: src Committed By: christos Date: Fri Apr 3 16:42:00 UTC 2020
Modified Files: src/usr.bin/netstat: Makefile netstat_hostops.c netstat_rumpops.c Removed Files: src/usr.bin/netstat: prog_ops.h Log Message: remove unused To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.bin/netstat/Makefile cvs rdiff -u -r1.3 -r1.4 src/usr.bin/netstat/netstat_hostops.c \ src/usr.bin/netstat/netstat_rumpops.c cvs rdiff -u -r1.4 -r0 src/usr.bin/netstat/prog_ops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.bin/netstat/Makefile diff -u src/usr.bin/netstat/Makefile:1.47 src/usr.bin/netstat/Makefile:1.48 --- src/usr.bin/netstat/Makefile:1.47 Sun Oct 13 03:28:16 2019 +++ src/usr.bin/netstat/Makefile Fri Apr 3 12:41:59 2020 @@ -1,10 +1,15 @@ -# $NetBSD: Makefile,v 1.47 2019/10/13 07:28:16 mrg Exp $ +# $NetBSD: Makefile,v 1.48 2020/04/03 16:41:59 christos Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/12/93 .include <bsd.own.mk> USE_FORT?= yes # setgid +ROUTE=${NETBSDSRCDIR}/sbin/route +PF=${NETBSDSRCDIR}/sys/dist/pf + +.PATH: ${ROUTE} + RUMPPRG=netstat SRCS= atalk.c bpf.c fast_ipsec.c if.c inet.c inet6.c \ main.c mbuf.c mroute.c mroute6.c pfkey.c pfsync.c route.c \ @@ -14,10 +19,8 @@ BINMODE=2555 LDADD= -lutil -lkvm DPADD= ${LIBUTIL} ${LIBKVM} CPPFLAGS+= -DIPSEC -I${.CURDIR} -CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf -CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/route - -.PATH: ${.CURDIR}/../../sbin/route +CPPFLAGS+= -I${PF} +CPPFLAGS+= -I${ROUTE} .if (${MKRUMP} != "no") .PATH: ${.CURDIR}/../../lib/libc/gen Index: src/usr.bin/netstat/netstat_hostops.c diff -u src/usr.bin/netstat/netstat_hostops.c:1.3 src/usr.bin/netstat/netstat_hostops.c:1.4 --- src/usr.bin/netstat/netstat_hostops.c:1.3 Fri Apr 3 12:20:51 2020 +++ src/usr.bin/netstat/netstat_hostops.c Fri Apr 3 12:41:59 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: netstat_hostops.c,v 1.3 2020/04/03 16:20:51 martin Exp $ */ +/* $NetBSD: netstat_hostops.c,v 1.4 2020/04/03 16:41:59 christos Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -26,9 +26,4 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -#ifndef lint -__RCSID("$NetBSD: netstat_hostops.c,v 1.3 2020/04/03 16:20:51 martin Exp $"); -#endif /* !lint */ - -#include "../../sbin/route/route_hostops.c" +#include "route_hostops.c" Index: src/usr.bin/netstat/netstat_rumpops.c diff -u src/usr.bin/netstat/netstat_rumpops.c:1.3 src/usr.bin/netstat/netstat_rumpops.c:1.4 --- src/usr.bin/netstat/netstat_rumpops.c:1.3 Fri Apr 3 12:20:51 2020 +++ src/usr.bin/netstat/netstat_rumpops.c Fri Apr 3 12:41:59 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: netstat_rumpops.c,v 1.3 2020/04/03 16:20:51 martin Exp $ */ +/* $NetBSD: netstat_rumpops.c,v 1.4 2020/04/03 16:41:59 christos Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -26,4 +26,4 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../sbin/route/route_rumpops.c" +#include "route_rumpops.c"