mail/assp: update to 1.9.9.13257

- Update to 1.9.9.13257

PR:		ports/181313
Submitted by:	Rusty Nejdl <rnejdl ringofsaturn.com> (maintainer)

4 files changed, 22 insertions, 23 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 01bc02bbf75e..3460aa2658f4 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	assp
-PORTVERSION=	1.9.9.13107
+PORTVERSION=	1.9.9.13257
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
@@ -53,12 +53,12 @@ IPV6_DESC=	IPv6 sockets support
 
 OPTIONS_DEFAULT=	EMVALID SPF SRS SEND FBACKW CLAMAV DNSBL MATCHRE SENDERB MIMEMOD SSL IPV6
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.99_13107_install/${PORTNAME:U}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASSP_1.9.9_13227_install/${PORTNAME:U}
 
 .include <bsd.port.pre.mk>
 
-RUN_DEPENDS+=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS
-RUN_DEPENDS+=	p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
+RUN_DEPENDS+=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
 		p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
 
 .if ${PORT_OPTIONS:MEMVALID}
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 2573e291b046..a81cb2504c1c 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ASSP_1.9.9.13107_Install.zip) = b0e166d7ba556789f0b2c8cca0b0ca1b710dba5c148e9ce88872be81bf507086
-SIZE (ASSP_1.9.9.13107_Install.zip) = 1331497
+SHA256 (ASSP_1.9.9.13257_Install.zip) = 657106e254baf1a9da182ed89c0d8a1b342110b0f01686cc7582e6b9e2f19a1c
+SIZE (ASSP_1.9.9.13257_Install.zip) = 1741147
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index 67a27a6a0c33..6e7513eb1963 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,12 +1,16 @@
---- assp.pl.orig	2011-06-30 10:29:19.000000000 -0500
-+++ assp.pl	2011-06-30 10:31:06.000000000 -0500
-@@ -2540,11 +2540,11 @@
-  'Set the characterset/codepage for the maillog output to your local needs. Default (and best) on non Windows systems is "UTF-8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 . <span class=\'negative\'>Restart is required!</span>'],
- ['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed <a href="http://search.cpan.org/search?query=Email::MIME::Modifier" rel="external">Email::MIME::Modifier</a> module in PERL.'],
+--- assp.pl.orig	2013-08-12 14:12:11.000000000 -0500
++++ assp.pl	2013-08-12 14:15:10.000000000 -0500
+@@ -2758,15 +2758,15 @@
+  'Set the characterset/codepage for the maillog output to your local needs. Best on non Windows systems is "utf8" if available or "System Default" - no conversion. On Windows systems set it to your local codepage or UTF-8 (chcp 65001). To display nonASCII characters in the subject line and maillog files names setup decodeMIME2UTF8 .'],
+ ['decodeMIME2UTF8','Decode MIME Words To UTF-8',1,\&checkbox,'1','(.*)',undef,'If selected, ASSP decodes MIME encoded words to UTF8. This enables support for national languages to be used in Bombs , Scripts , Spamdb , Logging. If not selected, only US-ASCII characters will be used for this functions. This requires an installed Email::MIME module in PERL.'],
  ['AsAService','Run ASSP as a Windows Service',0,\&checkbox,'','(.*)',undef,'In Windows NT/2000/XP/2003 ASSP can be installed as a service. This setting tells ASSP that this has been done -- it does not install the Windows service for you. Installing ASSP as a service requires several steps which are detailed in the <a href="http://apps.sourceforge.net/mediawiki/assp/index.php?title=Win32">Quick Start for Win32</a> doku page.<br /> Information about the Win32::Daemon module which which is necessary can be found here: <a href="http://www.roth.net/perl/Daemon/">The Official Win32::Daemon Home Page</a><br /><span class="negative"> requires ASSP restart</span>'],
