Update to 1.9.1.0

Remove no longer necessary workaround for user/group creation

PR:		ports/157414
Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)
Approved by:	bapt (mentor)

4 files changed, 12 insertions, 15 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 046896ce0c03..cee1ac6792b3 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.8.5.6
+PORTVERSION=	1.9.1.0
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
@@ -156,9 +156,5 @@ do-install:
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-# XXX Workaround: for PR ports/152498. Remove if PR ports/152498 is fixed!
-	@${EGREP} -e '^@exec.*${PW}' -e '^@exec ${INSTALL} -d -g' ${TMPPLIST} > ${WRKDIR}/.PLIST.ugid
-	@${EGREP} -v -e '^@exec.*${PW}' -e '^@exec ${INSTALL} -d -g' ${TMPPLIST} >> ${WRKDIR}/.PLIST.ugid
-	@${MV} ${WRKDIR}/.PLIST.ugid ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index 9a48cb653ee3..37f4b2587850 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ASSP_1.8.5.6-Install.zip) = 995bcaffe65f3e52cd3f9edd306ae53a3304bff80c9a4310a4ebd18debd2543e
-SIZE (ASSP_1.8.5.6-Install.zip) = 735818
+SHA256 (ASSP_1.9.1.0-Install.zip) = 618cb970b0c9f8aa067d131fe5a9ac799f7392bf1db7a308b2859fb8567be25a
+SIZE (ASSP_1.9.1.0-Install.zip) = 759917
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index 381ba4279c46..f13c5c787768 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,17 +1,17 @@
---- assp.pl.orig	2010-08-08 14:29:19.000000000 -0500
-+++ assp.pl	2010-08-08 14:30:13.000000000 -0500
-@@ -2029,11 +2029,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 @@
   '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 />
-   <span class="negative"> requires ASSP restart</span>'],
++['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 />
+   <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>
-   <span class="negative"> requires ASSP restart</span>'],
+   <span class="negative"> Changing this requires a restart of ASSP.</span>'],
 -['runAsGroup','Run as GID',20,\&textinput,'','(\S*)',undef,'The *nix group to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
 +['runAsGroup','Run as GID',20,\&textinput,'assp','(\S*)',undef,'The *nix group to assume after startup (*nix only).<p><small><i>Examples:</i> assp, nobody</small></p>
-   <span class="negative"> requires ASSP restart</span>'],
+   <span class="negative"> Changing this requires a restart of ASSP.</span>'],
  ['ChangeRoot','Change Root',40,\&textinput,'','(.*)',undef,'The new root directory to which ASSP should chroot (*nix only). If blank, no chroot jail will be used. Note: if you use this feature, be sure to copy or link the etc/protocols file in your chroot jail.<br />
-   <span class="negative"> requires ASSP restart</span>'],
+   <span class="negative"> Changing this requires a restart of ASSP.</span>'],
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 66880e40eaa8..361fb823fdda 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -11,6 +11,7 @@ sbin/assplog
 %%DATADIR%%/files/bombheaderre.txt
 %%DATADIR%%/files/bombre.txt
 %%DATADIR%%/files/bombsenderre.txt
+%%DATADIR%%/files/bombsubjectre.txt
 %%DATADIR%%/files/charsets.txt
 %%DATADIR%%/files/checkdomains.txt
 %%DATADIR%%/files/deny.txt