- Update to 1.9.1.1

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

4 files changed, 8 insertions, 9 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index cee1ac6792b3..458f716543f3 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.9.1.0
+PORTVERSION=	1.9.1.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 37f4b2587850..b8841e5b7cd0 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ASSP_1.9.1.0-Install.zip) = 618cb970b0c9f8aa067d131fe5a9ac799f7392bf1db7a308b2859fb8567be25a
-SIZE (ASSP_1.9.1.0-Install.zip) = 759917
+SHA256 (ASSP_1.9.1.1-Install.zip) = 6fb485c87ca1db9d5d0a6ecdd5cb702771aa1a5e4b0f3ba57d407f77f641f5c3
+SIZE (ASSP_1.9.1.1-Install.zip) = 759829
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index f13c5c787768..67a27a6a0c33 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,11 +1,11 @@
---- assp.pl.orig        2011-05-29 13:27:11.672116773 -0500
-+++ assp.pl     2011-05-29 13:29:43.102794974 -0500
-@@ -2533,11 +2533,11 @@
+--- 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.'],
  ['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 close file handles. 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 close file handles. Similar to the command "perl assp.pl &amp;", but better.<br />
+-['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>'],
 -['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>
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 361fb823fdda..e71eaec9bf5c 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -33,7 +33,6 @@ sbin/assplog
 %%DATADIR%%/files/rcptreplrules.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