4 files changed, 5 insertions, 68 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index c5c7c4daf850..42a903798069 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.8.1.6
-PORTREVISION=	1
+PORTVERSION=	1.8.5.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME}/ASSP%20Installation/${PORTNAME:U}%20${PORTVERSION}/
@@ -31,7 +30,7 @@ ASSP_LOG=	/var/log/assp
 
 PLIST_SUB=	ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}"
 
-SUB_FILES=	assp.8 assplog.8 assplog.pl periodic-assp pkg-install
+SUB_FILES=	510.assp assp.8 assplog.8 assplog.pl pkg-install
 SUB_LIST=	ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \
 		ASSP_HOME="${ASSP_HOME}" ASSP_LOG="${ASSP_LOG}" \
 		DATADIR="${DATADIR}" PERL="${PERL}"
@@ -149,7 +148,7 @@ do-install:
 	${INSTALL_MAN} ${WRKDIR}/assplog.8 ${MAN8PREFIX}/man/man8
 
 	${MKDIR} ${PREFIX}/etc/periodic/daily
-	${INSTALL_SCRIPT} ${WRKDIR}/periodic-assp ${PREFIX}/etc/periodic/daily/510.assp
+	${INSTALL_SCRIPT} ${WRKDIR}/510.assp ${PREFIX}/etc/periodic/daily/
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 3a7566ae2b88..d1c2de66a528 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ASSP_1.8.1.6-Install.zip) = ca0c5aef74964b2eec8d687dfe7b67a786600a0b9564d3b80d86de282ebb8a5a
-SIZE (ASSP_1.8.1.6-Install.zip) = 701752
+SHA256 (ASSP_1.8.5.0-Install.zip) = ada9a3d75e0ae42d800f80203ded5b7f1d43d4d96b46b0ee439261a81ea38582
+SIZE (ASSP_1.8.5.0-Install.zip) = 704072
diff --git a/mail/assp/files/periodic-assp.in b/mail/assp/files/periodic-assp.in
deleted file mode 100644
index c63f70080625..000000000000
--- a/mail/assp/files/periodic-assp.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/mail/assp/files/Attic/periodic-assp.in,v 1.2 2011-01-06 16:26:53 ohauer 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_USER%%:%%ASSP_GROUP%% %%ASSP_HOME%%
-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/files/periodic-assp.sh.in b/mail/assp/files/periodic-assp.sh.in
deleted file mode 100644
index af074b41acfe..000000000000
--- a/mail/assp/files/periodic-assp.sh.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# 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_USER%%:%%ASSP_GROUP%% %%ASSP_HOME%%
-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