Fix default assp.cfg file creation and log file path.

Use assp_args rather than assp_flags in assp.in, according to the man page (before, assp_flags used to override user settings in assp_args).

Remove SIMPLE option ("Use procedural Web Page interfaces", defaults to ON).

Obtained from:	maintainer

4 files changed, 27 insertions, 14 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 978d5f193213..f556849f61f2 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	assp
 PORTVERSION=	1.5.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME:U}_${PORTVERSION}-Install
@@ -49,7 +49,6 @@ OPTIONS=	EMVALID	"RFC822 recipient address validator" on \
 		DNSBL	"DNS block list checking" on \
 		MYSQL	"Use MySQL db to store white/red/delaylists" off \
 		MATCHRE	"Match IP ranges and CIDR blocks in lists" on \
-		SIMPLE	"Use procedural Web Page interfaces" on \
 		SENDERB	"Country Code checks" on \
 		MIMEMOD	"Multiple Attachement detection" on \
 		SSL	"SSL secure sockets support" on \
@@ -61,6 +60,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${DISTNAME}/${PORTNAME:U}
 
 SUB_LIST+=	RC_SCRIPT=${RC_SCRIPT}${RC_SUBR_SUFFIX}
 
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
+RUN_DEPENDS+=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
+
 .if !defined(WITHOUT_EMVALID)
 RUN_DEPENDS+=	${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
 .endif
@@ -70,7 +72,6 @@ RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .if !defined(WITHOUT_SPF)
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
 .endif
 
@@ -109,10 +110,6 @@ RUN_DEPENDS+=	${SITE_PERL}/Tie/RDBM.pm:${PORTSDIR}/databases/p5-Tie-DBI
 RUN_DEPENDS+=	${SITE_PERL}/Net/IP/Match/Regexp.pm:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-Regexp
 .endif
 
-.if !defined(WITHOUT_SIMPLE)
-RUN_DEPENDS+=	${SITE_PERL}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww
-.endif
-
 .if !defined(WITHOUT_SENDERB)
 RUN_DEPENDS+=	${SITE_PERL}/Net/SenderBase.pm:${PORTSDIR}/mail/p5-Net-SenderBase
 .endif
@@ -181,7 +178,7 @@ do-install:
 	${LN} -s ${DATADIR}/files ${ASSP_HOME}
 	${LN} -s ${DATADIR}/images ${ASSP_HOME}
 	${LN} -s ${DATADIR}/reports ${ASSP_HOME}
-	${LN} -s ${ASSP_LOG} ${ASSP_HOME}/log
+	${LN} -s ${ASSP_LOG} ${ASSP_HOME}/logs
 
 	${MKDIR} ${PREFIX}/etc/periodic/daily
 	${INSTALL_SCRIPT} ${WRKDIR}/periodic-assp.sh ${PREFIX}/etc/periodic/daily/510.assp
diff --git a/mail/assp/files/assp.in b/mail/assp/files/assp.in
index bc5f119715d1..331a4657d3b8 100644
--- a/mail/assp/files/assp.in
+++ b/mail/assp/files/assp.in
@@ -18,6 +18,6 @@ pidfile=%%ASSP_HOME%%/pid
 
 load_rc_config $name
 : ${assp_enable="NO"}
-: ${assp_flags="%%ASSP_HOME%%"}
+: ${assp_args="%%ASSP_HOME%%"}
 
 run_rc_command "$1"
diff --git a/mail/assp/files/patch-assp.pl b/mail/assp/files/patch-assp.pl
index fbe50bfd6b18..9a986f92dfe3 100644
--- a/mail/assp/files/patch-assp.pl
+++ b/mail/assp/files/patch-assp.pl
@@ -1,17 +1,33 @@
---- assp.pl.orig	2009-03-17 00:48:11.000000000 -0400
-+++ assp.pl	2009-03-17 11:11:45.000000000 -0400
+--- assp.pl.orig	2009-05-22 03:05:20.000000000 -0400
++++ assp.pl	2009-08-06 11:44:01.000000000 -0400
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl --
 +#!/usr/local/bin/perl --
  #use lib 'path/to/my/perlmods';
  # anti spam smtp proxy
  # (c) John Hanna, John Calvi, Robert Orso, AJ 2004 under the terms of the GPL
-@@ -1537,7 +1537,7 @@
+@@ -1016,8 +1016,7 @@
+ ['ScanNP','Scan NoProcessing Messages',0,\&checkbox,'','(.*)',undef,''],
+ ['ScanLocal','Scan Local Senders',0,\&checkbox,'','(.*)',undef,''],
+ ['ScanCC','Scan Copied Spam Mails',0,\&checkbox,'','(.*)',undef,''],
+-['AvError','Reply Code to Refuse Infected Messages',80,\&textinput,'554
+-5.7.1 Mail appears infected with INFECTION.','([25]\d\d .*)',undef,'Reply
++['AvError','Reply Code to Refuse Infected Messages',80,\&textinput,'554 5.7.1 Mail appears infected with INFECTION.','([25]\d\d .*)',undef,'Reply
+ code to refuse infected messages. The string $infection is replaced with
+ the name of the detected virus.<br />  For example: 554 5.7.1 Mail appears
+ infected with INFECTION -- disinfect and resend.'],
+@@ -1654,11 +1653,11 @@
  
  [0,0,0,'heading','Server Setup'],
  ['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 /> <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>'],
- ['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,'','(\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>'],
+-['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>'],
+ ['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>'],
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index 42796c367ca2..1d2ad07d15e7 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -56,7 +56,7 @@ sbin/assplog
 %%PORTDOCS%%%%DOCSDIR%%/Legacy - ASSP Documentation.htm
 %%PORTDOCS%%%%DOCSDIR%%/Regular Expression Tutorial.htm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rm %%ASSP_HOME%%/log
+@unexec rm %%ASSP_HOME%%/logs
 @unexec rm %%ASSP_HOME%%/reports
 @unexec rm %%ASSP_HOME%%/images
 @unexec rm %%ASSP_HOME%%/files