ports/54641: Update mail/pflogstats to 20030708

[Don Croyle]

>Number:         54641
>Category:       ports
>Synopsis:       Update mail/pflogstats to 20030708
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 19 13:40:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Don Croyle
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD emerson.gelemna.org 4.8-STABLE FreeBSD 4.8-STABLE #16: Sat Jun 28 22:56:32 EST 2003 root at emerson.gelemna.org:/usr/obj/usr/src/sys/EMERSON i386

Tested with perl 5.005_3 and perl 5.8.0
	
>Description:
Update mail/pflogstats to use the latest released distfile.  Among
other changes, the author appears to have incorporated changes made in
the port to make it run with older versions of perl.  Use machete on
old patches.  Use new patch instead of shotgun search-and-replace.
	
>How-To-Repeat:
	
>Fix:
Apply this patch.  Note new file: files/patch-pflogstats-statistics-spamassassin.pm
	

diff -ruN pflogstats.orig/Makefile pflogstats/Makefile
--- pflogstats.orig/Makefile	Sat Jun 21 04:01:54 2003
+++ pflogstats/Makefile	Sat Jul 19 14:58:20 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pflogstats
-PORTVERSION=	20030404
+PORTVERSION=	20030708
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.aerasec.de/pub/linux/postfix/pflogsumm/pflogstats/
 
