Subject: Re: toolchain/26080
To: None <toolchain-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Peter Postma <peter@pointless.nl>
List: netbsd-bugs
Date: 02/20/2005 17:14:01
The following reply was made to PR toolchain/26080; it has been noted by GNATS.

From: Peter Postma <peter@pointless.nl>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: toolchain/26080
Date: Sun, 20 Feb 2005 18:13:38 +0100

 I've created a new patch which also handles the LKM, the include files
 and ftp-proxy (when MKIPFILTER is set to no).
 There's however one small problem left, and that is the include files
 ip_compat.h and pfvar.h. They are always installed because it seems
 that kdump(1) needs these to compile. I've no idea how to handle this
 properly.
 
 I'd be grateful if a developer could look at this patch and tell me
 if it needs more work or if it's ok to commit.
 
 
 Index: distrib/sets/sets.subr
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/sets.subr,v
 retrieving revision 1.38
 diff -u -r1.38 sets.subr
 --- distrib/sets/sets.subr	10 Jan 2005 03:13:04 -0000	1.38
 +++ distrib/sets/sets.subr	18 Feb 2005 01:41:32 -0000
 @@ -37,6 +37,7 @@
  	MKGDB		\
  	MKHESIOD	\
  	MKINFO		\
 +	MKIPFILTER	\
  	MKINET6		\
  	MKKERBEROS	\
  	MKKERBEROS4	\
 @@ -45,6 +46,7 @@
  	MKMANPAGES	\
  	MKMANZ		\
  	MKNLS		\
 +	MKPF		\
  	MKPAM		\
  	MKPIC		\
  	MKPOSTFIX	\
 @@ -153,6 +155,7 @@
  #	gdb			${MKGDB} != no
  #	hesiod			${MKHESIOD} != no
  #	info			${MKINFO} != no
 +#	ipfilter		${MKIPFILTER} != no
  #	inet6			${MKINET6} != no
  #	kerberos		${MKKERBEROS} != no
  #	kerberos4		${MKKERBEROS4} != no
 @@ -160,6 +163,7 @@
  #	man			${MKMAN} != no
  #	manz			${MKMANZ} != no
  #	nls			${MKNLS} != no
 +#	pf			${MKPF} != no
  #	pam			${MKPAM} != no
  #	postfix			${MKPOSTFIX} != no
  #	profile			${MKPROFILE} != no
 Index: distrib/sets/lists/base/lkm.mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/base/lkm.mi,v
 retrieving revision 1.10
 diff -u -r1.10 lkm.mi
 --- distrib/sets/lists/base/lkm.mi	24 Jan 2005 15:50:52 -0000	1.10
 +++ distrib/sets/lists/base/lkm.mi	18 Feb 2005 01:41:32 -0000
 @@ -8,7 +8,7 @@
  ./usr/lkm/ext2fs.o				base-vfs-lkm
  ./usr/lkm/fdesc.o				base-vfs-lkm
  ./usr/lkm/filecorefs.o				base-vfs-lkm
 -./usr/lkm/if_ipl.o				base-ipf-lkm
 +./usr/lkm/if_ipl.o				base-ipf-lkm	ipfilter
  ./usr/lkm/lfs.o					base-vfs-lkm
  ./usr/lkm/kernfs.o				base-vfs-lkm
  ./usr/lkm/mfs.o					base-vfs-lkm
 @@ -16,7 +16,7 @@
  ./usr/lkm/ntfs.o				base-vfs-lkm
  ./usr/lkm/nullfs.o				base-vfs-lkm
  ./usr/lkm/overlay.o				base-vfs-lkm
 -./usr/lkm/pf.o					base-net-lkm
 +./usr/lkm/pf.o					base-net-lkm	pf
  ./usr/lkm/portal.o				base-vfs-lkm
  ./usr/lkm/procfs.o				base-vfs-lkm
  ./usr/lkm/ptyfs.o				base-vfs-lkm
 Index: distrib/sets/lists/base/mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/base/mi,v
 retrieving revision 1.525
 diff -u -r1.525 mi
 --- distrib/sets/lists/base/mi	12 Feb 2005 00:33:34 -0000	1.525
 +++ distrib/sets/lists/base/mi	18 Feb 2005 01:41:34 -0000
 @@ -130,7 +130,7 @@
  ./sbin/halt					base-sysutil-root
  ./sbin/ifconfig					base-netutil-root
  ./sbin/init					base-sysutil-root
 -./sbin/ipf					base-netutil-root
 +./sbin/ipf					base-netutil-root	ipfilter
  ./sbin/ipppctl					base-netutil-root
  ./sbin/ispppcontrol				base-obsolete		obsolete
  ./sbin/lmcctl					base-netutil-root
 @@ -169,7 +169,7 @@
  ./sbin/nfsd					base-obsolete		obsolete
  ./sbin/nfsiod					base-obsolete		obsolete
  ./sbin/nologin					base-sysutil-root
 -./sbin/pfctl					base-netutil-root
 +./sbin/pfctl					base-netutil-root	pf
  ./sbin/ping					base-netutil-root
  ./sbin/ping6					base-netutil-root	inet6
  ./sbin/poweroff					base-sysutil-root
 @@ -829,7 +829,7 @@
  ./usr/libexec/cpp				base-obsolete		obsolete
  ./usr/libexec/dnskeygen				base-obsolete		obsolete
  ./usr/libexec/fingerd				base-netutil-bin
 -./usr/libexec/ftp-proxy				base-netutil-bin
 +./usr/libexec/ftp-proxy				base-netutil-bin	pf
  ./usr/libexec/ftpd				base-netutil-bin
  ./usr/libexec/getNAME				base-man-bin
  ./usr/libexec/getty				base-sysutil-bin
 @@ -887,9 +887,9 @@
  ./usr/libexec/sftp-server			base-secsh-bin		crypto
  ./usr/libexec/sm.bin				base-sendmail-usr
  ./usr/libexec/smrsh				base-sendmail-bin	sendmail
 -./usr/libexec/spamd				base-netutil-bin
 -./usr/libexec/spamd-setup			base-netutil-bin
 -./usr/libexec/spamlogd				base-netutil-bin
 +./usr/libexec/spamd				base-netutil-bin	pf
 +./usr/libexec/spamd-setup			base-netutil-bin	pf
 +./usr/libexec/spamlogd				base-netutil-bin	pf
  ./usr/libexec/ssh-keysign			base-secsh-bin		crypto
  ./usr/libexec/telnetd				base-netutil-bin
  ./usr/libexec/tftpd				base-netutil-bin
 @@ -912,7 +912,7 @@
  ./usr/sbin/amd					base-amd-bin
  ./usr/sbin/amq					base-amd-bin
  ./usr/sbin/arp					base-netutil-bin
 -./usr/sbin/authpf				base-netutil-bin
 +./usr/sbin/authpf				base-netutil-bin	pf
  ./usr/sbin/bootpd				base-bootserver-bin
  ./usr/sbin/bootpef				base-bootserver-bin
  ./usr/sbin/bootpgw				base-bootserver-bin
 @@ -966,15 +966,15 @@
  ./usr/sbin/installboot				base-sysutil-bin
  ./usr/sbin/iopctl				base-sysutil-bin
  ./usr/sbin/iostat				base-sysutil-bin
 -./usr/sbin/ipfs					base-netutil-bin
 -./usr/sbin/ipfstat				base-netutil-bin
 -./usr/sbin/ipftest				base-netutil-bin
 -./usr/sbin/ipmon				base-netutil-bin
 -./usr/sbin/ipnat				base-router-bin
 -./usr/sbin/ippool				base-netutil-root
 -./usr/sbin/ipresend				base-netutil-bin
 -./usr/sbin/ipsend				base-netutil-bin
 -./usr/sbin/iptest				base-netutil-bin
 +./usr/sbin/ipfs					base-netutil-bin	ipfilter
 +./usr/sbin/ipfstat				base-netutil-bin	ipfilter
 +./usr/sbin/ipftest				base-netutil-bin	ipfilter
 +./usr/sbin/ipmon				base-netutil-bin	ipfilter
 +./usr/sbin/ipnat				base-router-bin		ipfilter
 +./usr/sbin/ippool				base-netutil-root	ipfilter
 +./usr/sbin/ipresend				base-netutil-bin	ipfilter
 +./usr/sbin/ipsend				base-netutil-bin	ipfilter
 +./usr/sbin/iptest				base-netutil-bin	ipfilter
  ./usr/sbin/irdaattach				base-sysutil-bin
  ./usr/sbin/isdnd				base-isdn-bin
  ./usr/sbin/isdnmonitor				base-isdn-bin
 @@ -1117,7 +1117,7 @@
  ./usr/sbin/slstats				base-slip-bin
  ./usr/sbin/smrsh				base-obsolete		obsolete
  ./usr/sbin/sntp					base-ntp-bin
 -./usr/sbin/spamdb				base-netutil-bin
 +./usr/sbin/spamdb				base-netutil-bin	pf
  ./usr/sbin/spawn				base-obsolete		obsolete
  ./usr/sbin/spray				base-rpcutil-bin
  ./usr/sbin/sshd					base-secsh-bin		crypto
 Index: distrib/sets/lists/comp/mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
 retrieving revision 1.761
 diff -u -r1.761 mi
 --- distrib/sets/lists/comp/mi	24 Jan 2005 07:05:17 -0000	1.761
 +++ distrib/sets/lists/comp/mi	18 Feb 2005 01:41:38 -0000
 @@ -943,24 +943,24 @@
  ./usr/include/netinet/in_var.h			comp-c-include
  ./usr/include/netinet/ip.h			comp-c-include
  ./usr/include/netinet/ip6.h			comp-c-include
 -./usr/include/netinet/ip_auth.h			comp-c-include
 +./usr/include/netinet/ip_auth.h			comp-c-include		ipfilter
  ./usr/include/netinet/ip_compat.h		comp-c-include
  ./usr/include/netinet/ip_ecn.h			comp-c-include
  ./usr/include/netinet/ip_encap.h		comp-c-include
 -./usr/include/netinet/ip_fil.h			comp-c-include
 -./usr/include/netinet/ip_frag.h			comp-c-include
 +./usr/include/netinet/ip_fil.h			comp-c-include		ipfilter
 +./usr/include/netinet/ip_frag.h			comp-c-include		ipfilter
  ./usr/include/netinet/ip_gre.h			comp-c-include
 -./usr/include/netinet/ip_htable.h		comp-c-include
 +./usr/include/netinet/ip_htable.h		comp-c-include		ipfilter
  ./usr/include/netinet/ip_icmp.h			comp-c-include
 -./usr/include/netinet/ip_lookup.h		comp-c-include
 +./usr/include/netinet/ip_lookup.h		comp-c-include		ipfilter
  ./usr/include/netinet/ip_mroute.h		comp-c-include
 -./usr/include/netinet/ip_nat.h			comp-c-include
 -./usr/include/netinet/ip_pool.h			comp-c-include
 -./usr/include/netinet/ip_proxy.h		comp-c-include
 +./usr/include/netinet/ip_nat.h			comp-c-include		ipfilter
 +./usr/include/netinet/ip_pool.h			comp-c-include		ipfilter
 +./usr/include/netinet/ip_proxy.h		comp-c-include		ipfilter
  ./usr/include/netinet/ip_rules.h		comp-obsolete		obsolete
 -./usr/include/netinet/ip_scan.h			comp-c-include
 -./usr/include/netinet/ip_state.h		comp-c-include
 -./usr/include/netinet/ip_sync.h			comp-c-include
 +./usr/include/netinet/ip_scan.h			comp-c-include		ipfilter
 +./usr/include/netinet/ip_state.h		comp-c-include		ipfilter
 +./usr/include/netinet/ip_sync.h			comp-c-include		ipfilter
  ./usr/include/netinet/ip_var.h			comp-c-include
  ./usr/include/netinet/pim.h			comp-c-include
  ./usr/include/netinet/pim_var.h			comp-c-include
 Index: distrib/sets/lists/etc/mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/etc/mi,v
 retrieving revision 1.147
 diff -u -r1.147 mi
 --- distrib/sets/lists/etc/mi	11 Jan 2005 12:23:17 -0000	1.147
 +++ distrib/sets/lists/etc/mi	18 Feb 2005 01:41:38 -0000
 @@ -101,8 +101,8 @@
  ./etc/pam.d/xdm					etc-sys-etc
  ./etc/passwd					etc-sys-etc
  ./etc/passwd.conf				etc-sys-etc
 -./etc/pf.conf					etc-net-etc
 -./etc/pf.os					etc-net-etc
 +./etc/pf.conf					etc-net-etc		pf
 +./etc/pf.os					etc-net-etc		pf
  ./etc/phones					etc-uucp-etc
  ./etc/postfix/README				etc-postfix-etc		postfix
  ./etc/postfix/main.cf				etc-postfix-etc		postfix
 @@ -247,7 +247,7 @@
  ./etc/skel/.logout				etc-sys-etc
  ./etc/skel/.profile				etc-sys-etc
  ./etc/skeykeys					etc-sys-etc
 -./etc/spamd.conf				etc-net-etc
 +./etc/spamd.conf				etc-net-etc		pf
  ./etc/spwd.db					etc-sys-etc
  ./etc/ssh/ssh_config				etc-secsh-etc		crypto
  ./etc/ssh/ssh_known_hosts			etc-secsh-etc		crypto
 Index: distrib/sets/lists/man/mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/man/mi,v
 retrieving revision 1.757
 diff -u -r1.757 mi
 --- distrib/sets/lists/man/mi	24 Jan 2005 02:07:24 -0000	1.757
 +++ distrib/sets/lists/man/mi	18 Feb 2005 01:41:40 -0000
 @@ -175,10 +175,10 @@
  ./usr/share/man/cat1/intro.0			man-sys-catman		.cat
  ./usr/share/man/cat1/ipcrm.0			man-util-catman		.cat
  ./usr/share/man/cat1/ipcs.0			man-util-catman		.cat
 -./usr/share/man/cat1/ipftest.0			man-ipf-catman		.cat
 -./usr/share/man/cat1/ipresend.0			man-ipf-catman		.cat
 -./usr/share/man/cat1/ipsend.0			man-ipf-catman		.cat
 -./usr/share/man/cat1/iptest.0			man-ipf-catman		.cat
 +./usr/share/man/cat1/ipftest.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat1/ipresend.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat1/ipsend.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat1/iptest.0			man-ipf-catman		ipfilter,.cat
  ./usr/share/man/cat1/jobs.0			man-util-catman		.cat
  ./usr/share/man/cat1/join.0			man-util-catman		.cat
  ./usr/share/man/cat1/jot.0			man-util-catman		.cat
 @@ -238,7 +238,7 @@
  ./usr/share/man/cat1/mkdep.0			man-c-catman		.cat
  ./usr/share/man/cat1/mkdir.0			man-util-catman		.cat
  ./usr/share/man/cat1/mkfifo.0			man-sysutil-catman	.cat
 -./usr/share/man/cat1/mkfilters.0		man-ipf-catman		.cat
 +./usr/share/man/cat1/mkfilters.0		man-ipf-catman		ipfilter,.cat
  ./usr/share/man/cat1/mklocale.0			man-util-catman		.cat
  ./usr/share/man/cat1/mktemp.0			man-util-catman		.cat
  ./usr/share/man/cat1/mopa.out.0			man-obsolete		obsolete
 @@ -906,12 +906,12 @@
  ./usr/share/man/cat4/iopsp.0			man-sys-catman		.cat
  ./usr/share/man/cat4/ip.0			man-sys-catman		.cat
  ./usr/share/man/cat4/ip6.0			man-sys-catman		.cat
 -./usr/share/man/cat4/ipf.0			man-sys-catman		.cat
 -./usr/share/man/cat4/ipfilter.0			man-sys-catman		.cat
 +./usr/share/man/cat4/ipf.0			man-sys-catman		ipfilter,.cat
 +./usr/share/man/cat4/ipfilter.0			man-sys-catman		ipfilter,.cat
  ./usr/share/man/cat4/ipip.0			man-obsolete		obsolete
  ./usr/share/man/cat4/ipkdb.0			man-sys-catman		.cat
 -./usr/share/man/cat4/ipl.0			man-sys-catman		.cat
 -./usr/share/man/cat4/ipnat.0			man-sys-catman		.cat
 +./usr/share/man/cat4/ipl.0			man-sys-catman		ipfilter,.cat
 +./usr/share/man/cat4/ipnat.0			man-sys-catman		ipfilter,.cat
  ./usr/share/man/cat4/ippp.0			man-sys-catman		.cat
  ./usr/share/man/cat4/ipsec.0			man-sys-catman		.cat
  ./usr/share/man/cat4/ipw.0			man-sys-catman		.cat
 @@ -1059,8 +1059,8 @@
  ./usr/share/man/cat4/pcweasel.0			man-sys-catman		.cat
  ./usr/share/man/cat4/pdcsata.0			man-sys-catman		.cat
  ./usr/share/man/cat4/pdcide.0			man-sys-catman		.cat
 -./usr/share/man/cat4/pf.0			man-sys-catman		.cat
 -./usr/share/man/cat4/pflog.0			man-sys-catman		.cat
 +./usr/share/man/cat4/pf.0			man-sys-catman		pf,.cat
 +./usr/share/man/cat4/pflog.0			man-sys-catman		pf,.cat
  ./usr/share/man/cat4/phy.0			man-sys-catman		.cat
  ./usr/share/man/cat4/piixide.0			man-sys-catman		.cat
  ./usr/share/man/cat4/pim.0			man-sys-catman		.cat
 @@ -1446,15 +1446,15 @@
  ./usr/share/man/cat5/info.0			man-texinfo-catman	.cat
  ./usr/share/man/cat5/inode.0			man-sys-catman		.cat
  ./usr/share/man/cat5/intro.0			man-sys-catman		.cat
 -./usr/share/man/cat5/ipf.0			man-ipf-catman		.cat
 -./usr/share/man/cat5/ipf.conf.0			man-ipf-catman		.cat
 -./usr/share/man/cat5/ipf6.conf.0		man-ipf-catman		.cat
 -./usr/share/man/cat5/ipmon.0			man-ipf-catman		.cat
 -./usr/share/man/cat5/ipnat.0			man-ipf-catman		.cat
 -./usr/share/man/cat5/ipnat.conf.0		man-ipf-catman		.cat
 -./usr/share/man/cat5/ippool.0			man-ipf-catman		.cat
 +./usr/share/man/cat5/ipf.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ipf.conf.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ipf6.conf.0		man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ipnat.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ipnat.conf.0		man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ippool.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat5/ipmon.0			man-ipf-catman		ipfilter,.cat
  ./usr/share/man/cat5/ipsec.conf.0		man-netutil-catman	.cat
 -./usr/share/man/cat5/ipsend.0			man-ipf-catman		.cat
 +./usr/share/man/cat5/ipsend.0			man-ipf-catman		ipfilter,.cat
  ./usr/share/man/cat5/isdnd.acct.0		man-isdn-catman		.cat
  ./usr/share/man/cat5/isdnd.rates.0		man-isdn-catman		.cat
  ./usr/share/man/cat5/isdnd.rc.0			man-isdn-catman		.cat
 @@ -1493,8 +1493,8 @@
  ./usr/share/man/cat5/passwd.conf.0		man-sys-catman		.cat
  ./usr/share/man/cat5/pcfs.0			man-obsolete		obsolete
  ./usr/share/man/cat5/pcre_table.0		man-postfix-catman	postfix,.cat
 -./usr/share/man/cat5/pf.conf.0			man-sys-catman		.cat
 -./usr/share/man/cat5/pf.os.0			man-sys-catman		.cat
 +./usr/share/man/cat5/pf.conf.0			man-sys-catman		pf,.cat
 +./usr/share/man/cat5/pf.os.0			man-sys-catman		pf,.cat
  ./usr/share/man/cat5/phones.0			man-uucp-catman		.cat
  ./usr/share/man/cat5/pim6dd.conf.0		man-obsolete		obsolete
  ./usr/share/man/cat5/pim6sd.conf.0		man-obsolete		obsolete
 @@ -1519,7 +1519,7 @@
  ./usr/share/man/cat5/services.0			man-net-catman		.cat
  ./usr/share/man/cat5/shells.0			man-sys-catman		.cat
  ./usr/share/man/cat5/siginfo.0			man-obsolete		obsolete
 -./usr/share/man/cat5/spamd.conf.0		man-netutil-catman	.cat
 +./usr/share/man/cat5/spamd.conf.0		man-netutil-catman	pf,.cat
  ./usr/share/man/cat5/ssh_config.0		man-secsh-catman	crypto,.cat
  ./usr/share/man/cat5/sshd_config.0		man-secsh-catman	crypto,.cat
  ./usr/share/man/cat5/stab.0			man-sys-catman		.cat
 @@ -1620,7 +1620,7 @@
  ./usr/share/man/cat8/atari/installboot.0	man-sysutil-catman	.cat
  ./usr/share/man/cat8/atari/makedev.0		man-obsolete		obsolete
  ./usr/share/man/cat8/atrun.0			man-cron-catman		.cat
 -./usr/share/man/cat8/authpf.0			man-sys-cat		.cat
 +./usr/share/man/cat8/authpf.0			man-sys-cat		pf,.cat
  ./usr/share/man/cat8/bad144.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/badsect.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/bebox/MAKEDEV.0		man-obsolete		obsolete
 @@ -1719,7 +1719,7 @@
  ./usr/share/man/cat8/fsinfo.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/fsirand.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/fssconfig.0		man-sysutil-catman	.cat
 -./usr/share/man/cat8/ftp-proxy.0		man-netutil-catman	.cat
 +./usr/share/man/cat8/ftp-proxy.0		man-netutil-catman	pf,.cat
  ./usr/share/man/cat8/ftpd.0			man-netutil-catman	.cat
  ./usr/share/man/cat8/genassym.sh.0		man-sys-catman		.cat
  ./usr/share/man/cat8/getNAME.0			man-man-catman		.cat
 @@ -1787,12 +1787,12 @@
  ./usr/share/man/cat8/intro.0			man-sys-catman		.cat
  ./usr/share/man/cat8/iopctl.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/iostat.0			man-sysutil-catman	.cat
 -./usr/share/man/cat8/ipf.0			man-ipf-catman		.cat
 -./usr/share/man/cat8/ipfs.0			man-ipf-catman		.cat
 -./usr/share/man/cat8/ipfstat.0			man-ipf-catman		.cat
 -./usr/share/man/cat8/ipmon.0			man-ipf-catman		.cat
 -./usr/share/man/cat8/ipnat.0			man-ipf-catman		.cat
 -./usr/share/man/cat8/ippool.0			man-ipf-catman		.cat
 +./usr/share/man/cat8/ipf.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat8/ipfs.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat8/ipfstat.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat8/ipmon.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat8/ipnat.0			man-ipf-catman		ipfilter,.cat
 +./usr/share/man/cat8/ippool.0			man-ipf-catman		ipfilter,.cat
  ./usr/share/man/cat8/ipppctl.0			man-isdn-catman		.cat
  ./usr/share/man/cat8/ipwctl.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/irda.0			man-sysutil-catman	.cat
 @@ -1971,7 +1971,7 @@
  ./usr/share/man/cat8/pcnfsd.0			man-nfsserver-catman	.cat
  ./usr/share/man/cat8/pdisk.0			man-sysutil-catman	.cat
  ./usr/share/man/cat8/peace.0			man-sys-catman		.cat
 -./usr/share/man/cat8/pfctl.0			man-sys-catman		.cat
 +./usr/share/man/cat8/pfctl.0			man-sys-catman		pf,.cat
  ./usr/share/man/cat8/pickup.0			man-postfix-catman	postfix,.cat
  ./usr/share/man/cat8/pim6dd.0			man-obsolete		obsolete
  ./usr/share/man/cat8/pim6sd.0			man-obsolete		obsolete
 @@ -2088,10 +2088,10 @@
  ./usr/share/man/cat8/smrsh.0			man-sendmail-catman	sendmail,.cat
  ./usr/share/man/cat8/smtp.0			man-postfix-catman	postfix,.cat
  ./usr/share/man/cat8/smtpd.0			man-postfix-catman	postfix,.cat
 -./usr/share/man/cat8/spamd-setup.0		man-netutil-catman	.cat
 -./usr/share/man/cat8/spamd.0			man-netutil-catman	.cat
 -./usr/share/man/cat8/spamdb.0			man-netutil-catman	.cat
 -./usr/share/man/cat8/spamlogd.0			man-netutil-catman	.cat
 +./usr/share/man/cat8/spamd-setup.0		man-netutil-catman	pf,.cat
 +./usr/share/man/cat8/spamd.0			man-netutil-catman	pf,.cat
 +./usr/share/man/cat8/spamdb.0			man-netutil-catman	pf,.cat
 +./usr/share/man/cat8/spamlogd.0			man-netutil-catman	pf,.cat
  ./usr/share/man/cat8/sparc/MAKEDEV.0		man-obsolete		obsolete
  ./usr/share/man/cat8/sparc/binstall.0		man-sysutil-catman	.cat
  ./usr/share/man/cat8/sparc/boot.0		man-sys-catman		.cat
 @@ -2364,10 +2364,10 @@
  ./usr/share/man/man1/intro.1			man-sys-man		.man
  ./usr/share/man/man1/ipcrm.1			man-util-man		.man
  ./usr/share/man/man1/ipcs.1			man-util-man		.man
 -./usr/share/man/man1/ipftest.1			man-ipf-man		.man
 -./usr/share/man/man1/ipresend.1			man-ipf-man		.man
 -./usr/share/man/man1/ipsend.1			man-ipf-man		.man
 -./usr/share/man/man1/iptest.1			man-ipf-man		.man
 +./usr/share/man/man1/ipftest.1			man-ipf-man		ipfilter,.man
 +./usr/share/man/man1/ipresend.1			man-ipf-man		ipfilter,.man
 +./usr/share/man/man1/ipsend.1			man-ipf-man		ipfilter,.man
 +./usr/share/man/man1/iptest.1			man-ipf-man		ipfilter,.man
  ./usr/share/man/man1/jobs.1			man-util-man		.man
  ./usr/share/man/man1/join.1			man-util-man		.man
  ./usr/share/man/man1/jot.1			man-util-man		.man
 @@ -2427,7 +2427,7 @@
  ./usr/share/man/man1/mkdep.1			man-c-man		.man
  ./usr/share/man/man1/mkdir.1			man-util-man		.man
  ./usr/share/man/man1/mkfifo.1			man-sysutil-man		.man
 -./usr/share/man/man1/mkfilters.1		man-ipf-man		.man
 +./usr/share/man/man1/mkfilters.1		man-ipf-man		ipfilter,.man
  ./usr/share/man/man1/mklocale.1			man-util-man		.man
  ./usr/share/man/man1/mktemp.1			man-util-man		.man
  ./usr/share/man/man1/mopa.out.1			man-obsolete		obsolete
 @@ -3095,13 +3095,13 @@
  ./usr/share/man/man4/iopsp.4			man-sys-man		.man
  ./usr/share/man/man4/ip.4			man-sys-man		.man
  ./usr/share/man/man4/ip6.4			man-sys-man		.man
 -./usr/share/man/man4/ipf.4			man-sys-man		.man
 -./usr/share/man/man4/ipfilter.4			man-sys-man		.man
 -./usr/share/man/man4/ipfilter.4			man-sys-man		.man
 +./usr/share/man/man4/ipf.4			man-sys-man		ipfilter,.man
 +./usr/share/man/man4/ipfilter.4			man-sys-man		ipfilter,.man
 +./usr/share/man/man4/ipfilter.4			man-sys-man		ipfilter,.man
  ./usr/share/man/man4/ipip.4			man-obsolete		obsolete
  ./usr/share/man/man4/ipkdb.4			man-sys-man		.man
 -./usr/share/man/man4/ipl.4			man-sys-man		.man
 -./usr/share/man/man4/ipnat.4			man-sys-man		.man
 +./usr/share/man/man4/ipl.4			man-sys-man		ipfilter,.man
 +./usr/share/man/man4/ipnat.4			man-sys-man		ipfilter,.man
  ./usr/share/man/man4/ippp.4			man-sys-man		.man
  ./usr/share/man/man4/ipsec.4			man-sys-man		.man
  ./usr/share/man/man4/ipw.4			man-sys-man		.man
 @@ -3250,8 +3250,8 @@
  ./usr/share/man/man4/pcweasel.4			man-sys-man		.man
  ./usr/share/man/man4/pdcsata.4			man-sys-man		.man
  ./usr/share/man/man4/pdcide.4			man-sys-man		.man
 -./usr/share/man/man4/pf.4			man-sys-man		.man
 -./usr/share/man/man4/pflog.4			man-sys-man		.man
 +./usr/share/man/man4/pf.4			man-sys-man		pf,.man
 +./usr/share/man/man4/pflog.4			man-sys-man		pf,.man
  ./usr/share/man/man4/phy.4			man-sys-man		.man
  ./usr/share/man/man4/piixide.4			man-sys-man		.man
  ./usr/share/man/man4/pim.4			man-sys-man		.man
 @@ -3637,15 +3637,17 @@
  ./usr/share/man/man5/info.5			man-texinfo-man		.man
  ./usr/share/man/man5/inode.5			man-sys-man		.man
  ./usr/share/man/man5/intro.5			man-sys-man		.man
 -./usr/share/man/man5/ipf.5			man-ipf-man		.man
 -./usr/share/man/man5/ipf.conf.5			man-ipf-man		.man
 -./usr/share/man/man5/ipf6.conf.5		man-ipf-man		.man
 -./usr/share/man/man5/ipmon.5			man-ipf-man		.man
 -./usr/share/man/man5/ipnat.5			man-ipf-man		.man
 -./usr/share/man/man5/ipnat.conf.5		man-ipf-man		.man
 -./usr/share/man/man5/ippool.5			man-ipf-man		.man
 +./usr/share/man/man5/ipf.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipf.conf.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipf6.conf.5		man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipnat.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipnat.conf.5		man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ippool.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipmon.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipnat.5			man-ipf-man		ipfilter,.man
 +./usr/share/man/man5/ipnat.conf.5		man-ipf-man		ipfilter,.man
  ./usr/share/man/man5/ipsec.conf.5		man-netutil-man		.man
 -./usr/share/man/man5/ipsend.5			man-ipf-man		.man
 +./usr/share/man/man5/ipsend.5			man-ipf-man		ipfilter,.man
  ./usr/share/man/man5/isdnd.acct.5		man-isdn-man		.man
  ./usr/share/man/man5/isdnd.rates.5		man-isdn-man		.man
  ./usr/share/man/man5/isdnd.rc.5			man-isdn-man		.man
 @@ -3684,8 +3686,8 @@
  ./usr/share/man/man5/passwd.conf.5		man-sys-man		.man
  ./usr/share/man/man5/pcfs.5			man-obsolete		obsolete
  ./usr/share/man/man5/pcre_table.5		man-postfix-man		postfix,.man
 -./usr/share/man/man5/pf.conf.5			man-sys-man		.man
 -./usr/share/man/man5/pf.os.5			man-sys-man		.man
 +./usr/share/man/man5/pf.conf.5			man-sys-man		pf,.man
 +./usr/share/man/man5/pf.os.5			man-sys-man		pf,.man
  ./usr/share/man/man5/phones.5			man-uucp-man		.man
  ./usr/share/man/man5/pim6dd.conf.5		man-obsolete		obsolete
  ./usr/share/man/man5/pim6sd.conf.5		man-obsolete		obsolete
 @@ -3710,7 +3712,7 @@
  ./usr/share/man/man5/services.5			man-net-man		.man
  ./usr/share/man/man5/shells.5			man-sys-man		.man
  ./usr/share/man/man5/siginfo.5			man-obsolete		obsolete
 -./usr/share/man/man5/spamd.conf.5		man-netutil-man		.man
 +./usr/share/man/man5/spamd.conf.5		man-netutil-man		pf,.man
  ./usr/share/man/man5/ssh_config.5		man-secsh-man		crypto,.man
  ./usr/share/man/man5/sshd_config.5		man-secsh-man		crypto,.man
  ./usr/share/man/man5/stab.5			man-sys-man		.man
 @@ -3810,7 +3812,7 @@
  ./usr/share/man/man8/atari/installboot.8	man-sysutil-man		.man
  ./usr/share/man/man8/atari/makedev.8		man-obsolete		obsolete
  ./usr/share/man/man8/atrun.8			man-cron-man		.man
 -./usr/share/man/man8/authpf.8			man-sys-man		.man
 +./usr/share/man/man8/authpf.8			man-sys-man		pf,.man
  ./usr/share/man/man8/bad144.8			man-sysutil-man		.man
  ./usr/share/man/man8/badsect.8			man-sysutil-man		.man
  ./usr/share/man/man8/bebox/MAKEDEV.8		man-obsolete		obsolete
 @@ -3909,7 +3911,7 @@
  ./usr/share/man/man8/fsinfo.8			man-sysutil-man		.man
  ./usr/share/man/man8/fsirand.8			man-sysutil-man		.man
  ./usr/share/man/man8/fssconfig.8		man-sysutil-man		.man
 -./usr/share/man/man8/ftp-proxy.8		man-netutil-man		.man
 +./usr/share/man/man8/ftp-proxy.8		man-netutil-man		pf,.man
  ./usr/share/man/man8/ftpd.8			man-netutil-man		.man
  ./usr/share/man/man8/genassym.sh.8		man-sys-man		.man
  ./usr/share/man/man8/getNAME.8			man-man-man		.man
 @@ -3978,12 +3980,12 @@
  ./usr/share/man/man8/intro.8			man-sys-man		.man
  ./usr/share/man/man8/iopctl.8			man-sysutil-man		.man
  ./usr/share/man/man8/iostat.8			man-sysutil-man		.man
 -./usr/share/man/man8/ipf.8			man-ipf-man		.man
 -./usr/share/man/man8/ipfs.8			man-ipf-man		.man
 -./usr/share/man/man8/ipfstat.8			man-ipf-man		.man
 -./usr/share/man/man8/ipmon.8			man-ipf-man		.man
 -./usr/share/man/man8/ipnat.8			man-ipf-man		.man
 -./usr/share/man/man8/ippool.8			man-ipf-man		.man
 +./usr/share/man/man8/ipf.8			man-ipf-man		ipfilter,.man
 +./usr/share/man/man8/ipfs.8			man-ipf-man		ipfilter,.man
 +./usr/share/man/man8/ipfstat.8			man-ipf-man		ipfilter,.man
 +./usr/share/man/man8/ipmon.8			man-ipf-man		ipfilter,.man
 +./usr/share/man/man8/ipnat.8			man-ipf-man		ipfilter,.man
 +./usr/share/man/man8/ippool.8			man-ipf-man		ipfilter,.man
  ./usr/share/man/man8/ipppctl.8			man-isdn-man		.man
  ./usr/share/man/man8/ipwctl.8			man-sysutil-man		.man
  ./usr/share/man/man8/iwictl.8			man-sysutil-man		.man
 @@ -4162,7 +4164,7 @@
  ./usr/share/man/man8/pcnfsd.8			man-nfsserver-man	.man
  ./usr/share/man/man8/pdisk.8			man-sysutil-man		.man
  ./usr/share/man/man8/peace.8			man-sys-man		.man
 -./usr/share/man/man8/pfctl.8			man-sys-man		.man
 +./usr/share/man/man8/pfctl.8			man-sys-man		pf,.man
  ./usr/share/man/man8/pickup.8			man-postfix-man		postfix,.man
  ./usr/share/man/man8/pim6dd.8			man-obsolete		obsolete
  ./usr/share/man/man8/pim6sd.8			man-obsolete		obsolete
 @@ -4279,10 +4281,10 @@
  ./usr/share/man/man8/smrsh.8			man-sendmail-man	sendmail,.man
  ./usr/share/man/man8/smtp.8			man-postfix-man		postfix,.man
  ./usr/share/man/man8/smtpd.8			man-postfix-man		postfix,.man
 -./usr/share/man/man8/spamd-setup.8		man-netutil-man		.man
 -./usr/share/man/man8/spamd.8			man-netutil-man		.man
 -./usr/share/man/man8/spamdb.8			man-netutil-man		.man
 -./usr/share/man/man8/spamlogd.8			man-netutil-man		.man
 +./usr/share/man/man8/spamd-setup.8		man-netutil-man		pf,.man
 +./usr/share/man/man8/spamd.8			man-netutil-man		pf,.man
 +./usr/share/man/man8/spamdb.8			man-netutil-man		pf,.man
 +./usr/share/man/man8/spamlogd.8			man-netutil-man		pf,.man
  ./usr/share/man/man8/sparc/MAKEDEV.8		man-obsolete		obsolete
  ./usr/share/man/man8/sparc/binstall.8		man-sys-man		.man
  ./usr/share/man/man8/sparc/boot.8		man-sys-man		.man
 Index: distrib/sets/lists/misc/mi
 ===================================================================
 RCS file: /cvsroot/src/distrib/sets/lists/misc/mi,v
 retrieving revision 1.107
 diff -u -r1.107 mi
 --- distrib/sets/lists/misc/mi	10 Jan 2005 03:13:04 -0000	1.107
 +++ distrib/sets/lists/misc/mi	18 Feb 2005 01:41:41 -0000
 @@ -480,32 +480,32 @@
  ./usr/share/examples/fstab/fstab.wd0.cobalt	misc-fstab-examples	share
  ./usr/share/examples/ftpd/ftpd.conf		misc-netutil-examples	share
  ./usr/share/examples/ftpd/ftpusers		misc-netutil-examples	share
 -./usr/share/examples/ipf/BASIC.NAT		misc-netutil-examples	share
 -./usr/share/examples/ipf/BASIC_1.FW		misc-netutil-examples	share
 -./usr/share/examples/ipf/BASIC_2.FW		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.1		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.10		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.11		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.12		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.13		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.2		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.3		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.4		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.5		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.6		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.7		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.8		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.9		misc-netutil-examples	share
 -./usr/share/examples/ipf/example.sr		misc-netutil-examples	share
 -./usr/share/examples/ipf/firewall		misc-netutil-examples	share
 -./usr/share/examples/ipf/ftp-proxy		misc-netutil-examples	share
 -./usr/share/examples/ipf/ftppxy			misc-netutil-examples	share
 -./usr/share/examples/ipf/mediaone		misc-netutil-examples	share
 -./usr/share/examples/ipf/mkfilters		misc-netutil-examples	share
 -./usr/share/examples/ipf/nat-setup		misc-netutil-examples	share
 -./usr/share/examples/ipf/nat.eg			misc-netutil-examples	share
 -./usr/share/examples/ipf/server			misc-netutil-examples	share
 -./usr/share/examples/ipf/tcpstate		misc-netutil-examples	share
 +./usr/share/examples/ipf/BASIC.NAT		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/BASIC_1.FW		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/BASIC_2.FW		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.1		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.10		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.11		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.12		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.13		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.2		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.3		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.4		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.5		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.6		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.7		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.8		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.9		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/example.sr		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/firewall		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/ftp-proxy		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/ftppxy			misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/mediaone		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/mkfilters		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/nat-setup		misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/nat.eg			misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/server			misc-netutil-examples	ipfilter,share
 +./usr/share/examples/ipf/tcpstate		misc-netutil-examples	ipfilter,share
  ./usr/share/examples/isdn/holidays.D.SH		misc-isdn-examples	share
  ./usr/share/examples/isdn/isdnd.rates.A		misc-isdn-examples	share
  ./usr/share/examples/isdn/isdnd.rates.D		misc-isdn-examples	share
 Index: dist/pf/libexec/ftp-proxy/ftp-proxy.c
 ===================================================================
 RCS file: /cvsroot/src/dist/pf/libexec/ftp-proxy/ftp-proxy.c,v
 retrieving revision 1.9
 diff -u -r1.9 ftp-proxy.c
 --- dist/pf/libexec/ftp-proxy/ftp-proxy.c	16 Dec 2004 02:08:29 -0000	1.9
 +++ dist/pf/libexec/ftp-proxy/ftp-proxy.c	18 Feb 2005 01:41:41 -0000
 @@ -1000,7 +1000,11 @@
  	int use_tcpwrapper = 0;
  #endif /* LIBWRAP */
  
 +#ifdef WITH_IPF
  	while ((ch = getopt(argc, argv, "a:D:g:m:M:R:S:t:u:AinpVwr")) != -1) {
 +#else
 +	while ((ch = getopt(argc, argv, "a:D:g:m:M:R:S:t:u:AnpVwr")) != -1) {
 +#endif
  		char *p;
  		switch (ch) {
  		case 'a':
 @@ -1023,11 +1027,13 @@
  		case 'g':
  			Group = optarg;
  			break;
 +#ifdef WITH_IPF
  		case 'i' :
  			if (pf)
  				usage();
  			ipf = 1;
  			break;
 +#endif
  		case 'm':
  			min_port = strtol(optarg, &p, 10);
  			if (!*optarg || *p)
 @@ -1133,9 +1139,11 @@
  	if (pf && get_proxy_env(0, &real_server_sa, &client_iob.sa,
  	    &proxy_sa) == -1)
  		exit(EX_PROTOCOL);
 +#ifdef WITH_IPF
  	if (ipf && ipf_get_proxy_env(0, &real_server_sa, &client_iob.sa,
  	    &proxy_sa) == -1)
  		exit(EX_PROTOCOL);
 +#endif
  
  	/*
  	 * We may now drop root privs, as we have done our ioctl for
 Index: etc/Makefile
 ===================================================================
 RCS file: /cvsroot/src/etc/Makefile,v
 retrieving revision 1.302
 diff -u -r1.302 Makefile
 --- etc/Makefile	15 Jan 2005 18:18:18 -0000	1.302
 +++ etc/Makefile	18 Feb 2005 01:41:41 -0000
 @@ -163,10 +163,10 @@
  		MKBFD MKCATPAGES \
  		MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
  		MKDOC MKDYNAMICROOT MKGCC MKGCCCMDS MKGDB \
 -		MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO \
 +		MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
  		MKKERBEROS4 MKKERBEROS MKLINKLIB MKLINT \
  		MKMAN MKMANZ MKNLS MKOBJ MKOBJDIRS \
 -		MKPAM MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 +		MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
  		MKSENDMAIL MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
  		MKUNPRIVED MKUPDATE MKUUCP MKX11 MKYP \
  		NBUILDJOBS NETBSDSRCDIR \
 @@ -314,7 +314,9 @@
  	${MAKEDIRTARGET} ${subdir} configinstall
  .endfor
  	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/mail configinstall
 +.if (${MKPF} != "no")
  	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.sbin/pf configinstall
 +.endif
  	${MAKEDIRTARGET} ${NETBSDSRCDIR}/gnu/usr.sbin/postfix configinstall
  .if (${MKCRYPTO} != "no")
  	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/ssh configinstall
 Index: share/man/man5/mk.conf.5
 ===================================================================
 RCS file: /cvsroot/src/share/man/man5/mk.conf.5,v
 retrieving revision 1.21
 diff -u -r1.21 mk.conf.5
 --- share/man/man5/mk.conf.5	5 Nov 2004 12:40:06 -0000	1.21
 +++ share/man/man5/mk.conf.5	18 Feb 2005 01:41:41 -0000
 @@ -31,7 +31,7 @@
  .\"  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  .\"  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  .\"
 -.Dd November 5, 2004
 +.Dd February 14, 2005
  .Dt MK.CONF 5
  .Os
  .\" turn off hyphenation
 @@ -303,6 +303,13 @@
  build.
  .DFLTy
  .
 +.It Sy MKIPFILTER
 +.YorN
 +Indicates wether the 
 +.Xr ipf 4
 +programs/headers and LKM will be compiled and installed during a build.
 +.DFLTy
 +.
  .It Sy MKKERBEROS4
  .YorN
  Indicates whether the Kerberos v4 infrastructure
 @@ -397,6 +404,13 @@
  pass) at the start of a build.
  .DFLTn
  .
 +.It Sy MKPF
 +.YorN
 +Indicates wether the
 +.Xr pf 4
 +programs/headers and LKM will be compiled and installed during a build.
 +.DFLTy
 +.
  .It Sy MKPIC
  .YorN
  Indicates whether shared objects and libraries will be created and
 Index: share/mk/bsd.README
 ===================================================================
 RCS file: /cvsroot/src/share/mk/bsd.README,v
 retrieving revision 1.162
 diff -u -r1.162 bsd.README
 --- share/mk/bsd.README	7 Feb 2005 01:38:44 -0000	1.162
 +++ share/mk/bsd.README	18 Feb 2005 01:41:42 -0000
 @@ -165,6 +165,9 @@
  		Texinfo source files.
  		Default: yes
  
 +MKIPFILTER	If "no", don't build or install the IP Filter programs and LKM.
 +		Default: yes
 +
  MKKERBEROS4	If "no", disables building of Kerberos v4
  		infrastructure (libraries and support programs).
  		Default: yes
 @@ -208,6 +211,9 @@
  		infrastructure (libraries and support programs).
  		Default: no
  
 +MKPF		If "no", don't build or install the pf programs, LKM and spamd.
 +		Default: yes
 +
  MKPIC		If "no", don't build or install shared libraries, and
  		also acts as "MKPICLIB=no"
  		Default: yes (for MACHINE_ARCHs that support it) 
 Index: share/mk/bsd.own.mk
 ===================================================================
 RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
 retrieving revision 1.435
 diff -u -r1.435 bsd.own.mk
 --- share/mk/bsd.own.mk	13 Jan 2005 00:15:21 -0000	1.435
 +++ share/mk/bsd.own.mk	18 Feb 2005 01:41:42 -0000
 @@ -555,13 +555,13 @@
  	DOC \
  	GCC GCCCMDS GDB \
  	HESIOD HTML \
 -	IEEEFP INET6 INFO \
 +	IEEEFP INET6 INFO IPFILTER \
  	KERBEROS KERBEROS4 \
  	LINKLIB LINT \
  	MAN \
  	NLS \
  	OBJ \
 -	PAM PIC PICINSTALL PICLIB POSTFIX PROFILE \
 +	PAM PF PIC PICINSTALL PICLIB POSTFIX PROFILE \
  	SENDMAIL SHARE SKEY STATICLIB \
  	UUCP \
  	YP
 Index: sys/net/Makefile
 ===================================================================
 RCS file: /cvsroot/src/sys/net/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- sys/net/Makefile	8 Jan 2005 22:28:51 -0000	1.17
 +++ sys/net/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -7,9 +7,15 @@
  	if_gre.h if_hippi.h if_ieee1394.h if_llc.h if_media.h \
  	if_ppp.h if_pppvar.h if_pppoe.h if_slvar.h if_sppp.h if_stf.h \
  	if_stripvar.h if_tap.h if_token.h if_tun.h if_types.h if_vlanvar.h \
 -	netisr.h pfil.h pfkeyv2.h pfvar.h ppp-comp.h ppp_defs.h radix.h \
 +	netisr.h pfil.h pfkeyv2.h ppp-comp.h ppp_defs.h radix.h \
  	raw_cb.h route.h slcompress.h slip.h zlib.h
  
 +.include <bsd.own.mk>
 +
 +.if (${MKPF} != "no")
 +INCS+=	pfvar.h
 +.endif
 +
  .include <bsd.kinc.mk>
  
  .PATH: ${NETBSDSRCDIR}/sys/dist/pf/net
 Index: sys/netinet/Makefile
 ===================================================================
 RCS file: /cvsroot/src/sys/netinet/Makefile,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile
 --- sys/netinet/Makefile	5 Oct 2004 04:55:48 -0000	1.10
 +++ sys/netinet/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -11,9 +11,14 @@
  
  # ipfilter headers
  # XXX shouldn't be here
 -INCS+=	ip_auth.h ip_compat.h ip_fil.h ip_frag.h ip_htable.h ip_nat.h \
 +.include <bsd.own.mk>
 +
 +INCS+=	ip_compat.h	# always needed by kdump(1)
 +
 +.if (${MKIPFILTER} != "no")
 +INCS+=	ip_auth.h ip_fil.h ip_frag.h ip_htable.h ip_nat.h \
  	ip_lookup.h ip_pool.h ip_proxy.h ip_scan.h ip_state.h ip_sync.h
 - 
 +.endif
  
  .include <bsd.kinc.mk>
  
 Index: sys/lkm/net/Makefile
 ===================================================================
 RCS file: /cvsroot/src/sys/lkm/net/Makefile,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile
 --- sys/lkm/net/Makefile	24 Jan 2005 15:50:52 -0000	1.6
 +++ sys/lkm/net/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -1,5 +1,11 @@
  #	$NetBSD: Makefile,v 1.6 2005/01/24 15:50:52 cube Exp $
  
 -SUBDIR=	bsdcomp deflate pf tap
 +.include <bsd.own.mk>
 +
 +SUBDIR=	bsdcomp deflate tap
 +
 +.if (${MKPF} != "no")
 +SUBDIR+= pf
 +.endif
  
  .include <bsd.subdir.mk>
 Index: sys/lkm/netinet/Makefile
 ===================================================================
 RCS file: /cvsroot/src/sys/lkm/netinet/Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile
 --- sys/lkm/netinet/Makefile	18 Mar 1999 06:01:42 -0000	1.2
 +++ sys/lkm/netinet/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -1,5 +1,9 @@
  #	$NetBSD: Makefile,v 1.2 1999/03/18 06:01:42 ross Exp $
  
 +.include <bsd.own.mk>
 +
 +.if (${MKIPFILTER} != "no")
  SUBDIR=	if_ipl
 +.endif
  
  .include <bsd.subdir.mk>
 Index: usr.sbin/Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/Makefile,v
 retrieving revision 1.197
 diff -u -r1.197 Makefile
 --- usr.sbin/Makefile	11 Jan 2005 18:31:12 -0000	1.197
 +++ usr.sbin/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -8,7 +8,7 @@
  	dhcp diskpart dumpfs dumplfs edquota eeprom \
  	envstat eshconfig etcupdate fssconfig grfconfig \
  	grfinfo gspa hilinfo ifwatchd inetd installboot \
 -	iopctl iostat ipf ipwctl irdaattach isdn iteconfig iwictl \
 +	iopctl iostat ipwctl irdaattach isdn iteconfig iwictl\
  	kgmon lastlogin link lpr mailwrapper makefs \
  	map-mbone mdconfig memswitch mlxctl mopd mountd moused \
  	mrinfo mrouted mscdlabel mtrace \
 @@ -46,7 +46,14 @@
  SUBDIR+= racoon
  .endif
  
 +# IP Filter
 +.if (${MKIPFILTER} != "no")
 +SUBDIR+=ipf
 +.endif
 +
  # PF
 +.if (${MKPF} != "no")
  SUBDIR+=pf
 +.endif
  
  .include <bsd.subdir.mk>
 Index: usr.sbin/pf/ftp-proxy/Makefile
 ===================================================================
 RCS file: /cvsroot/src/usr.sbin/pf/ftp-proxy/Makefile,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile
 --- usr.sbin/pf/ftp-proxy/Makefile	11 Nov 2004 11:54:51 -0000	1.1
 +++ usr.sbin/pf/ftp-proxy/Makefile	18 Feb 2005 01:41:42 -0000
 @@ -10,9 +10,13 @@
  
  CPPFLAGS+=-I${NETBSDSRCDIR}/sys
  
 -# ipfilter support
 +.include <bsd.own.mk>
 +
 +# IP Filter support
 +.if (${MKIPFILTER} != "no")
  SRCS+=	ipf.c
 -CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/ipf
 +CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/ipf -DWITH_IPF
 +.endif
  
  CPPFLAGS+=-DLIBWRAP
  LDADD+=	-lwrap
 
 -- 
 Peter Postma