Thu Nov 29 00:09:49 2012 UTC ()
Pull up following revision(s) (requested by rmind in ticket #726):
	etc/rc.d/npf: revision 1.3
	distrib/sets/lists/base/mi: revision 1.1010
	usr.sbin/npf/npfctl/Makefile: revision 1.9
	distrib/sets/lists/comp/mi: revision 1.1785
put in /sbin
catch up with npfctl moving to /sbin.
untested, but i guess so was the move itself ;)
mv npfctl from /usr/sbin to /sbin so it is available before /usr is mounted.


(riz)
diff -r1.984.2.12 -r1.984.2.13 src/distrib/sets/lists/base/mi
diff -r1.1738.2.13 -r1.1738.2.14 src/distrib/sets/lists/comp/mi
diff -r1.2 -r1.2.6.1 src/etc/rc.d/npf
diff -r1.5.2.3 -r1.5.2.4 src/usr.sbin/npf/npfctl/Makefile
cvs diff -r1.984.2.12 -r1.984.2.13 src/distrib/sets/lists/base/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/mi 2012/11/28 21:34:30 1.984.2.12
+++ src/distrib/sets/lists/base/mi 2012/11/29 00:09:44 1.984.2.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.984.2.12 2012/11/28 21:34:30 riz Exp $ 1# $NetBSD: mi,v 1.984.2.13 2012/11/29 00:09:44 riz Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14# /usr/bin/ident is in `base-util-bin', not `base-rcs-bin' as it is used by pkgsrc 14# /usr/bin/ident is in `base-util-bin', not `base-rcs-bin' as it is used by pkgsrc
@@ -305,26 +305,27 @@ @@ -305,26 +305,27 @@
305./sbin/mountd base-obsolete obsolete 305./sbin/mountd base-obsolete obsolete
306./sbin/newbtconf base-sysutil-root 306./sbin/newbtconf base-sysutil-root
307./sbin/newfs base-sysutil-root 307./sbin/newfs base-sysutil-root
308./sbin/newfs_ext2fs base-sysutil-root 308./sbin/newfs_ext2fs base-sysutil-root
309./sbin/newfs_lfs base-sysutil-root 309./sbin/newfs_lfs base-sysutil-root
310./sbin/newfs_msdos base-sysutil-root 310./sbin/newfs_msdos base-sysutil-root
311./sbin/newfs_sysvbfs base-sysutil-root 311./sbin/newfs_sysvbfs base-sysutil-root
312./sbin/newfs_udf base-sysutil-root 312./sbin/newfs_udf base-sysutil-root
313./sbin/newfs_v7fs base-sysutil-root 313./sbin/newfs_v7fs base-sysutil-root
314./sbin/newlfs base-obsolete obsolete 314./sbin/newlfs base-obsolete obsolete
315./sbin/nfsd base-obsolete obsolete 315./sbin/nfsd base-obsolete obsolete
316./sbin/nfsiod base-obsolete obsolete 316./sbin/nfsiod base-obsolete obsolete
317./sbin/nologin base-sysutil-root 317./sbin/nologin base-sysutil-root
 318./sbin/npfctl base-npf-bin npf