@@ -24,13 +24,7 @@
 
 post-patch:
 # fix location of PERL
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl \-W|${PERL}|' ${WRKSRC}/*.pl ${WRKSRC}/*.pm
 	@${REINPLACE_CMD} -e 's|/usr/local/lib/pflogstats|${SITE_PERL}/Pflogstats|' ${WRKSRC}/*.pl
-# patch for perl < 5.6.0
-	${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1);$$1/;' \
-		-e '$$_="" if /require 5/;' \
-		-e '$$_="" if /use warnings/;' \
-		${WRKSRC}/*.pm
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl  ${PREFIX}/bin/${PORTNAME}
diff -ruN pflogstats.orig/distinfo pflogstats/distinfo
--- pflogstats.orig/distinfo	Sun May 11 10:01:13 2003
+++ pflogstats/distinfo	Sat Jul 19 14:06:59 2003
@@ -1 +1 @@
-MD5 (pflogstats-20030404.tar.gz) = ee0efe0a442245622ea68cb3bac6542f
+MD5 (pflogstats-20030708.tar.gz) = 7fe94255343acd26bfae3addefd54a2b
diff -ruN pflogstats.orig/files/patch-pflogstats-statistics-spamassassin.pm pflogstats/files/patch-pflogstats-statistics-spamassassin.pm
--- pflogstats.orig/files/patch-pflogstats-statistics-spamassassin.pm	Wed Dec 31 19:00:00 1969
+++ pflogstats/files/patch-pflogstats-statistics-spamassassin.pm	Sat Jul 19 14:48:43 2003
@@ -0,0 +1,27 @@
+--- pflogstats-statistics-spamassassin.pm.bak	Tue Jul  8 09:14:37 2003
++++ pflogstats-statistics-spamassassin.pm	Sat Jul 19 14:40:21 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+ 
+ ###
+ # Project:     pflogstats
+@@ -22,7 +22,6 @@
+ ###
+ 
+ use strict;
+-use warnings;
+ 
+ 
+ ## Local constants
+@@ -54,8 +53,8 @@
+ $main::types{'spamassassin'} = 0;
+ 
+ ## Global variables
+-our %messageUserStats;
+-our $de;
++use vars qw(%messageUserStats);%messageUserStats;
++use vars qw($de);$de;
+ 
+ 
+ 
diff -ruN pflogstats.orig/files/patch-pflogstats.pl pflogstats/files/patch-pflogstats.pl
--- pflogstats.orig/files/patch-pflogstats.pl	Sat Jun 21 04:01:54 2003
+++ pflogstats/files/patch-pflogstats.pl	Sat Jul 19 14:53:00 2003
@@ -1,72 +1,8 @@
---- pflogstats.pl.orig	Fri Apr  4 15:29:35 2003
-+++ pflogstats.pl	Mon May 12 10:37:46 2003
+--- pflogstats.pl.bak	Sat Jul 19 14:40:21 2003
++++ pflogstats.pl	Sat Jul 19 14:50:58 2003
 @@ -1,4 +1,4 @@
--#!/usr/bin/perl -W
+-#!/usr/bin/perl -w
 +#!/usr/bin/perl
  
  ###
  # Project:     pflogstats
-@@ -30,10 +30,7 @@
- # ***** Sorry for some coding confusion, this is a developer version *****
- 
- # Minium required Perl version
--require 5.6.0;
--
--#use warnings; # to be done later
--#use strict; # to be done later
-+require 5.00503;
- 
- # Global used Perl modules
- use Time::Local;
-@@ -43,8 +40,9 @@
- 
- 
- ## Name and version
--my $release = "20030404.AERAsec";
--our $progName = "pflogstats.pl";
-+use vars qw{$release $progName};
-+$release = "20030404.AERAsec";
-+$progName = "pflogstats.pl";
- 
- 
- ## Defines before module loader
-@@ -62,9 +60,7 @@
- ## Define global variables
- 
- # option handling
--our %options;
--our %opts;
--our %types;
-+use vars qw{%options %opts %types}; 
- 
- # Default value
- $types{'default'} = 0;
-@@ -73,11 +69,12 @@
- $types{'test_verp_mung'} = 0;
- 
- # module hooks
--our %hooks;
-+use vars qw{%hooks};
- 
- # Format options
--our @opt_format; # from option parsing
--our %format; # used format
-+use vars qw{@opt_format %format};
-+# @opt_format; # from option parsing
-+# %format; # used format
- 
- my @opt_types;
- my $isoDateTime;
-@@ -143,10 +140,10 @@
- #exit 0;
- 
- # Number formats
--our %numberformat;
-+use vars qw{%numberformat};
- 
- # Time range of logdata
--our ($timemin, $timemax);
-+use vars qw{$timemin, $timemax};
- my ($time);
- 
- 
diff -ruN pflogstats.orig/files/patch-sqwmstats.pl pflogstats/files/patch-sqwmstats.pl
--- pflogstats.orig/files/patch-sqwmstats.pl	Sat Jun 21 04:01:54 2003
+++ pflogstats/files/patch-sqwmstats.pl	Sat Jul 19 14:53:41 2003
@@ -1,43 +1,8 @@
---- sqwmstats.pl.orig	Fri Apr  4 15:29:35 2003
-+++ sqwmstats.pl	Mon May 12 10:38:01 2003
+--- sqwmstats.pl.bak	Sat Jul 19 14:40:21 2003
++++ sqwmstats.pl	Sat Jul 19 14:52:04 2003
 @@ -1,4 +1,4 @@
--#!/usr/bin/perl -W
+-#!/usr/bin/perl -w
 +#!/usr/bin/perl
  
  ###
  # Project:     pflogstats
-@@ -32,28 +32,27 @@
- ###
- 
- 
--use warnings;
- use strict;
- 
- ## Name and version
--my $release = "0.03";
--our $progName = "sqwmstats.pl";
-+use vars qw{$release $progName};
-+$release = "0.03";
-+$progName = "sqwmstats.pl";
- 
- 
- ## Define global variables
- 
- # option handling
--our %options;
--our %opts;
-+use vars qw{%options %opts};
- 
- $options{'help|h|?'}  = \$opts{'help'};
- $options{"version"}  = \$opts{'version'};
- 
- # module hooks
--our %hooks;
-+use vars qw{%hooks};
- 
- # Number formats
--our %numberformat;
-+use vars qw{%numberformat};
- 
- ## Module loader
- # General
diff -ruN pflogstats.orig/pkg-plist pflogstats/pkg-plist
--- pflogstats.orig/pkg-plist	Sat Jun 21 04:01:54 2003
+++ pflogstats/pkg-plist	Sat Jul 19 14:23:27 2003
@@ -8,6 +8,7 @@
 %%SITE_PERL%%/Pflogstats/pflogstats-statistics-accpopimap.pm
 %%SITE_PERL%%/Pflogstats/pflogstats-statistics-antivirus.pm
 %%SITE_PERL%%/Pflogstats/pflogstats-statistics-reject.pm
+%%SITE_PERL%%/Pflogstats/pflogstats-statistics-spamassassin.pm
 %%SITE_PERL%%/Pflogstats/pflogstats-statistics-uce.pm
 %%SITE_PERL%%/Pflogstats/pflogstats-template.pm
 %%PORTDOCS%%%%DOCSDIR%%/BUGS

>Release-Note:
>Audit-Trail:
>Unformatted: