ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to 3.2.0_1

[Angelo Turetta]

The following reply was made to PR ports/113394; it has been noted by GNATS.

From: Angelo Turetta <aturetta at bestunion.it>
To: bug-followup at FreeBSD.org, scheidell at secnap.net
Cc:  
Subject: Re: ports/113394: [maintainer update] mail/p5-Mail-SpamAssassin to
 3.2.0_1
Date: Wed, 13 Jun 2007 17:01:52 +0200

 This is a multi-part message in MIME format.
 --------------070604060006080805070005
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Here is my try at the upgrade.
 Only minimally tested (it installs/packages/deinstalls on my server)
 
 Hope this helps,
 Angelo.
 
 --------------070604060006080805070005
 Content-Type: text/plain;
  name="sa-321-port.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="sa-321-port.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
 retrieving revision 1.106
 diff -u -r1.106 Makefile
 --- Makefile	2 Jun 2007 07:09:46 -0000	1.106
 +++ Makefile	13 Jun 2007 14:20:24 -0000
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	Mail-SpamAssassin
 -PORTVERSION=	3.2.0
 +PORTVERSION=	3.2.1
  CATEGORIES=	mail perl5
  MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
  MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
 @@ -217,7 +217,7 @@
  	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
  .endif
  .if defined(WITH_SACOMPILE)
 -	${REINPLACE_CMD} -e '/Rule2XSBody/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
 +	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
  .endif
  
  pre-install:
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/distinfo,v
 retrieving revision 1.38
 diff -u -r1.38 distinfo
 --- distinfo	2 Jun 2007 07:09:46 -0000	1.38
 +++ distinfo	13 Jun 2007 14:21:17 -0000
 @@ -1,3 +1,3 @@
 -MD5 (Mail-SpamAssassin-3.2.0.tar.gz) = aed988bb6cf463afc868a64d4cd771a3
 -SHA256 (Mail-SpamAssassin-3.2.0.tar.gz) = 4690d2639075dfd376acb3540697861e167a917fd6332bf62b2e754d26ee99be
 -SIZE (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995
 +MD5 (Mail-SpamAssassin-3.2.1.tar.gz) = a7d51294c565999da01f212e5ad2a031
 +SHA256 (Mail-SpamAssassin-3.2.1.tar.gz) = e0925d9c490bb8f1e56c3b850b50b12b124536dfe581b23d3c25715b1ce9ebf7
 +SIZE (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561
 Index: pkg-message
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/pkg-message,v
 retrieving revision 1.5
 diff -u -r1.5 pkg-message
 --- pkg-message	2 Jun 2007 07:09:46 -0000	1.5
 +++ pkg-message	13 Jun 2007 14:18:28 -0000
 @@ -25,3 +25,10 @@
  that sa-update now places state files in /var/db/spamassassin
  and not the default /var/lib/spamassassin.  This is to be consistant
  with Freebsd file directory conventions
 +
 +If you are running with spamd, you must add the following to rc.conf:
 +spamd_enable="YES"
 +
 +Security Note:  If you did NOT deselected AS_ROOT, spamd will be running
 +as root. To change this, also add this to rc.conf:
 +spamd_flags="-u spamd -H /var/spool/spamd"
 Index: files/patch-sa-compile.raw
 ===================================================================
 RCS file: /home/ncvs/ports/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw,v
 retrieving revision 1.1
 diff -u -r1.1 patch-sa-compile.raw
 --- files/patch-sa-compile.raw	2 Jun 2007 07:09:46 -0000	1.1
 +++ files/patch-sa-compile.raw	13 Jun 2007 14:52:07 -0000
 @@ -1,20 +1,23 @@
 ---- sa-compile.raw.orig	Tue May  1 09:54:33 2007
 -+++ sa-compile.raw	Thu May  3 13:35:23 2007
 -@@ -636,7 +636,7 @@
 +--- sa-compile.raw.orig	Fri Jun  8 14:56:25 2007
 ++++ sa-compile.raw	Wed Jun 13 16:49:20 2007
 +@@ -643,9 +643,9 @@
     -p prefs, --prefspath=file, --prefs-file=file
                                   Set user preferences file
     --siteconfigpath=path         Path for site configs
  -                                (default: /etc/mail/spamassassin)
  +                                (default: @@LOCAL_RULES_DIR@@)
 +   --updatedir=path              Directory to place updates
 +-                      (default: /var/lib/spamassassin/compiled/<version>)
 ++                      (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
     --cf='config line'            Additional line of configuration
     -D, --debug [area=n,...]	Print debugging messages
     -V, --version			Print version
 -@@ -683,12 +683,12 @@
 +@@ -692,12 +692,12 @@
   =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
   
   Use the specified path for locating the distributed configuration files.
  -Ignore the default directories (usually C</usr/share/spamassassin> or similar).
 -+Ignore the default directories (usually <@@DEF_RULES_DIR@@> or similar).
 ++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
   
   =item B<--siteconfigpath>=I<path>
   
 @@ -22,5 +25,5 @@
  -the default directories (usually C</etc/mail/spamassassin> or similar).
  +the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
   
 - =item B<--cf='config line'>
 + =item B<--updatedir>
   
 
 --------------070604060006080805070005--