Skip to content

Commit

Permalink
fix innreport to be perl 5.12 compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
spzeidler committed Sep 25, 2011
1 parent a5c27f3 commit d229a52
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 3 deletions.
4 changes: 2 additions & 2 deletions news/inn/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.107 2011/09/25 13:58:31 spz Exp $
# $NetBSD: Makefile,v 1.108 2011/09/25 14:00:09 spz Exp $

DISTNAME= inn-2.5.2
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/ \
ftp://ftp.fu-berlin.de/unix/news/inn/
Expand Down
4 changes: 3 additions & 1 deletion news/inn/distinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.27 2011/09/25 13:58:32 spz Exp $
$NetBSD: distinfo,v 1.28 2011/09/25 14:00:09 spz Exp $

SHA1 (inn-2.5.2.tar.gz) = e7a9512acb5fa09ecdf116a4bde39c9f5efe65db
RMD160 (inn-2.5.2.tar.gz) = 2fce7fade8bd8df3fe7f813b6feb37ff2b2bf07c
Expand All @@ -12,3 +12,5 @@ SHA1 (patch-ah) = a71cdb9940012098cb5737e5fa48435309cbda83
SHA1 (patch-ai) = cf0af9de01dc7e06c5f9f7f1dd91ac2201e8c212
SHA1 (patch-ak) = 1b92f93a78a08b570c2f9b5360982644d6d2d065
SHA1 (patch-al) = a3d9fad5c045dc7a240e0f0c0a88a5321e6135d5
SHA1 (patch-am) = 93a056db2beb3a939ee0974e5255ce0e9cf1fb9b
SHA1 (patch-an) = dd1a4462c1a7ea7e52d009c6df1fcb93a2162280
26 changes: 26 additions & 0 deletions news/inn/patches/patch-am
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
$NetBSD: patch-am,v 1.1 2011/09/25 14:00:09 spz Exp $

remove deprecated perl features that don't do anything useful anyway
(replicate change in INN trunk)

--- ./scripts/innreport.in.orig 2010-03-24 20:10:36.000000000 +0000
+++ ./scripts/innreport.in
@@ -672,10 +672,6 @@ if (!$NOT_DAILY && defined $output{'defa
# - Specified in section "inn_flow" of innreport.conf.
sub DateCompare {

- # $[ ... The index of the first element in an array, and of the first
- # character in a substring. Default is 0.
- local $[ = 0;
-
# The 2 dates are near. The range is less than a few days that's why we
# can cheat to determine the order. It is only important if one date
# is in January and the other in December.
@@ -791,7 +787,6 @@ sub ConvDate($) {

# Compare 2 filenames
sub filenamecmp {
- local $[ = 0;
my ($la, $lb) = ($a, $b);
my ($ya) = $la =~ m/news-notice\.(\d+)\./o;
$ya += 100 if $ya < 90; # Try to pacify the year 2000 !
15 changes: 15 additions & 0 deletions news/inn/patches/patch-an
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$NetBSD: patch-an,v 1.1 2011/09/25 14:00:09 spz Exp $

remove deprecated perl features that don't do anything useful anyway
(replicate change in INN trunk)

--- ./scripts/innreport_inn.pm.orig 2010-03-24 20:10:36.000000000 +0000
+++ ./scripts/innreport_inn.pm
@@ -2430,7 +2430,6 @@ sub report_unwanted_ng($) {
# Compare 2 dates (+hour), used with sort (arguments $a and $b)
sub datecmp() {
# ex: "May 12 06" for May 12, 6:00am
- local($[) = 0;
# The 2 dates are near. The range is less than a few days that's why we
# can cheat to determine the order. It is only important if one date
# is in January and the other in December.

0 comments on commit d229a52

Please sign in to comment.