2 files changed, 8 insertions, 69 deletions

diff --git a/mail/spamass-rules/Makefile b/mail/spamass-rules/Makefile
index 382a3c6590bd..fab485486486 100644
--- a/mail/spamass-rules/Makefile
+++ b/mail/spamass-rules/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spamass-rules
-PORTVERSION=	20101112
-PORTREVISION=	1
+PORTVERSION=	20120319
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ranner.eu/stuff/
 
@@ -17,28 +16,19 @@ COMMENT=	Custom rulesets for SpamAssassin
 RUN_DEPENDS=	spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 
 OPTIONS=	AHBL "Check AHBL Blacklist" on \
-		AIRMAX "Some custom rulesets" on \
-		BACKHAIR "Catch those ugly, unsightly HTML tags" on \
+		AIRMAX "Some custom rulesets" off \
+		BACKHAIR "Catch those ugly, unsightly HTML tags" off \
 		BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \
-		BRAZILIAN "Catches spam written in Portuguese" off \
-		CHICKENPOX "Catch spam like 'l.ooks f|or th.is garb+age'" on \
+		CHICKENPOX "Catch spam like 'l.ooks f|or th.is garb+age'" off \
 		CHINESE "Catches spam written in Chinese" off \
-		EVILNUMBERS "Phone numbers, PO boxes, ... from spam " on \
-		FRENCH "Catches spam written in French" off \
+		EVILNUMBERS "Phone numbers, PO boxes, ... from spam " off \
 		GERMAN "Catches spam written in German" on \
 		GREEK "Catches spam written in Greek" on \
 		MALWARE "Malware Patrol - Block List" on \
-		MANGLED "Looks for obfuscated/gappy words" on \
+		MANGLED "Looks for obfuscated/gappy words" off \
 		MIMEVLD "Some mime validation rules" on \
 		NIXSPAM "Check NiX Spam Blacklist" on \
 		RANDOM "Detects spamware mistakes like: %RANDOM_WORD" on \
-		ROMANIAN "Catches spam written in Romanian" off \
-		SARE "Installs safe SARE rules" on \
-		SARE1 "Installs more restrictive SARE rules" on \
-		SARE2 "Installs more cpu intensive SARE rules" on \
-		SARE3 "Installs aggressive SARE rules" off \
-		SAREH "Installs SARE high risk rules" off \
-		SAREW "Installs SARE whitelist rules" on \
 		TRIPWIRE "Matches 3 chars that shouldn't be together" on \
 		WEEDS "Looks at alphanum, hex, lower-, uppercase chars" off \
 		WEEDS2 "More restrictive than WEEDS, dont use together" on
@@ -68,13 +58,6 @@ SPAMASS_FILES+=	backhair.cf
 SPAMASS_FILES+=	bogus-virus-warnings.cf
 .endif
 
-.if defined(WITH_BRAZILIAN)
-.for i in 24_br_wiki_BODY.cf 24_br_wiki_HEADER.cf 24_br_wiki_META.cf \
-	24_br_wiki_RAWBODY.cf 24_br_wiki_URI.cf
-SPAMASS_FILES+=	$i
-.endfor
-.endif
-
 .if !defined(WITHOUT_CHICKENPOX)
 SPAMASS_FILES+=	chickenpox.cf
 .endif
@@ -87,10 +70,6 @@ SPAMASS_FILES+=	chinese_rules.cf
 SPAMASS_FILES+=	evilnumbers.cf
 .endif
 
-.if defined(WITH_FRENCH)
-SPAMASS_FILES+=	french_rules.cf
-.endif
-
 .if !defined(WITHOUT_GERMAN)
 SPAMASS_FILES+=	70_zmi_german.cf
 .endif
@@ -119,46 +98,6 @@ SPAMASS_FILES+=	20_dnsbl_nixspam.cf
 SPAMASS_FILES+=	random.cf
 .endif
 
-.if defined(WITH_ROMANIAN)
-SPAMASS_FILES+=	blacklist_ro.cf
-.endif
-
-.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_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
-.endfor
-.endif
-
-.if !defined(WITHOUT_SARE1)
-.for i in 70_sare_header1.cf 70_sare_html1.cf 70_sare_genlsubj1.cf 70_sare_obfu1.cf 70_sare_uri1.cf
-SPAMASS_FILES+=	$i
-.endfor
-.endif
-
-.if !defined(WITHOUT_SARE2)
-.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
-
-.if defined(WITH_SARE3)
-.for i in 70_sare_header3.cf 70_sare_html3.cf 70_sare_genlsubj3.cf 70_sare_obfu3.cf 70_sare_uri3.cf
-SPAMASS_FILES+=	$i
-.endfor
-.endif
-
-.if defined(WITH_SAREH)
-SPAMASS_FILES+=	70_sare_highrisk.cf
-.endif
-
-.if !defined(WITHOUT_SAREW)
-SPAMASS_FILES+=	70_sare_whitelist.cf
-.endif
-
 .if !defined(WITHOUT_TRIPWIRE)
 SPAMASS_FILES+=	99_FVGT_Tripwire.cf
 .endif
diff --git a/mail/spamass-rules/distinfo b/mail/spamass-rules/distinfo
index 31cda75e5551..28188f27ed5e 100644
--- a/mail/spamass-rules/distinfo
+++ b/mail/spamass-rules/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spamass-rules-20101112.tar.bz2) = c7e53cc08d94b1e6d12d94c0554eefd31b3766214763b4372a02fea5e941c1c1
-SIZE (spamass-rules-20101112.tar.bz2) = 421993
+SHA256 (spamass-rules-20120319.tar.bz2) = 3a41a55634214d012f213c8110a3885ac165e0db90d4ea11a9a6fcc84bf4acfa
+SIZE (spamass-rules-20120319.tar.bz2) = 465252