diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules/Makefile /usr/ports/mail/spamass-rules.update/Makefile
--- /usr/ports/mail/spamass-rules/Makefile	Sat Feb  4 12:10:19 2006
+++ /usr/ports/mail/spamass-rules.update/Makefile	Tue Sep 26 14:12:21 2006
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spamass-rules
-PORTVERSION=	20060203
+PORTVERSION=	20060926
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ranner.jawa.at/stuff/
 
@@ -17,7 +17,6 @@
 
 OPTIONS=	AHBL "Check AHBL Blacklist" off \
 		AIRMAX "Some custom rulesets" off \
-		ANTIDRUG "Already included in SA 3.0" off \
 		BACKHAIR "Catch those ugly, unsightly HTML tags" on \
 		BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \
 		BRAZILIAN "Catches spam written in Portuguese" off \
@@ -35,6 +34,7 @@
 		SARE2 "Installs more cpu intensive SARE rules" off \
 		SARE3 "Installs aggressive SARE rules" off \
 		SAREH "Installs SARE high risk rules" off \
+		SAREW "Installs SARE whitelist rules" off \
 		TRIPWIRE "Matches 3 chars that shouldn't be together" off \
 		WEEDS "Looks at alphanum, hex, lower-, uppercase chars" on \
 		WEEDS2 "More restrictive than WEEDS, dont use together" off
@@ -56,10 +56,6 @@
 SPAMASS_FILES+=	airmax.cf
 .endif
 
-.if defined(WITH_ANTIDRUG)
-SPAMASS_FILES+=	antidrug.cf
-.endif
-
 .if !defined(WITHOUT_BACKHAIR)
 SPAMASS_FILES+=	backhair.cf
 .endif
@@ -92,9 +88,7 @@
 .endif
 
 .if defined(WITH_GERMAN)
-.for i in 24_de_wiki_BODY.cf 24_de_wiki_HEADER.cf 24_de_wiki_URI.cf
-SPAMASS_FILES+=	$i
-.endfor
+SPAMASS_FILES+=	70_zmi_german.cf
 .endif
 
 .if defined(WITH_MANGLED)
@@ -116,7 +110,7 @@
 .if !defined(WITHOUT_SARE)
 .for i in 70_sare_adult.cf 70_sare_bayes_poison_nxm.cf 70_sare_header0.cf \
 	70_sare_html0.cf 70_sare_genlsubj0.cf 70_sare_oem.cf 70_sare_obfu0.cf \
-	70_sare_random.cf 70_sare_specific.cf 70_sare_spoof.cf \
+	70_sare_random.cf 70_sare_specific.cf 70_sare_spoof.cf 70_sare_stocks.cf \
 	70_sare_unsub.cf 70_sare_uri0.cf 72_sare_redirect_post3.0.0.cf \
 	72_sare_bml_post25x.cf 99_sare_fraud_post25x.cf
 SPAMASS_FILES+=	$i
@@ -130,7 +124,7 @@
 .endif
 
 .if defined(WITH_SARE2)
-.for i in 70_sare_header2.cf 70_sare_html2.cf 70_sare_genlsubj2.cf 70_sare_obfu2.cf
+.for i in 70_sare_header2.cf 70_sare_html2.cf 70_sare_genlsubj2.cf 70_sare_obfu2.cf 70_sare_uri2.cf
 SPAMASS_FILES+=	$i
 .endfor
 .endif
@@ -143,6 +137,10 @@
 
 .if defined(WITH_SAREH)
 SPAMASS_FILES+=	70_sare_highrisk.cf
+.endif
+
+.if defined(WITH_SAREW)
+SPAMASS_FILES+=	70_sare_whitelist.cf
 .endif
 
 .if defined(WITH_TRIPWIRE)
diff -ruN --exclude=CVS /usr/ports/mail/spamass-rules/distinfo /usr/ports/mail/spamass-rules.update/distinfo
--- /usr/ports/mail/spamass-rules/distinfo	Sat Feb  4 12:10:19 2006
+++ /usr/ports/mail/spamass-rules.update/distinfo	Tue Sep 26 14:04:11 2006
@@ -1,3 +1,3 @@
-MD5 (spamass-rules-20060203.tar.bz2) = afaeab3690e8e795550179aa142c5864
-SHA256 (spamass-rules-20060203.tar.bz2) = e1c6cb8b29a0ea4609c1d7820f1e0b8c46e39d88699a641d740e9d0b8a997593
-SIZE (spamass-rules-20060203.tar.bz2) = 243848
+MD5 (spamass-rules-20060926.tar.bz2) = 539a2d7541090641d42453fb2ea8e1f2
+SHA256 (spamass-rules-20060926.tar.bz2) = 7ba409455d20bdf2f035dab655df9d1ae9856ec022731e2b2068d925616089fa
+SIZE (spamass-rules-20060926.tar.bz2) = 297485