5 files changed, 54 insertions, 7 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 27388ab4e9b8..e7d5ac8ff9a7 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.7.5.7
-PORTREVISION=	1
+PORTVERSION=	1.8.1.5
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/ASSP%20Installation/${PORTNAME:U}%20${PORTVERSION}/
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
@@ -153,7 +152,6 @@ pre-install:
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/assp.pl ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/move2num.pl ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/rebuildspamdb.pl ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/stat.pl ${DATADIR}
 	${MKDIR} ${DATADIR}/files
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 726088b36ff8..a65c642ed73f 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ASSP_1.7.5.7-Install.zip) = ccd6973a5a038c6cef5401d4ac94c810
-SHA256 (ASSP_1.7.5.7-Install.zip) = 66d901904dcdbca26d857c90dc5355c03e0faaf5b121bda45af90094e932d9a7
-SIZE (ASSP_1.7.5.7-Install.zip) = 627537
+MD5 (ASSP_1.8.1.5-Install.zip) = 0509a3fb76dd3c001e31bc96245e29f2
+SHA256 (ASSP_1.8.1.5-Install.zip) = 0c669679123e0f92e9c5c911fbc3b2a0ae898064f10d622b051cd1a8e41d63db
+SIZE (ASSP_1.8.1.5-Install.zip) = 729697
diff --git a/mail/assp/files/patch-rebuildspamdb.pl b/mail/assp/files/patch-rebuildspamdb.pl
new file mode 100644
index 000000000000..10c280eb5293
--- /dev/null
+++ b/mail/assp/files/patch-rebuildspamdb.pl
@@ -0,0 +1,11 @@
+--- rebuildspamdb.pl.orig	2010-12-09 22:50:45.000000000 -0600
++++ rebuildspamdb.pl	2010-12-10 14:54:49.000000000 -0600
+@@ -51,7 +51,7 @@
+  # the last one is the one used if all else fails 
+  $base = cwd(); 
+  unless (-e "$base/assp.cfg") { 
+-   foreach ('.','/usr/local/assp','/home/assp','/etc/assp','/usr/assp','/applications/assp','/assp','.') {
++   foreach ('.','/usr/local/assp','/home/assp','/etc/assp','/usr/assp','/applications/assp','/assp','/var/db/assp') {
+     if (-e "$_/assp.cfg") {
+       $base=$_; 
+       last ; 
diff --git a/mail/assp/files/periodic-assp.in b/mail/assp/files/periodic-assp.in
new file mode 100644
index 000000000000..63cd5af5ecd9
--- /dev/null
+++ b/mail/assp/files/periodic-assp.in
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/mail/assp/files/Attic/periodic-assp.in,v 1.1 2010-12-12 01:09:48 pgollucci Exp $
+#
+# Run ASSP's nightly housekeeping script, rebuildspamdb.pl
+# Delete old ASSP log files
+
+cd %%ASSP_HOME%%
+
+if [ ! -f %%DATADIR%%/rebuildspamdb.pl ]
+then
+	echo "%%DATADIR%%/rebuildspamdb.pl does not exist"
+	rc_spamdb=2
+else
+	echo ""
+	echo "Running ASSP rebuildspamdb.pl:"
+	%%PERL%% %%DATADIR%%/rebuildspamdb.pl && rc_spamdb=0 || rc_spamdb=3
+	chown -R assp:assp %%DATADIR%%
+fi
+
+. /etc/rc.subr
+name=assp
+rcvar=`set_rcvar`
+load_rc_config $name
+: ${assp_logexpire="45"}
+
+echo ""
+echo "Removing old ASSP log files:"
+find -L . -name '*.maillog.txt' -mtime +$assp_logexpire -exec ls -l {} \; -exec rm {} \;
+
+exit $rc_spamdb
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index f3a13049245d..040f35f29646 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -8,6 +8,7 @@ etc/periodic/daily/510.assp
 %%DATADIR%%/files/blackre.txt 
 %%DATADIR%%/files/blockreportlist.txt
 %%DATADIR%%/files/bombheaderre.txt
+%%DATADIR%%/files/bombsenderre.txt
 %%DATADIR%%/files/bombre.txt
 %%DATADIR%%/files/charsets.txt
 %%DATADIR%%/files/deny.txt
@@ -19,21 +20,28 @@ etc/periodic/daily/510.assp
 %%DATADIR%%/files/ipnp.txt
 %%DATADIR%%/files/nodelay.txt
 %%DATADIR%%/files/nogrip.txt
+%%DATADIR%%/files/nookcaching.txt
 %%DATADIR%%/files/notls.txt
 %%DATADIR%%/files/nowhite.txt
+%%DATADIR%%/files/preheaderre.txt
 %%DATADIR%%/files/redre.txt
 %%DATADIR%%/files/strictspf.txt
 %%DATADIR%%/files/subjectre.txt
 %%DATADIR%%/files/suspiciousre.txt
 %%DATADIR%%/files/suspiciousvirus.txt
+%%DATADIR%%/files/tlds-alpha-by-domain.txt
 %%DATADIR%%/files/uriblwhite.txt
 %%DATADIR%%/files/validptr.txt
 %%DATADIR%%/files/whiteorg.txt
 %%DATADIR%%/images/assp.css
+%%DATADIR%%/images/blockreport.css
+%%DATADIR%%/images/blockreport.gif
+%%DATADIR%%/images/blockreporticon.gif
 %%DATADIR%%/images/dropShadow.gif
 %%DATADIR%%/images/editor.css
 %%DATADIR%%/images/favicon.ico
 %%DATADIR%%/images/info.png
+%%DATADIR%%/images/logo.gif
 %%DATADIR%%/images/logo.jpg
 %%DATADIR%%/images/minusIcon.png
 %%DATADIR%%/images/noIcon.png
@@ -45,7 +53,6 @@ etc/periodic/daily/510.assp
 %%DATADIR%%/images/valid-xhtml10.gif
 %%DATADIR%%/images/village.gif
 %%DATADIR%%/images/xml-pill.gif
-%%DATADIR%%/move2num.pl
 %%DATADIR%%/rebuildspamdb.pl
 %%DATADIR%%/reports/analyzereport.txt
 %%DATADIR%%/reports/blackremovereport.txt