[src/netbsd-9]: src Pull up following revision(s) (requested by rmind in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/81c4d59387f6
branches:  netbsd-9
changeset: 843156:81c4d59387f6
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 01 13:18:39 2019 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #140):

        external/bsd/libnv/lib/Makefile: revision 1.3
        usr.sbin/npf/npfd/Makefile: revision 1.7
        lib/libnpf/Makefile: revision 1.11
        lib/libnpf/Makefile: revision 1.12
        libexec/identd/Makefile: revision 1.18
        usr.sbin/npf/npfctl/Makefile: revision 1.14
        lib/npf/mod.mk: revision 1.8
        external/bsd/libnv/lib/srcs.mk: revision 1.1

libnpf fix: link the library itself to libnv; libnpf users should not be
expected to assume this dependency.

Move common parts into a makefile fragment usable from elsewhere.
Suggested by mrg.

Include libnv directly into this library

diffstat:

 external/bsd/libnv/lib/Makefile |   5 +++--
 external/bsd/libnv/lib/srcs.mk  |  12 ++++++++++++
 lib/libnpf/Makefile             |   8 ++++++--
 lib/npf/mod.mk                  |   4 +---
 libexec/identd/Makefile         |   6 +-----
 usr.sbin/npf/npfctl/Makefile    |   5 +----
 usr.sbin/npf/npfd/Makefile      |   5 +----
 7 files changed, 25 insertions(+), 20 deletions(-)

diffs (132 lines):

diff -r a392ab97bcbe -r 81c4d59387f6 external/bsd/libnv/lib/Makefile
--- a/external/bsd/libnv/lib/Makefile   Sun Sep 01 13:13:13 2019 +0000
+++ b/external/bsd/libnv/lib/Makefile   Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/17 23:54:08 bad Exp $
+# $NetBSD: Makefile,v 1.2.4.1 2019/09/01 13:18:39 martin Exp $
 
 WARNS?=                5
 
@@ -16,6 +16,7 @@
 #INCSDIR=      /usr/include
 #MAN=          nv.3
 
-SRCS=          dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c
+.include "srcs.mk"
+SRCS=          ${LIBNV_SRCS}
 
 .include <bsd.lib.mk>
diff -r a392ab97bcbe -r 81c4d59387f6 external/bsd/libnv/lib/srcs.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libnv/lib/srcs.mk    Sun Sep 01 13:18:39 2019 +0000
@@ -0,0 +1,12 @@
+#      $NetBSD: srcs.mk,v 1.1.2.2 2019/09/01 13:18:39 martin Exp $
+
+# Sources and additional flags for libnv
+
+LIBNV_SRCS=    dnvlist.c msgio.c nvlist.c nvpair.c nv_kern_netbsd.c
+NVSRC_DISTPATH=        ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.for _s in ${LIBNV_SRCS}
+CPPFLAGS.${_s} +=      -I${NVSRC_DISTPATH}
+.endfor
+
+.PATH: ${NVSRC_DISTPATH}
diff -r a392ab97bcbe -r 81c4d59387f6 lib/libnpf/Makefile
--- a/lib/libnpf/Makefile       Sun Sep 01 13:13:13 2019 +0000
+++ b/lib/libnpf/Makefile       Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/27 04:39:33 dholland Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2019/09/01 13:18:39 martin Exp $
 
 USE_SHLIBDIR=   yes
 
@@ -12,7 +12,11 @@
 INCS=          npf.h
 INCSDIR=       /usr/include
 
-CPPFLAGS+=     -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+LIBNV_DIST=    ${NETBSDSRCDIR}/external/bsd/libnv/lib
+
+.include "${LIBNV_DIST}/srcs.mk"
+SRCS+=         ${LIBNV_SRCS}
+CPPFLAGS.npf.c +=      -I${NVSRC_DISTPATH}
 
 WARNS=         5
 
diff -r a392ab97bcbe -r 81c4d59387f6 lib/npf/mod.mk
--- a/lib/npf/mod.mk    Sun Sep 01 13:13:13 2019 +0000
+++ b/lib/npf/mod.mk    Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mod.mk,v 1.7 2018/09/29 14:41:36 rmind Exp $
+#      $NetBSD: mod.mk,v 1.7.2.1 2019/09/01 13:18:40 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -25,8 +25,6 @@
 
 LIB=           ${MOD}
 SRCS=          npf${MOD}.c
-
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
 LIBDPLIBS+=    npf ${NETBSDSRCDIR}/lib/libnpf
 
 .include <bsd.lib.mk>
diff -r a392ab97bcbe -r 81c4d59387f6 libexec/identd/Makefile
--- a/libexec/identd/Makefile   Sun Sep 01 13:13:13 2019 +0000
+++ b/libexec/identd/Makefile   Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/09/29 14:41:37 rmind Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2019/09/01 13:18:39 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -22,10 +22,6 @@
 .if (${MKNPF} != "no")
 SRCS+= npf.c
 CPPFLAGS+=-DWITH_NPF
-
-PROGDPLIBS+= nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+= -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=-lnpf
 DPADD+=${LIBNPF}
 .endif
diff -r a392ab97bcbe -r 81c4d59387f6 usr.sbin/npf/npfctl/Makefile
--- a/usr.sbin/npf/npfctl/Makefile      Sun Sep 01 13:13:13 2019 +0000
+++ b/usr.sbin/npf/npfctl/Makefile      Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.13.2.1 2019/09/01 13:18:40 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -13,9 +13,6 @@
 SRCS+=         npf_scan.l npf_parse.y
 YHEADER=       1
 
-PROGDPLIBS+=   nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=                -lnpf -lpcap -lutil -ly
 DPADD+=                ${LIBNPF} ${LIBUTIL} ${LIBPCAP} ${LIBUTIL} ${LIBY}
 
diff -r a392ab97bcbe -r 81c4d59387f6 usr.sbin/npf/npfd/Makefile
--- a/usr.sbin/npf/npfd/Makefile        Sun Sep 01 13:13:13 2019 +0000
+++ b/usr.sbin/npf/npfd/Makefile        Sun Sep 01 13:18:39 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/09/29 14:41:36 rmind Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2019/09/01 13:18:39 martin Exp $
 #
 # Public Domain
 #
@@ -9,9 +9,6 @@
 SRCS=          npfd.c npfd_log.c
 CPPFLAGS+=     -I${.CURDIR}
 
-PROGDPLIBS+=   nv ${NETBSDSRCDIR}/external/bsd/libnv/lib
-CPPFLAGS+=     -I ${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
-
 LDADD+=                -lnpf -lpcap -lutil
 DPADD+=                ${LIBNPF} ${LIBPCAP} ${LIBUTIL}