318./sbin/pfctl base-pf-root pf 319./sbin/pfctl base-pf-root pf
319./sbin/pflogd base-pf-root pf 320./sbin/pflogd base-pf-root pf
320./sbin/pfs base-pf-root pf 321./sbin/pfs base-pf-root pf
321./sbin/ping base-netutil-root 322./sbin/ping base-netutil-root
322./sbin/ping6 base-netutil-root use_inet6 323./sbin/ping6 base-netutil-root use_inet6
323./sbin/poweroff base-sysutil-root 324./sbin/poweroff base-sysutil-root
324./sbin/pppoectl base-netutil-root 325./sbin/pppoectl base-netutil-root
325./sbin/quotacheck base-obsolete obsolete 326./sbin/quotacheck base-obsolete obsolete
326./sbin/raidctl base-sysutil-root 327./sbin/raidctl base-sysutil-root
327./sbin/rcorder base-sysutil-root 328./sbin/rcorder base-sysutil-root
328./sbin/rdump base-sysutil-root 329./sbin/rdump base-sysutil-root
329./sbin/rdump_lfs base-sysutil-root 330./sbin/rdump_lfs base-sysutil-root
330./sbin/reboot base-sysutil-root 331./sbin/reboot base-sysutil-root
@@ -1334,27 +1335,27 @@ @@ -1334,27 +1335,27 @@
1334./usr/sbin/named-checkconf base-bind-bin 1335./usr/sbin/named-checkconf base-bind-bin
1335./usr/sbin/named-checkzone base-bind-bin 1336./usr/sbin/named-checkzone base-bind-bin
1336./usr/sbin/named-compilezone base-bind-bin 1337./usr/sbin/named-compilezone base-bind-bin
1337./usr/sbin/named-journalprint base-bind-bin 1338./usr/sbin/named-journalprint base-bind-bin
1338./usr/sbin/named.reload base-obsolete obsolete 1339./usr/sbin/named.reload base-obsolete obsolete
1339./usr/sbin/named.restart base-obsolete obsolete 1340./usr/sbin/named.restart base-obsolete obsolete
1340./usr/sbin/ncdcs base-sysutil-root binutils 1341./usr/sbin/ncdcs base-sysutil-root binutils
1341./usr/sbin/ndbootd base-bootserver-bin 1342./usr/sbin/ndbootd base-bootserver-bin
1342./usr/sbin/ndc base-obsolete obsolete 1343./usr/sbin/ndc base-obsolete obsolete
1343./usr/sbin/ndp base-netutil-bin inet6 1344./usr/sbin/ndp base-netutil-bin inet6
1344./usr/sbin/netgroup_mkdb base-nis-bin 1345./usr/sbin/netgroup_mkdb base-nis-bin
1345./usr/sbin/nfsd base-nfsserver-bin 1346./usr/sbin/nfsd base-nfsserver-bin
1346./usr/sbin/nfsiod base-obsolete obsolete 1347./usr/sbin/nfsiod base-obsolete obsolete
1347./usr/sbin/npfctl base-npf-bin npf 1348./usr/sbin/npfctl base-obsolete obsolete
1348./usr/sbin/nsec3hash base-bind-bin 1349./usr/sbin/nsec3hash base-bind-bin
1349./usr/sbin/nslookup base-obsolete obsolete 1350./usr/sbin/nslookup base-obsolete obsolete
1350./usr/sbin/nsquery base-obsolete obsolete 1351./usr/sbin/nsquery base-obsolete obsolete
1351./usr/sbin/nstest base-obsolete obsolete 1352./usr/sbin/nstest base-obsolete obsolete
1352./usr/sbin/ntp-keygen base-ntp-bin crypto 1353./usr/sbin/ntp-keygen base-ntp-bin crypto
1353./usr/sbin/ntpd base-ntp-bin 1354./usr/sbin/ntpd base-ntp-bin
1354./usr/sbin/ntpdate base-ntp-bin 1355./usr/sbin/ntpdate base-ntp-bin
1355./usr/sbin/ntpdc base-ntp-bin 1356./usr/sbin/ntpdc base-ntp-bin
1356./usr/sbin/ntpq base-ntp-bin 1357./usr/sbin/ntpq base-ntp-bin
1357./usr/sbin/ntptime base-ntp-bin 1358./usr/sbin/ntptime base-ntp-bin
1358./usr/sbin/ntptimeset base-obsolete obsolete 1359./usr/sbin/ntptimeset base-obsolete obsolete
1359./usr/sbin/ntptrace base-ntp-bin 1360./usr/sbin/ntptrace base-ntp-bin
1360./usr/sbin/omshell base-dhcpd-bin 1361./usr/sbin/omshell base-dhcpd-bin
cvs diff -r1.1738.2.13 -r1.1738.2.14 src/distrib/sets/lists/comp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/mi 2012/11/28 21:34:43 1.1738.2.13
+++ src/distrib/sets/lists/comp/mi 2012/11/29 00:09:46 1.1738.2.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1738.2.13 2012/11/28 21:34:43 riz Exp $ 1# $NetBSD: mi,v 1.1738.2.14 2012/11/29 00:09:46 riz Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.comp comp-sys-root 5./etc/mtree/set.comp comp-sys-root
6./usr/bin/addr2line comp-debug-bin binutils 6./usr/bin/addr2line comp-debug-bin binutils
7./usr/bin/ar comp-util-bin binutils 7./usr/bin/ar comp-util-bin binutils
8./usr/bin/as comp-util-bin binutils 8./usr/bin/as comp-util-bin binutils
9./usr/bin/asa comp-fortran-bin 9./usr/bin/asa comp-fortran-bin
10./usr/bin/atf-compile comp-obsolete obsolete 10./usr/bin/atf-compile comp-obsolete obsolete
11./usr/bin/c++ comp-cxx-bin gcccmds 11./usr/bin/c++ comp-cxx-bin gcccmds
12./usr/bin/c++filt comp-cxx-bin binutils 12./usr/bin/c++filt comp-cxx-bin binutils
13./usr/bin/c89 comp-c-bin 13./usr/bin/c89 comp-c-bin
14./usr/bin/c99 comp-c-bin 14./usr/bin/c99 comp-c-bin
@@ -3462,26 +3462,27 @@ @@ -3462,26 +3462,27 @@
3462./usr/libdata/debug/sbin/mount_sysvbfs.debug comp-sysutil-debug debug 3462./usr/libdata/debug/sbin/mount_sysvbfs.debug comp-sysutil-debug debug
3463./usr/libdata/debug/sbin/mount_tmpfs.debug comp-miscfs-debug debug 3463./usr/libdata/debug/sbin/mount_tmpfs.debug comp-miscfs-debug debug
3464./usr/libdata/debug/sbin/mount_udf.debug comp-sysutil-debug debug 3464./usr/libdata/debug/sbin/mount_udf.debug comp-sysutil-debug debug
3465./usr/libdata/debug/sbin/mount_umap.debug comp-miscfs-debug debug 3465./usr/libdata/debug/sbin/mount_umap.debug comp-miscfs-debug debug
3466./usr/libdata/debug/sbin/mount_union.debug comp-miscfs-debug debug 3466./usr/libdata/debug/sbin/mount_union.debug comp-miscfs-debug debug
3467./usr/libdata/debug/sbin/mount_v7fs.debug comp-sysutil-debug debug 3467./usr/libdata/debug/sbin/mount_v7fs.debug comp-sysutil-debug debug
3468./usr/libdata/debug/sbin/newfs.debug comp-sysutil-debug debug 3468./usr/libdata/debug/sbin/newfs.debug comp-sysutil-debug debug
3469./usr/libdata/debug/sbin/newfs_ext2fs.debug comp-sysutil-debug debug 3469./usr/libdata/debug/sbin/newfs_ext2fs.debug comp-sysutil-debug debug
3470./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug debug 3470./usr/libdata/debug/sbin/newfs_lfs.debug comp-sysutil-debug debug
3471./usr/libdata/debug/sbin/newfs_msdos.debug comp-sysutil-debug debug 3471./usr/libdata/debug/sbin/newfs_msdos.debug comp-sysutil-debug debug
3472./usr/libdata/debug/sbin/newfs_sysvbfs.debug comp-sysutil-debug debug 3472./usr/libdata/debug/sbin/newfs_sysvbfs.debug comp-sysutil-debug debug
3473./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug 3473./usr/libdata/debug/sbin/newfs_udf.debug comp-sysutil-debug debug
3474./usr/libdata/debug/sbin/newfs_v7fs.debug comp-sysutil-debug debug 3474./usr/libdata/debug/sbin/newfs_v7fs.debug comp-sysutil-debug debug
 3475./usr/libdata/debug/sbin/npfctl.debug comp-npf-debug npf,debug
3475./usr/libdata/debug/sbin/pfctl.debug comp-pf-debug pf,debug 3476./usr/libdata/debug/sbin/pfctl.debug comp-pf-debug pf,debug
3476./usr/libdata/debug/sbin/pflogd.debug comp-pf-debug pf,debug 3477./usr/libdata/debug/sbin/pflogd.debug comp-pf-debug pf,debug
3477./usr/libdata/debug/sbin/pfs.debug comp-pf-debug pf,debug 3478./usr/libdata/debug/sbin/pfs.debug comp-pf-debug pf,debug
3478./usr/libdata/debug/sbin/ping.debug comp-netutil-debug debug 3479./usr/libdata/debug/sbin/ping.debug comp-netutil-debug debug
3479./usr/libdata/debug/sbin/ping6.debug comp-netutil-debug use_inet6,debug 3480./usr/libdata/debug/sbin/ping6.debug comp-netutil-debug use_inet6,debug
3480./usr/libdata/debug/sbin/pppoectl.debug comp-netutil-debug debug 3481./usr/libdata/debug/sbin/pppoectl.debug comp-netutil-debug debug
3481./usr/libdata/debug/sbin/raidctl.debug comp-sysutil-debug debug 3482./usr/libdata/debug/sbin/raidctl.debug comp-sysutil-debug debug
3482./usr/libdata/debug/sbin/rcorder.debug comp-sysutil-debug debug 3483./usr/libdata/debug/sbin/rcorder.debug comp-sysutil-debug debug
3483./usr/libdata/debug/sbin/reboot.debug comp-sysutil-debug debug 3484./usr/libdata/debug/sbin/reboot.debug comp-sysutil-debug debug
3484./usr/libdata/debug/sbin/resize_ffs.debug comp-sysutil-debug debug 3485./usr/libdata/debug/sbin/resize_ffs.debug comp-sysutil-debug debug
3485./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug debug 3486./usr/libdata/debug/sbin/resize_lfs.debug comp-sysutil-debug debug
3486./usr/libdata/debug/sbin/restore.debug comp-sysutil-debug debug 3487./usr/libdata/debug/sbin/restore.debug comp-sysutil-debug debug
3487./usr/libdata/debug/sbin/rndctl.debug comp-sysutil-debug debug 3488./usr/libdata/debug/sbin/rndctl.debug comp-sysutil-debug debug
@@ -4192,27 +4193,27 @@ @@ -4192,27 +4193,27 @@
4192./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug debug 4193./usr/libdata/debug/usr/sbin/mrouted.debug comp-router-debug debug
4193./usr/libdata/debug/usr/sbin/mscdlabel.debug comp-sysutil-debug debug 4194./usr/libdata/debug/usr/sbin/mscdlabel.debug comp-sysutil-debug debug
4194./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug debug 4195./usr/libdata/debug/usr/sbin/mtrace.debug comp-netutil-debug debug
4195./usr/libdata/debug/usr/sbin/mtree.debug comp-sysutil-debug debug 4196./usr/libdata/debug/usr/sbin/mtree.debug comp-sysutil-debug debug
4196./usr/libdata/debug/usr/sbin/named-checkconf.debug comp-bind-bin debug 4197./usr/libdata/debug/usr/sbin/named-checkconf.debug comp-bind-bin debug
4197./usr/libdata/debug/usr/sbin/named-checkzone.debug comp-bind-bin debug 4198./usr/libdata/debug/usr/sbin/named-checkzone.debug comp-bind-bin debug
4198./usr/libdata/debug/usr/sbin/named-journalprint.debug comp-bind-bin debug 4199./usr/libdata/debug/usr/sbin/named-journalprint.debug comp-bind-bin debug
4199./usr/libdata/debug/usr/sbin/named.debug comp-bind-bin debug 4200./usr/libdata/debug/usr/sbin/named.debug comp-bind-bin debug
4200./usr/libdata/debug/usr/sbin/ncdcs.debug comp-sysutil-root binutils,debug 4201./usr/libdata/debug/usr/sbin/ncdcs.debug comp-sysutil-root binutils,debug
4201./usr/libdata/debug/usr/sbin/ndbootd.debug comp-bootserver-debug debug 4202./usr/libdata/debug/usr/sbin/ndbootd.debug comp-bootserver-debug debug
4202./usr/libdata/debug/usr/sbin/ndp.debug comp-netutil-debug inet6,debug 4203./usr/libdata/debug/usr/sbin/ndp.debug comp-netutil-debug inet6,debug
4203./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug comp-nis-debug debug 4204./usr/libdata/debug/usr/sbin/netgroup_mkdb.debug comp-nis-debug debug
4204./usr/libdata/debug/usr/sbin/nfsd.debug comp-nfsserver-debug debug 4205./usr/libdata/debug/usr/sbin/nfsd.debug comp-nfsserver-debug debug
4205./usr/libdata/debug/usr/sbin/npfctl.debug comp-npf-debug npf,debug 4206./usr/libdata/debug/usr/sbin/npfctl.debug comp-obsolete obsolete
4206./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug 4207./usr/libdata/debug/usr/sbin/nsec3hash.debug comp-bind-debug debug
4207./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug crypto,debug 4208./usr/libdata/debug/usr/sbin/ntp-keygen.debug comp-ntp-debug crypto,debug
4208./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug 4209./usr/libdata/debug/usr/sbin/ntpd.debug comp-ntp-debug debug
4209./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug debug 4210./usr/libdata/debug/usr/sbin/ntpdate.debug comp-ntp-debug debug
4210./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug debug 4211./usr/libdata/debug/usr/sbin/ntpdc.debug comp-ntp-debug debug
4211./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug 4212./usr/libdata/debug/usr/sbin/ntpq.debug comp-ntp-debug debug
4212./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug 4213./usr/libdata/debug/usr/sbin/ntptime.debug comp-ntp-debug debug
4213./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug 4214./usr/libdata/debug/usr/sbin/omshell.debug comp-dhcpd-debug debug
4214./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug 4215./usr/libdata/debug/usr/sbin/pac.debug comp-sysutil-debug debug
4215./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug 4216./usr/libdata/debug/usr/sbin/paxctl.debug comp-sysutil-debug debug
4216./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug 4217./usr/libdata/debug/usr/sbin/pcictl.debug comp-sysutil-debug debug
4217./usr/libdata/debug/usr/sbin/perfused.debug comp-perfuse-debug debug 4218./usr/libdata/debug/usr/sbin/perfused.debug comp-perfuse-debug debug
4218./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug,crypto 4219./usr/libdata/debug/usr/sbin/pkg_add.debug comp-pkgutil-debug debug,crypto
cvs diff -r1.2 -r1.2.6.1 src/etc/rc.d/npf (expand / switch to unified diff)

