[src/trunk]: src use librumpres

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9470999e60ac
branches:  trunk
changeset: 356755:9470999e60ac
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Oct 10 19:30:41 2017 +0000

description:
use librumpres

diffstat:

 usr.bin/netstat/Makefile |  14 +++++++++-----
 usr.sbin/arp/Makefile    |   6 +++---
 usr.sbin/ndp/Makefile    |   7 +++----
 usr.sbin/rtadvd/Makefile |   6 +++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diffs (97 lines):

diff -r c05ecfe108c5 -r 9470999e60ac usr.bin/netstat/Makefile
--- a/usr.bin/netstat/Makefile  Tue Oct 10 19:30:06 2017 +0000
+++ b/usr.bin/netstat/Makefile  Tue Oct 10 19:30:41 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.44 2016/12/23 10:19:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.45 2017/10/10 19:31:10 christos Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/12/93
 
 .include <bsd.own.mk>
@@ -17,12 +17,16 @@
 CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf
 CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/route
 
+.PATH:  ${.CURDIR}/../../sbin/route
+
+.if (${MKRUMP} != "no")
 .PATH:  ${.CURDIR}/../../lib/libc/gen
-.PATH:  ${.CURDIR}/../../lib/libc/net
-.PATH:  ${.CURDIR}/../../sbin/route
-CPPFLAGS+= -DRUMP_ACTION
 RUMPSRCS+= sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
-RUMPSRCS+= if_indextoname.c getifaddrs.c getnameinfo.c
+LDADD.rump+=   -lrumpres
+DPADD.add+=    ${LIBRUMPRES}
+CPPFLAGS+=      -DRUMP_ACTION
+.endif
+
 
 .if (${USE_INET6} != "no")
 CPPFLAGS+= -DINET6
diff -r c05ecfe108c5 -r 9470999e60ac usr.sbin/arp/Makefile
--- a/usr.sbin/arp/Makefile     Tue Oct 10 19:30:06 2017 +0000
+++ b/usr.sbin/arp/Makefile     Tue Oct 10 19:30:41 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2015/07/29 06:07:35 ozaki-r Exp $
+#      $NetBSD: Makefile,v 1.13 2017/10/10 19:30:41 christos Exp $
 #      from: @(#)Makefile      8.2 (Berkeley) 4/18/94
 
 .include <bsd.own.mk>
@@ -6,10 +6,10 @@
 RUMPPRG=       arp
 MAN=           arp.4 arp.8
 
-.PATH:         ${.CURDIR}/../../lib/libc/net
-RUMPSRCS=      getifaddrs.c getnameinfo.c
 .if (${MKRUMP} != "no")
 CPPFLAGS+=     -DRUMP_ACTION
+LDADD.rump+=   -lrumpres
+DPADD.rump+=   ${LIBRUMPRES}
 .endif
 
 .include <bsd.prog.mk>
diff -r c05ecfe108c5 -r 9470999e60ac usr.sbin/ndp/Makefile
--- a/usr.sbin/ndp/Makefile     Tue Oct 10 19:30:06 2017 +0000
+++ b/usr.sbin/ndp/Makefile     Tue Oct 10 19:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/12/14 06:17:05 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.13 2017/10/10 19:30:41 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -14,11 +14,10 @@
 CPPFLAGS+=     -DINET6
 CPPFLAGS+=     -I. -I${TCPDUMP}
 
-.PATH:         ${.CURDIR}/../../lib/libc/net
-RUMPSRCS=      getaddrinfo.c getifaddrs.c getnameinfo.c
-RUMPSRCS+=     if_indextoname.c if_nametoindex.c
 .if (${MKRUMP} != "no")
 CPPFLAGS+=     -DRUMP_ACTION
+LDADD.rump+=   -lrumpres
+DPADD.rump+=   ${LIBRUMPRES}
 .endif
 
 .include <bsd.prog.mk>
diff -r c05ecfe108c5 -r 9470999e60ac usr.sbin/rtadvd/Makefile
--- a/usr.sbin/rtadvd/Makefile  Tue Oct 10 19:30:06 2017 +0000
+++ b/usr.sbin/rtadvd/Makefile  Tue Oct 10 19:30:41 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/11 12:19:44 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2017/10/10 19:30:41 christos Exp $
 
 WARNS?=        4
 
@@ -19,10 +19,10 @@
 FILES= rtadvd.conf
 .endif
 
-.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS=      getifaddrs.c getnameinfo.c if_indextoname.c if_nametoindex.c
 .if (${MKRUMP} != "no")
 CPPFLAGS+=     -DRUMP_ACTION
+LDADD.rump+=   -lrumpres
+DPADD.rump+=   ${LIBRUMPRES}
 .endif
 
 CWARNFLAGS.clang+=     -Wno-error=address-of-packed-member