5 files changed, 69 insertions, 14 deletions

diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index ad6182a46cc7..c596ed319abb 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -6,20 +6,34 @@
 #
 
 PORTNAME=	spambnc
-PORTVERSION=	20010310
+PORTVERSION=	20010514
 CATEGORIES=	mail
-MASTER_SITES=	http://www.spambouncer.org/
-DISTFILES=	spambnc.tar.Z index.shtml
-EXTRACT_ONLY=	spambnc.tar.Z
+MASTER_SITES=	ftp://ftp.spambouncer.org/
+DISTFILES=	sb.tar.Z index.shtml
+EXTRACT_ONLY=	sb.tar.Z
 
-MAINTAINER=	greid@ukug.uk.freebsd.org
+MAINTAINER=	greid@FreeBSD.org
 
 IGNOREFILES=	index.shtml
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-SBFILES=	freemail legitlists notify procmail.rc sb-new.rc \
-		sb-old.rc sb.rc spam
+SBFILES=	check-blacklists.rc freemail legitlists notify procmail.rc \
+		sb-blacklists.rc sb-blockheaders.rc sb-blockisps.rc \
+		sb-blocksw.rc sb-domain_from_forgeries.rc sb-freemail.rc \
+		sb-ideological.rc sb-languages.rc sb-mainsleaze.rc \
+		sb-ordinary.rc sb-pt-bogus_urls.rc \
+		sb-pt-bulk_email_advertising.rc sb-pt-chain_letters.rc \
+		sb-pt-credit.rc sb-pt-detective.rc sb-pt-diploma.rc \
+		sb-pt-disclaimer.rc sb-pt-havendomains.rc sb-pt-health.rc \
+		sb-pt-mmf.rc sb-pt-onlinebiz.rc sb-pt-other_patterns.rc \
+		sb-pt-scripts.rc sb-pt-spamphone.rc sb-pt-spampostal.rc \
+		sb-pt-spamsubjects.rc sb-pt-stock.rc sb-pt-webhost.rc \
+		sb-pt-websitetraffic.rc sb-pt-websurf.rc \
+		sb-pt-weight_loss.rc sb-pt-work_from_home.rc sb-pt-xxx.rc \
+		sb-retired.rc sb-rogue.rc sb-smallfry.rc sb-spamforhire.rc \
+		sb-spamheaders.rc sb-spamisps.rc sb-spamsw.rc \
+		sb-viruses.rc sb.rc spam
 
 do-install:
 	${MKDIR} ${PREFIX}/share/spambnc/
@@ -32,6 +46,6 @@ do-install:
 .endif
 
 post-install:
-	@${SED} -e 's,/usr/local,${PREFIX},g' ${PKGMESSAGE}
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/spambnc/distinfo b/mail/spambnc/distinfo
index 1f14b860fa71..241a4f40ad69 100644
--- a/mail/spambnc/distinfo
+++ b/mail/spambnc/distinfo
@@ -1,2 +1,2 @@
-MD5 (spambnc.tar.Z) = 1df06b51abdcc60cac9a6d84e20d5a91
+MD5 (sb.tar.Z) = 8d6d501af83080f532016fd0cf384287
 MD5 (index.shtml) = IGNORE
diff --git a/mail/spambnc/pkg-descr b/mail/spambnc/pkg-descr
index 04720607ce93..fd4fb35a9124 100644
--- a/mail/spambnc/pkg-descr
+++ b/mail/spambnc/pkg-descr
@@ -9,5 +9,7 @@ probably spam, but might also be legitimate. It then tags this email
 with appropriate headers giving the spam classification, and responds
 according to the parameters you have set.
 
+WWW: http://www.spambouncer.org
+
 - George Reid
 greid@ukug.uk.freebsd.org
diff --git a/mail/spambnc/pkg-message b/mail/spambnc/pkg-message
index 28b6fe234e22..bf3c8236e724 100644
--- a/mail/spambnc/pkg-message
+++ b/mail/spambnc/pkg-message
@@ -1,6 +1,5 @@
 
-The spambounce procmail rules have been installed in /usr/local/share/spambnc/.
+The spambounce procmail rules have been installed in %%PREFIX%%/share/spambnc/.
 Please read the section entitled "Configuring the Spam Bouncer" in the file
-/usr/local/share/doc/spambnc/documentation.html for information on how to set
+%%PREFIX%%/share/doc/spambnc/documentation.html for information on how to set
 up your mailbox.
-
diff --git a/mail/spambnc/pkg-plist b/mail/spambnc/pkg-plist
index 80a2000e7d71..9b38f9080b8b 100644
--- a/mail/spambnc/pkg-plist
+++ b/mail/spambnc/pkg-plist
@@ -1,9 +1,49 @@
+share/spambnc/check-blacklists.rc
 share/spambnc/freemail
 share/spambnc/legitlists
 share/spambnc/notify
 share/spambnc/procmail.rc
-share/spambnc/sb-new.rc
-share/spambnc/sb-old.rc
+share/spambnc/sb-blacklists.rc
+share/spambnc/sb-blockheaders.rc
+share/spambnc/sb-blockisps.rc
+share/spambnc/sb-blocksw.rc
+share/spambnc/sb-domain_from_forgeries.rc
+share/spambnc/sb-freemail.rc
+share/spambnc/sb-ideological.rc
+share/spambnc/sb-languages.rc
+share/spambnc/sb-mainsleaze.rc
+share/spambnc/sb-ordinary.rc
+share/spambnc/sb-pt-bogus_urls.rc
+share/spambnc/sb-pt-bulk_email_advertising.rc
+share/spambnc/sb-pt-chain_letters.rc
+share/spambnc/sb-pt-credit.rc
+share/spambnc/sb-pt-detective.rc
+share/spambnc/sb-pt-diploma.rc
+share/spambnc/sb-pt-disclaimer.rc
+share/spambnc/sb-pt-havendomains.rc
+share/spambnc/sb-pt-health.rc
+share/spambnc/sb-pt-mmf.rc
+share/spambnc/sb-pt-onlinebiz.rc
+share/spambnc/sb-pt-other_patterns.rc
+share/spambnc/sb-pt-scripts.rc
+share/spambnc/sb-pt-spamphone.rc
+share/spambnc/sb-pt-spampostal.rc
+share/spambnc/sb-pt-spamsubjects.rc
+share/spambnc/sb-pt-stock.rc
+share/spambnc/sb-pt-webhost.rc
+share/spambnc/sb-pt-websitetraffic.rc
+share/spambnc/sb-pt-websurf.rc
+share/spambnc/sb-pt-weight_loss.rc
+share/spambnc/sb-pt-work_from_home.rc
+share/spambnc/sb-pt-xxx.rc
+share/spambnc/sb-retired.rc
+share/spambnc/sb-rogue.rc
+share/spambnc/sb-smallfry.rc
+share/spambnc/sb-spamforhire.rc
+share/spambnc/sb-spamheaders.rc
+share/spambnc/sb-spamisps.rc
+share/spambnc/sb-spamsw.rc
+share/spambnc/sb-viruses.rc
 share/spambnc/sb.rc
 share/spambnc/spam
 %%PORTDOCS%%share/doc/spambnc/documentation.html