--- src/etc/rc.d/npf 2011/03/07 23:21:13 1.2
+++ src/etc/rc.d/npf 2012/11/29 00:09:44 1.2.6.1
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: npf,v 1.2 2011/03/07 23:21:13 jmcneill Exp $ 3# $NetBSD: npf,v 1.2.6.1 2012/11/29 00:09:44 riz Exp $
4# 4#
5# Public Domain. 5# Public Domain.
6# 6#
7 7
8# PROVIDE: npf 8# PROVIDE: npf
9# REQUIRE: root bootconf mountcritlocal tty network 9# REQUIRE: root bootconf mountcritlocal tty network
10# BEFORE: NETWORKING 10# BEFORE: NETWORKING
11 11
12$_rc_subr_loaded . /etc/rc.subr 12$_rc_subr_loaded . /etc/rc.subr
13 13
14name="npf" 14name="npf"
15rcvar=$name 15rcvar=$name
16 16
@@ -25,38 +25,38 @@ extra_commands="reload status" @@ -25,38 +25,38 @@ extra_commands="reload status"
25 25
26npf_cfg_check() 26npf_cfg_check()
27{ 27{
28 if [ ! -f ${config} ]; then 28 if [ ! -f ${config} ]; then
29 warn "${config} is not readable; failed." 29 warn "${config} is not readable; failed."
30 exit 1  30 exit 1
31 fi 31 fi
32} 32}
33 33
34npf_start() 34npf_start()
35{ 35{
36 echo "Enabling NPF." 36 echo "Enabling NPF."
37 npf_cfg_check 37 npf_cfg_check
38 /usr/sbin/npfctl reload 38 /sbin/npfctl reload
39 /usr/sbin/npfctl start 39 /sbin/npfctl start
40} 40}
41 41
42npf_stop() 42npf_stop()
43{ 43{
44 echo "Disabling NPF." 44 echo "Disabling NPF."
45 /usr/sbin/npfctl stop 45 /sbin/npfctl stop
46 /usr/sbin/npfctl flush 46 /sbin/npfctl flush
47} 47}
48 48
49npf_reload() 49npf_reload()
50{ 50{
51 echo "Reloading NPF ruleset." 51 echo "Reloading NPF ruleset."
52 npf_cfg_check 52 npf_cfg_check
53 /usr/sbin/npfctl reload 53 /sbin/npfctl reload
54} 54}
55 55
56npf_status() 56npf_status()
57{ 57{
58 : 58 :
59} 59}
60 60
61load_rc_config $name 61load_rc_config $name
62run_rc_command "$1" 62run_rc_command "$1"
cvs diff -r1.5.2.3 -r1.5.2.4 src/usr.sbin/npf/npfctl/Makefile (expand / switch to unified diff)

