4 files changed, 37 insertions, 16 deletions

diff --git a/mail/spamass-rules_du_jour/Makefile b/mail/spamass-rules_du_jour/Makefile
index 59a2a41ea6e0..1a66a9e98b04 100644
--- a/mail/spamass-rules_du_jour/Makefile
+++ b/mail/spamass-rules_du_jour/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rules_du_jour
-PORTVERSION=	1.18
+PORTVERSION=	1.20
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ranner.jawa.at/stuff/
 PKGNAMEPREFIX=	spamass-
@@ -18,15 +18,20 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
 				spamc:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 
 OPTIONS=	ANTIDRUG "Already included in SA 3.0" off \
+		BLACKLIST "William Stearn's sa-blacklist" off \
+		BLACKLISTU "William Stearn's URI blacklist" off \
 		BOGUS_VIRUS "Catch 'collateral spam' caused by viruses" on \
 		CURL "Use curl to download rule files" off \
-		EVILNUMBERS "Phone numbers, PO boxes, ... from spam " on \
 		RANDOM "Detects spamware mistakes like: %RANDOM_WORD" on \
 		SARE "Installs safe SARE rules" on \
+		SARE_CODING "Ruleset for html coding abuse" off \
+		SARE_HEADER "Ruleset for header abuse" off \
+		SARE_SPEC "SARE Specific Ruleset" off \
 		TRIPWIRE "Matches 3 chars that shouldn't be together" off
 PLIST_FILES=	bin/rules_du_jour etc/mail/rulesdujour.sample
-PKGMESSAGE=		${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
 NO_BUILD=		yes
+USE_BZIP2=		yes
 SPAMASS_CONF=	etc/mail/spamassassin
 SPAMASS_DIR=	${PREFIX}/${SPAMASS_CONF}
 
@@ -40,12 +45,16 @@ SPAMASS_FILES+=	ANTIDRUG
 SPAMASS_FILES+=	BOGUSVIRUS
 .endif
 
-.if defined(WITH_CURL)
-RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+.if defined(WITH_BLACKLIST)
+SPAMASS_FILES+=	BLACKLIST
+.endif
+
+.if defined(WITH_BLACKLISTU)
+SPAMASS_FILES+=	BLACKLIST_URI
 .endif
 
-.if defined(WITH_EVILNUMBERS)
-SPAMASS_FILES+=	EVILNUMBERS
+.if defined(WITH_CURL)
+RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .endif
 
 .if defined(WITH_RANDOM)
@@ -54,11 +63,24 @@ SPAMASS_FILES+=	RANDOMVAL
 
 .if defined(WITH_SARE)
 .for i in SARE_ADULT SARE_FRAUD SARE_BML SARE_RATWARE SARE_SPOOF \
-	SARE_BAYES_POISON_NXM SARE_OEM SARE_RANDOM SARE_SPECIFIC
+	SARE_BAYES_POISON_NXM SARE_OEM SARE_RANDOM SARE_SPECIFIC \
+	EVILNUMBERS
 SPAMASS_FILES+=	$i
 .endfor
 .endif
 
+.if defined(WITH_SARE_CODING)
+SPAMASS_FILES+=	SARE_CODING
+.endif
+
+.if defined(WITH_SARE_HEADER)
+SPAMASS_FILES+=	SARE_HEADER
+.endif
+
+.if defined(WITH_SARE_SPEC)
+SPAMASS_FILES+=	SARE_SPECIFIC
+.endif
+
 .if defined(WITH_TRIPWIRE)
 SPAMASS_FILES+=	TRIPWIRE
 .endif
@@ -67,8 +89,6 @@ do-build:
 	@${DO_NADA}
 
 pre-install:
-	@${SED} -e 's|%%LOCALBASE%%|${PREFIX}|g' \
-		-e 's|%%DOCSDIR%%|${DOCSDIR}|g' <${.CURDIR}/pkg-message >${PKGMESSAGE}
 	@${SED} -e 's|TRIPWIRE EVILNUMBERS SARE_RANDOM|${SPAMASS_FILES}|' \
 		-e 's|PREFIX="/usr/local"|PREFIX="${PREFIX}"|' \
 		<${WRKSRC}/config >${WRKSRC}/config.sample
diff --git a/mail/spamass-rules_du_jour/distinfo b/mail/spamass-rules_du_jour/distinfo
index c8a17fbe998e..6f917b907eaf 100644
--- a/mail/spamass-rules_du_jour/distinfo
+++ b/mail/spamass-rules_du_jour/distinfo
@@ -1,2 +1,2 @@
-MD5 (rules_du_jour-1.18.tar.gz) = 4e7d8cfa60b867142eeb24aa1c91884b
-SIZE (rules_du_jour-1.18.tar.gz) = 14427
+MD5 (rules_du_jour-1.20.tar.bz2) = a55983b81b718da494962cb2553c3ce8
+SIZE (rules_du_jour-1.20.tar.bz2) = 13447
diff --git a/mail/spamass-rules_du_jour/pkg-message b/mail/spamass-rules_du_jour/files/pkg-message.in
index bff0cba1d6d3..1028f85fe9b3 100644
--- a/mail/spamass-rules_du_jour/pkg-message
+++ b/mail/spamass-rules_du_jour/files/pkg-message.in
@@ -1,8 +1,8 @@
 *************************************************************************
 
-Please edit the configuration in %%LOCALBASE%%/etc/mail/rulesdujour
-Run %%LOCALBASE%%/bin/rules_du_jour to fetch the latest rulesets
-The custom rulesets are updated in %%LOCALBASE%%/etc/mail/spamassassin
+Please edit the configuration in %%PREFIX%%/etc/mail/rulesdujour
+Run %%PREFIX%%/bin/rules_du_jour to fetch the latest rulesets
+The custom rulesets are updated in %%PREFIX%%/etc/mail/spamassassin
 
 After updating the rules please do the following:
 
@@ -12,7 +12,7 @@ After updating the rules please do the following:
    installation. You might want to modify scores.
 3. Test the new rulesets. Keep an eye on hits from the new rules to
    determine if the scoring is right for you.
-4. Run %%LOCALBASE%%/bin/rules_du_jour ONLY once per day.
+4. Run %%PREFIX%%/bin/rules_du_jour ONLY once per day.
 
 You may visit http://www.exit0.us/index.php/RulesDuJour before you use
 RulesDuJour.
diff --git a/mail/spamass-rules_du_jour/pkg-plist b/mail/spamass-rules_du_jour/pkg-plist
index db2156461902..cdc66b37a554 100644
--- a/mail/spamass-rules_du_jour/pkg-plist
+++ b/mail/spamass-rules_du_jour/pkg-plist
@@ -1,3 +1,4 @@
+@exec mkdir -p %D/etc/mail/spamassassin/RulesDuJour
 @unexec rmdir %D/etc/mail/spamassassin/RulesDuJour 2>/dev/null || true
 @unexec rmdir %D/etc/mail/spamassassin 2>/dev/null || true
 @unexec rmdir %D/etc/mail 2>/dev/null || true