--['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better.<br />
-+['AsADaemon','Run ASSP as a Daemon',0,\&checkbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and exit. Similar to the command "perl assp.pl &amp;", but better.<br />
-   <span class="negative"> Changing this requires a restart of ASSP.</span>'],
+-['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'0','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br />
++['AsADaemon','Run ASSP as a Daemon','0:No|1:Yes - externaly controlled|2:Yes - run AutoRestartCmd on restart and wait|3:Yes - run AutoRestartCmd on restart and exit',\&listbox,'1','(.*)',undef,'In Linux/BSD/Unix/OSX fork and close file handles. <br />
+  Similar to the command "perl assp.pl &amp;", but better.<br />
+  If "externaly controlled" is selected, ASSP simply ends and you have to restart assp from your daemon or watchdog script<br />
+  If "run AutoRestartCmd on restart and wait" is selected, assp starts the OS command defined in AutoRestartCmd - assp will <b>NOT !</b> automaticaly terminate - the started command has to terminate/kill and to (re)start assp - like "service assp restart"!<br />
+  If "run AutoRestartCmd on restart and exit" is selected, assp starts the OS command defined in AutoRestartCmd and terminates immediatly!<br />
+   <span class="negative"> requires ASSP restart</span>',undef,undef,'msg007440','msg007441'],
 -['runAsUser','Run as UID',20,\&textinput,'','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
 +['runAsUser','Run as UID',20,\&textinput,'assp','(\S*)',undef,'The *nix user name to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
    <span class="negative"> Changing this requires a restart of ASSP.</span>'],
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 6dd82af9df5d..8c8d12ea5aeb 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -40,6 +40,7 @@ sbin/assplog
 %%DATADIR%%/files/suspiciousvirus.txt
 %%DATADIR%%/files/tlds-alpha-by-domain.txt
 %%DATADIR%%/files/uriblwhite.txt
+%%DATADIR%%/files/uriblserviceprovider.txt
 %%DATADIR%%/files/validptr.txt
 %%DATADIR%%/files/whiteptr.txt
 %%DATADIR%%/files/whiteorg.txt
@@ -51,22 +52,18 @@ sbin/assplog
 %%DATADIR%%/images/editor.css
 %%DATADIR%%/images/favicon.ico
 %%DATADIR%%/images/info.png
+%%DATADIR%%/images/loading.gif
 %%DATADIR%%/images/logo.gif
-%%DATADIR%%/images/logo.jpg
+%%DATADIR%%/images/logo1.jpg
 %%DATADIR%%/images/minusIcon.png
 %%DATADIR%%/images/noIcon.png
 %%DATADIR%%/images/opensource-logo.gif
 %%DATADIR%%/images/plusIcon.png
-%%DATADIR%%/images/project-support.jpg
 %%DATADIR%%/images/shutdown.css
 %%DATADIR%%/images/sourceforge-logo.gif
-%%DATADIR%%/images/stylesheet.css
 %%DATADIR%%/images/valid-xhtml10.gif
 %%DATADIR%%/images/village.gif
 %%DATADIR%%/images/xml-pill.gif
-%%DATADIR%%/images/CVS/Entries
-%%DATADIR%%/images/CVS/Repository
-%%DATADIR%%/images/CVS/Root
 %%DATADIR%%/rebuildspamdb.pl
 %%DATADIR%%/reports/analyzereport.txt
 %%DATADIR%%/reports/blackremovereport.txt
@@ -75,12 +72,11 @@ sbin/assplog
 %%DATADIR%%/reports/blockreport_sub.txt
 %%DATADIR%%/reports/blockreport_text.txt
 %%DATADIR%%/reports/blockreportfile.txt
+%%DATADIR%%/reports/denied.txt
 %%DATADIR%%/reports/helpreport.txt
 %%DATADIR%%/reports/notspamreport.txt
 %%DATADIR%%/reports/npremovereport.txt
 %%DATADIR%%/reports/npreport.txt
-%%DATADIR%%/reports/persblackremovereport.txt
-%%DATADIR%%/reports/persblackreport.txt
 %%DATADIR%%/reports/redremovereport.txt
 %%DATADIR%%/reports/redreport.txt
 %%DATADIR%%/reports/slremovereport.txt
@@ -94,7 +90,6 @@ sbin/assplog
 %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/reports
-@dirrm %%DATADIR%%/images/CVS
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%/files
 @dirrm %%DATADIR%%