--- src/usr.sbin/npf/npfctl/Makefile 2012/11/18 22:38:28 1.5.2.3
+++ src/usr.sbin/npf/npfctl/Makefile 2012/11/29 00:09:46 1.5.2.4
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1# $NetBSD: Makefile,v 1.5.2.3 2012/11/18 22:38:28 riz Exp $ 1# $NetBSD: Makefile,v 1.5.2.4 2012/11/29 00:09:46 riz Exp $
2 2
 3BINDIR=/sbin
3PROG= npfctl 4PROG= npfctl
4MAN= npfctl.8 npf.conf.5 5MAN= npfctl.8 npf.conf.5
5 6
6SRCS= npfctl.c npf_var.c npf_data.c npf_ncgen.c npf_build.c \ 7SRCS= npfctl.c npf_var.c npf_data.c npf_ncgen.c npf_build.c \
7 npf_extmod.c npf_disassemble.c 8 npf_extmod.c npf_disassemble.c
8 9
9CPPFLAGS+= -I${.CURDIR} 10CPPFLAGS+= -I${.CURDIR}
10SRCS+= npf_scan.l npf_parse.y 11SRCS+= npf_scan.l npf_parse.y
11YHEADER= 1 12YHEADER= 1
12 13
13LDADD+= -lnpf -lprop -lutil -ly 14LDADD+= -lnpf -lprop -lutil -ly
14DPADD+= ${LIBNPF} ${LIBPROP} ${LIBUTIL} 15DPADD+= ${LIBNPF} ${LIBPROP} ${LIBUTIL}
15 16