diff -rNu ./py-fail2ban.orig/Makefile ./py-fail2ban/Makefile
--- ./py-fail2ban.orig/Makefile	2009-08-25 17:41:45.000000000 -0400
+++ ./py-fail2ban/Makefile	2010-01-12 18:14:44.000000000 -0500
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	fail2ban
-PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTVERSION=	0.8.4
 CATEGORIES=	security python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=  ${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	pgollucci@FreeBSD.org
-COMMENT=	 scans log files and bans IP that makes too many password failures. 
+COMMENT=	Scans log files and bans IPs that make too many password failures
 
 MAKE_JOBS_SAFE=  yes
 
@@ -25,7 +24,7 @@
 USE_RC_SUBR=	fail2ban
 
 PYDISTUTILS_INSTALLARGS+=	--install-purelib=${PYTHON_SITELIBDIR} \
-							--install-data=${ETCDIR} 
+				--install-data=${ETCDIR}
 
 FILES=	${WRKSRC}/fail2ban-regex \
 		${WRKSRC}/man/fail2ban-client.1 \
@@ -36,5 +35,7 @@
 
 post-patch:
 	@${ECHO_CMD} ${FILES} | ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g'
+	@mv ${WRKSRC}/config/fail2ban.conf ${WRKSRC}/config/sample.fail2ban.conf
+	@mv ${WRKSRC}/config/jail.conf ${WRKSRC}/config/sample.jail.conf
 
 .include <bsd.port.mk>
diff -rNu ./py-fail2ban.orig/distinfo ./py-fail2ban/distinfo
--- ./py-fail2ban.orig/distinfo	2009-01-13 13:22:19.000000000 -0500
+++ ./py-fail2ban/distinfo	2010-01-11 16:48:40.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (fail2ban-0.8.3.tar.bz2) = b438d7e2ce77a469fb0cca2a5cc0b81c
-SHA256 (fail2ban-0.8.3.tar.bz2) = b32fd9ee849bf36d23685a91d1d96f29a2fa383069d7d789e4956c9268dca5cd
-SIZE (fail2ban-0.8.3.tar.bz2) = 64028
+MD5 (fail2ban-0.8.4.tar.bz2) = df94335a5d12b4750869e5fe350073fa
+SHA256 (fail2ban-0.8.4.tar.bz2) = 7a4fc0ea6dffde1db1d096757878e1b2c5f0b087a05ed7e7ca0202fb0b127982
+SIZE (fail2ban-0.8.4.tar.bz2) = 71818
diff -rNu ./py-fail2ban.orig/files/patch-bsd-ipfw.conf ./py-fail2ban/files/patch-bsd-ipfw.conf
--- ./py-fail2ban.orig/files/patch-bsd-ipfw.conf	1969-12-31 19:00:00.000000000 -0500
+++ ./py-fail2ban/files/patch-bsd-ipfw.conf	2010-01-12 16:33:36.000000000 -0500
@@ -0,0 +1,68 @@
+--- /dev/null	2010-01-12 16:33:00.000000000 -0500
++++ ./config/action.d/bsd-ipfw.conf	2010-01-12 16:26:51.000000000 -0500
+@@ -0,0 +1,65 @@
++# Fail2Ban configuration file
++#
++# Author: Nick Munger
++# Modified by: Ken Menzel
++#
++
++[Definition]
++
++# Option:  actionstart
++# Notes.:  command executed once at the start of Fail2Ban.
++# Values:  CMD
++#
++actionstart = 
++
++
++# Option:  actionstop
++# Notes.:  command executed once at the end of Fail2Ban
++# Values:  CMD
++#
++actionstop = 
++
++
++# Option:  actioncheck
++# Notes.:  command executed once before each actionban command
++# Values:  CMD
++#
++actioncheck = 
++
++
++# Option:  actionban
++# Notes.:  command executed when banning an IP. Take care that the
++#          command is executed with Fail2Ban user rights.
++# Tags:    <ip>  IP address
++#          <failures>  number of failures
++#          <time>  unix timestamp of the ban time
++# Values:  CMD
++#
++# requires an ipfw rule like "deny ip from table(1) to me"
++actionban = ipfw table 1 add <ip>
++
++
++# Option:  actionunban
++# Notes.:  command executed when unbanning an IP. Take care that the
++#          command is executed with Fail2Ban user rights.
++# Tags:    <ip>  IP address
++#          <failures>  number of failures
++#          <time>  unix timestamp of the ban time
++# Values:  CMD
++#
++actionunban = ipfw table 1 delete <ip>
++
++[Init]
++
++# Option:  port
++# Notes.:  specifies port to monitor
++# Values:  [ NUM | STRING ]
++#
++#port = ssh
++port = ftp
++
++# Option:  localhost
++# Notes.:  the local IP address of the network interface
++# Values:  IP
++#
++localhost = 127.0.0.1
diff -rNu ./py-fail2ban.orig/files/patch-bsd-sshd.conf ./py-fail2ban/files/patch-bsd-sshd.conf
--- ./py-fail2ban.orig/files/patch-bsd-sshd.conf	1969-12-31 19:00:00.000000000 -0500
+++ ./py-fail2ban/files/patch-bsd-sshd.conf	2010-01-12 16:34:18.000000000 -0500
@@ -0,0 +1,43 @@
+--- /dev/null	2010-01-12 16:33:00.000000000 -0500
++++ ./config/filter.d/bsd-sshd.conf	2010-01-12 16:26:22.000000000 -0500
+@@ -0,0 +1,40 @@
++# Fail2Ban configuration file
++#
++# Author: Cyril Jaquier
++#
++# $Revision: 663 $
++#
++
++[INCLUDES]
++
++# Read common prefixes. If any customizations available -- read them from
++# common.local
++before = common.conf
++
++
++[Definition]
++
++_daemon = sshd
++
++# Option:  failregex
++# Notes.:  regex to match the password failures messages in the logfile. The
++#          host must be matched by a group named "host". The tag "<HOST>" can
++#          be used for standard IP/hostname matching and is only an alias for
++#          (?:::f{4,6}:)?(?P<host>\S+)
++# Values:  TEXT
++#
++failregex = ^%(__prefix_line)s(?:error: PAM: )?[A|a]uthentication (?:failure|error) for .* from <HOST>\s*$
++            ^%(__prefix_line)sDid not receive identification string from <HOST>$
++            ^%(__prefix_line)sFailed [-/\w]+ for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
++            ^%(__prefix_line)sROOT LOGIN REFUSED.* FROM <HOST>\s*$
++            ^%(__prefix_line)s[iI](?:llegal|nvalid) user .* from <HOST>\s*$
++            ^%(__prefix_line)sUser \S+ from <HOST> not allowed because not listed in AllowUsers$
++            ^%(__prefix_line)sauthentication failure; logname=\S* uid=\S* euid=\S* tty=\S* ruser=\S* rhost=<HOST>(?:\s+user=.*)?\s*$
++            ^%(__prefix_line)srefused connect from \S+ \(<HOST>\)\s*$
++            ^%(__prefix_line)sreverse mapping checking getaddrinfo for .* \[<HOST>\] .* POSSIBLE BREAK-IN ATTEMPT!$
++
++# Option:  ignoreregex
++# Notes.:  regex to ignore. If this regex matches, the line is ignored.
++# Values:  TEXT
++#
++ignoreregex = 
diff -rNu ./py-fail2ban.orig/files/patch-bsdftp.conf ./py-fail2ban/files/patch-bsdftp.conf
--- ./py-fail2ban.orig/files/patch-bsdftp.conf	1969-12-31 19:00:00.000000000 -0500
+++ ./py-fail2ban/files/patch-bsdftp.conf	2010-01-12 16:34:04.000000000 -0500
@@ -0,0 +1,43 @@
+--- /dev/null	2010-01-12 16:33:00.000000000 -0500
++++ ./config/filter.d/bsdftp.conf	2010-01-12 16:26:27.000000000 -0500
+@@ -0,0 +1,40 @@
++# Fail2Ban configuration file
++#
++# Author: Ken Menzel
++#
++#
++
++[INCLUDES]
++
++# Read common prefixes. If any customizations available -- read them from
++# common.local
++before = common.conf
++
++
++[Definition]
++
++_daemon = ftpd
++#
++#
++# Option: failregex
++# Notes.: regex to match the password failures messages in the logfile. The
++#          host must be matched by a group named "host". The tag "<HOST>" can
++#          be used for standard IP/hostname matching and is only an alias for
++#          (?:::f{4,6}:)?(?P<host>\S+)
++# Values: TEXT
++#
++failregex = ^%(__prefix_line)sFTP LOGIN FAILED FROM <HOST>,\s*.*$
++
++
++#	\(\S+\[<HOST>\]\)[: -]+ USER \S+: no such user found from \S+ \[\S+\] to \S+:\S+$
++#     \(\S+\[<HOST>\]\)[: -]+ USER \S+ \(Login failed\): Incorrect password\.$
++#     \(\S+\[<HOST>\]\)[: -]+ SECURITY VIOLATION: \S+ login attempted\.$
++#     \(\S+\[<HOST>\]\)[: -]+ Maximum login attempts \(\d+\) exceeded$
++
++# May 28 15:11:53 freebsd4 ftpd[26191]: FTP LOGIN FAILED FROM freebsd4, dsf
++#
++# Option:  ignoreregex
++# Notes.:  regex to ignore. If this regex matches, the line is ignored.
++# Values:  TEXT
++#
++ignoreregex = 
diff -rNu ./py-fail2ban.orig/files/patch-config__filter.d__sshd.conf ./py-fail2ban/files/patch-config__filter.d__sshd.conf
--- ./py-fail2ban.orig/files/patch-config__filter.d__sshd.conf	2009-07-22 11:55:33.000000000 -0400
+++ ./py-fail2ban/files/patch-config__filter.d__sshd.conf	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
---- ./config/filter.d/sshd.conf.orig	2009-07-22 11:52:29.236981029 -0400
-+++ ./config/filter.d/sshd.conf	2009-07-22 11:52:42.853934580 -0400
-@@ -23,7 +23,7 @@
- #          (?:::f{4,6}:)?(?P<host>\S+)
- # Values:  TEXT
- #
--failregex = ^%(__prefix_line)s(?:error: PAM: )?Authentication failure for .* from <HOST>\s*$
-+failregex = ^%(__prefix_line)s(?:error: PAM: )?[A|a]uthentication failure for .* from <HOST>\s*$
-             ^%(__prefix_line)sFailed [-/\w]+ for .* from <HOST>(?: port \d*)?(?: ssh\d*)?$
-             ^%(__prefix_line)sROOT LOGIN REFUSED.* FROM <HOST>\s*$
-             ^%(__prefix_line)s[iI](?:llegal|nvalid) user .* from <HOST>\s*$
diff -rNu ./py-fail2ban.orig/pkg-plist ./py-fail2ban/pkg-plist
--- ./py-fail2ban.orig/pkg-plist	2009-01-13 13:22:19.000000000 -0500
+++ ./py-fail2ban/pkg-plist	2010-01-12 18:20:18.000000000 -0500
@@ -4,6 +4,8 @@
 %%PYTHON_SITELIBDIR%%/common/protocol.py
 %%PYTHON_SITELIBDIR%%/common/version.py
 %%PYTHON_SITELIBDIR%%/common/__init__.py
+%%PYTHON_SITELIBDIR%%/common/helpers.py
+%%PYTHON_SITELIBDIR%%/common/helpers.pyc
 %%PYTHON_SITELIBDIR%%/client/fail2banreader.py
 %%PYTHON_SITELIBDIR%%/client/beautifier.py
 %%PYTHON_SITELIBDIR%%/client/configparserinc.py
@@ -71,8 +73,10 @@
 %%PYTHON_SITELIBDIR%%/server/filterpoll.pyc
 %%PYTHON_SITELIBDIR%%/server/datedetector.pyc
 %%PYTHON_SITELIBDIR%%/server/faildata.pyc
-%%ETCDIR%%/fail2ban.conf
-%%ETCDIR%%/jail.conf
+%%ETCDIR%%/sample.fail2ban.conf
+%%ETCDIR%%/sample.jail.conf
+%%ETCDIR%%/filter.d/bsd-sshd.conf
+%%ETCDIR%%/filter.d/bsdftp.conf
 %%ETCDIR%%/filter.d/vsftpd.conf
 %%ETCDIR%%/filter.d/gssftpd.conf
 %%ETCDIR%%/filter.d/proftpd.conf
@@ -95,12 +99,18 @@
 %%ETCDIR%%/filter.d/xinetd-fail.conf
 %%ETCDIR%%/filter.d/webmin-auth.conf
 %%ETCDIR%%/filter.d/courierlogin.conf
+%%ETCDIR%%/filter.d/cyrus-imap.conf
+%%ETCDIR%%/filter.d/lighttpd-fastcgi.conf
+%%ETCDIR%%/filter.d/php-url-fopen.conf
+%%ETCDIR%%/filter.d/sieve.conf
+%%ETCDIR%%/filter.d/apache-nohome.conf
 %%ETCDIR%%/action.d/iptables-multiport-log.conf
 %%ETCDIR%%/action.d/mail.conf
 %%ETCDIR%%/action.d/iptables-allports.conf
 %%ETCDIR%%/action.d/mail-whois.conf
 %%ETCDIR%%/action.d/iptables-new.conf
 %%ETCDIR%%/action.d/ipfw.conf
+%%ETCDIR%%/action.d/bsd-ipfw.conf
 %%ETCDIR%%/action.d/iptables-multiport.conf
 %%ETCDIR%%/action.d/mail-buffered.conf
 %%ETCDIR%%/action.d/mail-whois-lines.conf
@@ -111,6 +121,10 @@
 %%ETCDIR%%/action.d/hostsdeny.conf
 %%ETCDIR%%/action.d/iptables.conf
 %%ETCDIR%%/action.d/sendmail-whois.conf
+%%ETCDIR%%/action.d/dshield.conf
+%%ETCDIR%%/action.d/mynetwatchman.conf
+%%ETCDIR%%/action.d/complain.conf
+%%ETCDIR%%/action.d/ipfilter.conf
 @dirrm %%ETCDIR%%/filter.d
 @dirrm %%ETCDIR%%/action.d
 @dirrm %%ETCDIR%%