ports/52094: mail/pflogstats thinks it needs perl 5.6 but does not
Mathieu Arnold
m at absolight.net
Mon May 12 09:00:32 UTC 2003
>Number: 52094
>Category: ports
>Synopsis: mail/pflogstats thinks it needs perl 5.6 but does not
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon May 12 02:00:29 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Mathieu Arnold
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.reaumur.absolight.net 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 10 13:45:07 CEST 2003 root at aragorn.reaumur.absolight.net:/usr/obj/usr/src/sys/ARAGORN i386
>Description:
Add a few patches so that perl 5.6.1 is not needed any more.
>How-To-Repeat:
>Fix:
Don't forget to create the files directory so that the patches goes to the right place :)
--- pflogstats-20030404.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/pflogstats/Makefile,v
retrieving revision 1.2
diff -u -b -w -r1.2 Makefile
--- Makefile 2003/05/11 16:48:18 1.2
+++ Makefile 2003/05/12 08:54:06
@@ -22,26 +22,15 @@
USE_PERL5= yes
USE_REINPLACE= yes
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500601
-IGNORE= Port requires perl 5.6.1 or later. Install lang/perl5 then try again
-.endif
-
-post-patch:
-# fix location of PERL
- @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
- @${REINPLACE_CMD} -e 's|/usr/local/lib/pflogstats|${SITE_PERL}/Pflogstats|' ${WRKSRC}/*.pl
-
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
@${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pflogstats
- ${INSTALL_DATA} ${WRKSRC}/pflogstats-*.pm ${SITE_PERL}/Pflogstats
+ ${INSTALL_DATA} ${WRKSRC}/pflogstats-*.pm ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Pflogstats
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/pflogstats
+ @${MKDIR} ${DOCSDIR}
.for i in README INSTALL ChangeLog BUGS TODO LICENSE CREDITS
- ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/pflogstats
+ ${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/pflogstats/pkg-plist,v
retrieving revision 1.1
diff -u -b -w -r1.1 pkg-plist
--- pkg-plist 2003/05/11 15:01:13 1.1
+++ pkg-plist 2003/05/12 08:54:06
@@ -10,12 +10,12 @@
%%SITE_PERL%%/Pflogstats/pflogstats-statistics-reject.pm
%%SITE_PERL%%/Pflogstats/pflogstats-statistics-uce.pm
%%SITE_PERL%%/Pflogstats/pflogstats-template.pm
-%%PORTDOCS%%share/doc/pflogstats/BUGS
-%%PORTDOCS%%share/doc/pflogstats/CREDITS
-%%PORTDOCS%%share/doc/pflogstats/ChangeLog
-%%PORTDOCS%%share/doc/pflogstats/INSTALL
-%%PORTDOCS%%share/doc/pflogstats/LICENSE
-%%PORTDOCS%%share/doc/pflogstats/README
-%%PORTDOCS%%share/doc/pflogstats/TODO
-%%PORTDOCS%%@dirrm share/doc/pflogstats
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%SITE_PERL%%/Pflogstats
Index: files/patch-pflogstats-common-profiling.pm
===================================================================
RCS file: patch-pflogstats-common-profiling.pm
diff -N patch-pflogstats-common-profiling.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-common-profiling.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,28 @@
+--- pflogstats-common-profiling.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-common-profiling.pm Mon May 12 10:38:04 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -21,7 +21,6 @@
+ ##
+
+ use strict;
+-use warnings;
+ use Proc::ProcessTable; # required by "memusage"
+
+
+@@ -40,10 +39,7 @@
+ ## Local prototyping
+
+ ## Global variables
+-our $timemin;
+-our $timemax;
+-our @opt_net_excluded;
+-our @opt_format;
++use vars qw{ $timemin $timemax @opt_net_excluded @opt_format};
+
+
+ ## Register options
Index: files/patch-pflogstats-common-support.pm
===================================================================
RCS file: patch-pflogstats-common-support.pm
diff -N patch-pflogstats-common-support.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-common-support.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,27 @@
+--- pflogstats-common-support.pm.orig Fri Apr 4 15:29:34 2003
++++ pflogstats-common-support.pm Mon May 12 10:38:06 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -33,7 +33,6 @@
+ ##
+
+ use strict;
+-use warnings;
+
+ use Sys::Hostname;
+ use Number::Format;
+@@ -59,9 +58,7 @@
+ ## Local prototyping
+
+ ## Global variables
+-our $timemin;
+-our $timemax;
+-our @opt_format;
++use vars qw{ $timemin $timemax @opt_format};
+
+ # Number format
+ my $numberformat_de_DE = new Number::Format(-thousands_sep => '.', -decimal_point => ',', -int_curr_symbol => 'EUR');
Index: files/patch-pflogstats-extensions-addressmapping.pm
===================================================================
RCS file: patch-pflogstats-extensions-addressmapping.pm
diff -N patch-pflogstats-extensions-addressmapping.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-extensions-addressmapping.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,8 @@
+--- pflogstats-extensions-addressmapping.pm.orig Mon May 12 10:37:51 2003
++++ pflogstats-extensions-addressmapping.pm Mon May 12 10:38:09 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
Index: files/patch-pflogstats-extensions-networking.pm
===================================================================
RCS file: patch-pflogstats-extensions-networking.pm
diff -N patch-pflogstats-extensions-networking.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-extensions-networking.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,16 @@
+--- pflogstats-extensions-networking.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-extensions-networking.pm Mon May 12 10:38:12 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -20,7 +20,6 @@
+
+
+ use strict;
+-use warnings;
+ use Net::IP; # required for IP network calculation
+
+
Index: files/patch-pflogstats-extensions-verpmung.pm
===================================================================
RCS file: patch-pflogstats-extensions-verpmung.pm
diff -N patch-pflogstats-extensions-verpmung.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-extensions-verpmung.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,16 @@
+--- pflogstats-extensions-verpmung.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-extensions-verpmung.pm Mon May 12 10:38:14 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -20,7 +20,6 @@
+
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
Index: files/patch-pflogstats-statistics-accounting.pm
===================================================================
RCS file: patch-pflogstats-statistics-accounting.pm
diff -N patch-pflogstats-statistics-accounting.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-statistics-accounting.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,25 @@
+--- pflogstats-statistics-accounting.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-statistics-accounting.pm Mon May 12 10:38:16 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -53,7 +53,6 @@
+
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
+@@ -93,7 +92,7 @@
+
+
+ ## Global variables
+-our $format_de;
++use vars qw{$format_de};
+
+
+ ## Local variables
Index: files/patch-pflogstats-statistics-accpopimap.pm
===================================================================
RCS file: patch-pflogstats-statistics-accpopimap.pm
diff -N patch-pflogstats-statistics-accpopimap.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-statistics-accpopimap.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,16 @@
+--- pflogstats-statistics-accpopimap.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-statistics-accpopimap.pm Mon May 12 10:38:19 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -25,7 +25,6 @@
+ ##
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
Index: files/patch-pflogstats-statistics-antivirus.pm
===================================================================
RCS file: patch-pflogstats-statistics-antivirus.pm
diff -N patch-pflogstats-statistics-antivirus.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-statistics-antivirus.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,26 @@
+--- pflogstats-statistics-antivirus.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-statistics-antivirus.pm Mon May 12 10:38:21 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -35,7 +35,6 @@
+ ###
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
+@@ -64,8 +63,7 @@
+ $main::types{'av'} = 0;
+
+ ## Global variables
+-our %messageUserStats;
+-our $de;
++use vars qw{%messageUserStats $de};
+
+
+
Index: files/patch-pflogstats-statistics-reject.pm
===================================================================
RCS file: patch-pflogstats-statistics-reject.pm
diff -N patch-pflogstats-statistics-reject.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-statistics-reject.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,16 @@
+--- pflogstats-statistics-reject.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-statistics-reject.pm Mon May 12 10:38:23 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -32,7 +32,6 @@
+ ##
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
Index: files/patch-pflogstats-statistics-uce.pm
===================================================================
RCS file: patch-pflogstats-statistics-uce.pm
diff -N patch-pflogstats-statistics-uce.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-statistics-uce.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,16 @@
+--- pflogstats-statistics-uce.pm.orig Fri Apr 4 15:29:35 2003
++++ pflogstats-statistics-uce.pm Mon May 12 10:38:25 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
+@@ -28,7 +28,6 @@
+ ##
+
+ use strict;
+-use warnings;
+
+
+ ## Local constants
Index: files/patch-pflogstats-template.pm
===================================================================
RCS file: patch-pflogstats-template.pm
diff -N patch-pflogstats-template.pm
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats-template.pm Mon May 12 03:54:06 2003
@@ -0,0 +1,8 @@
+--- pflogstats-template.pm.orig Mon May 12 10:37:51 2003
++++ pflogstats-template.pm Mon May 12 10:38:27 2003
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -W
++#!/usr/bin/perl
+
+ ###
+ # Project: pflogstats
Index: files/patch-pflogstats.pl
===================================================================
RCS file: patch-pflogstats.pl
diff -N patch-pflogstats.pl
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-pflogstats.pl Mon May 12 03:54:06 2003
@@ -0,0 +1,83 @@
+--- pflogstats.pl.orig Fri Apr 4 15:29:35 2003
++++ pflogstats.pl Mon May 12 10:37:46 2003
+@@ -1,4 +1,4 @@
+-#!/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
+@@ -53,8 +51,8 @@
+ # 1st: look into current directory
+ push @INC, ".";
+
+-# 2nd: look into /usr/local/lib/pflogstats
+-push @INC, "/usr/local/lib/pflogstats";
++# 2nd: look into /usr/local/lib/perl5/site_perl/5.8.0/Pflogstats
++push @INC, "/usr/local/lib/perl5/site_perl/5.8.0/Pflogstats";
+
+ # 3rd: look into /usr/lib/pflogstats
+ push @INC, "/usr/lib/pflogstats";
+@@ -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);
+
+
Index: files/patch-sqwmstats.pl
===================================================================
RCS file: patch-sqwmstats.pl
diff -N patch-sqwmstats.pl
--- /dev/null Mon May 12 03:21:54 2003
+++ patch-sqwmstats.pl Mon May 12 03:54:06 2003
@@ -0,0 +1,43 @@
+--- sqwmstats.pl.orig Fri Apr 4 15:29:35 2003
++++ sqwmstats.pl Mon May 12 10:38:01 2003
+@@ -1,4 +1,4 @@
+-#!/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
--- pflogstats-20030404.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list