[src/trunk]: src Allow build with MKRUMP=no.

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

details:   https://anonhg.NetBSD.org/src/rev/90fb0d7c446f
branches:  trunk
changeset: 781527:90fb0d7c446f
user:      rjs <rjs%NetBSD.org@localhost>
date:      Wed Sep 12 19:20:37 2012 +0000

description:
Allow build with MKRUMP=no.

diffstat:

 distrib/sets/lists/base/mi  |   4 ++--
 distrib/sets/lists/tests/mi |   4 ++--
 usr.sbin/npf/Makefile       |  10 ++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (53 lines):

diff -r 19fe4b126800 -r 90fb0d7c446f distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Wed Sep 12 18:23:33 2012 +0000
+++ b/distrib/sets/lists/base/mi        Wed Sep 12 19:20:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1004 2012/09/12 14:07:51 martin Exp $
+# $NetBSD: mi,v 1.1005 2012/09/12 19:20:37 rjs Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1352,7 +1352,7 @@
 ./usr/sbin/nfsd                                        base-nfsserver-bin
 ./usr/sbin/nfsiod                              base-obsolete           obsolete
 ./usr/sbin/npfctl                              base-npf-bin            npf
-./usr/sbin/npftest                             base-npf-bin            npf
+./usr/sbin/npftest                             base-npf-bin            npf,rump
 ./usr/sbin/nsec3hash                           base-bind-bin
 ./usr/sbin/nslookup                            base-obsolete           obsolete
 ./usr/sbin/nsquery                             base-obsolete           obsolete
diff -r 19fe4b126800 -r 90fb0d7c446f distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Wed Sep 12 18:23:33 2012 +0000
+++ b/distrib/sets/lists/tests/mi       Wed Sep 12 19:20:37 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.492 2012/09/12 14:07:52 martin Exp $
+# $NetBSD: mi,v 1.493 2012/09/12 19:20:38 rjs Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2861,7 +2861,7 @@
 ./usr/tests/net/net/Atffile                    tests-net-tests         atf,rump
 ./usr/tests/net/net/t_raw              tests-net-tests         atf,rump
 ./usr/tests/net/net/t_unix             tests-net-tests         atf,rump
-./usr/tests/net/npf                    tests-net-tests         atf,rump
+./usr/tests/net/npf                    tests-net-tests
 ./usr/tests/net/npf/Atffile            tests-net-tests         atf,rump
 ./usr/tests/net/npf/npftest.conf       tests-net-tests         atf,rump
 ./usr/tests/net/npf/t_npf              tests-net-tests         atf,rump
diff -r 19fe4b126800 -r 90fb0d7c446f usr.sbin/npf/Makefile
--- a/usr.sbin/npf/Makefile     Wed Sep 12 18:23:33 2012 +0000
+++ b/usr.sbin/npf/Makefile     Wed Sep 12 19:20:37 2012 +0000
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2012/09/12 14:06:02 martin Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/12 19:20:37 rjs Exp $
+
+.include <bsd.own.mk>
 
-SUBDIR=                npfctl npftest
+SUBDIR=                npfctl
+
+.if (${MKRUMP} != "no")
+SUBDIR+=       npftest
+.endif
 
 .include <bsd.subdir.mk>