[src/netbsd-3]: src/usr.sbin/pf Pull up revision 1.2 (requested by peter in t...

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

details:   https://anonhg.NetBSD.org/src/rev/a829a787d4da
branches:  netbsd-3
changeset: 576443:a829a787d4da
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 02 23:37:19 2005 +0000

description:
Pull up revision 1.2 (requested by peter in ticket #518):
Remove (pf)spamd. Its right to exist in NetBSD has been questioned since it
appeared and whether it's really part of pf or not is still unclear. Looking
at the other *BSDs it seems that they have left out spamd when importing pf,
and now we do that too. Also, the name conflicted with another more popular
used tool, after the rename to pfspamd it was left with completely unusable
documentation which apparently no-one wanted to fix.
A port of the latest spamd will be imported into pkgsrc soon.
Suggested by several people, no objections on last proposal on tech-userlevel.

diffstat:

 usr.sbin/pf/etc/Makefile      |  3 +--
 usr.sbin/pf/examples/Makefile |  4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 725838b38a64 -r a829a787d4da usr.sbin/pf/etc/Makefile
--- a/usr.sbin/pf/etc/Makefile  Sat Jul 02 23:35:16 2005 +0000
+++ b/usr.sbin/pf/etc/Makefile  Sat Jul 02 23:37:19 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2004/11/14 11:26:48 yamt Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2005/07/02 23:37:19 tron Exp $
 
 .include <bsd.own.mk>
 
@@ -9,6 +9,5 @@
 
 CONFIGFILES+=  pf.conf
 CONFIGFILES+=  pf.os
-CONFIGFILES+=  spamd.conf
 
 .include <bsd.prog.mk>
diff -r 725838b38a64 -r a829a787d4da usr.sbin/pf/examples/Makefile
--- a/usr.sbin/pf/examples/Makefile     Sat Jul 02 23:35:16 2005 +0000
+++ b/usr.sbin/pf/examples/Makefile     Sat Jul 02 23:37:19 2005 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2005/03/15 16:05:04 peter Exp $
+#      $NetBSD: Makefile,v 1.1.2.1 2005/07/02 23:37:19 tron Exp $
 
 .include <bsd.own.mk>
 
 FILESDIR=      /usr/share/examples/pf
 FILES=         ackpri faq-example1 faq-example2 faq-example3
-FILES+=                queue1 queue2 queue3 queue4 spamd
+FILES+=                queue1 queue2 queue3 queue4
 
 .PATH: ${NETBSDSRCDIR}/dist/pf/share/pf