summaryrefslogtreecommitdiff
path: root/www/awstats
diff options
context:
space:
mode:
authorgls <gls@pkgsrc.org>2012-02-13 22:34:38 +0000
committergls <gls@pkgsrc.org>2012-02-13 22:34:38 +0000
commit3d9f933692c351f104fd88b259ff15f924095f52 (patch)
tree2b8f19cff8d9cbbdd4a137598dc66cf1c5535b06 /www/awstats
parent78036d733ebb91de1583d03541cfdcafe93d25cd (diff)
downloadpkgsrc-3d9f933692c351f104fd88b259ff15f924095f52.tar.gz
Fix behavior with perl 5.14.
From Nils Ratusznik per PR pkg/45743.
Diffstat (limited to 'www/awstats')
-rw-r--r--www/awstats/Makefile4
-rw-r--r--www/awstats/distinfo4
-rw-r--r--www/awstats/patches/patch-aa25
3 files changed, 27 insertions, 6 deletions
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index f061e47bc0b..82d1d98f3d5 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2012/02/05 23:58:07 minskim Exp $
+# $NetBSD: Makefile,v 1.47 2012/02/13 22:34:38 gls Exp $
DISTNAME= awstats-7.0
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 4b872f521f8..2122d867512 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2012/02/05 23:58:07 minskim Exp $
+$NetBSD: distinfo,v 1.30 2012/02/13 22:34:38 gls Exp $
SHA1 (awstats-7.0/awstats-7.0.tar.gz) = 733fa7d6a540f4a54f52c69a5f271c789472b0b7
RMD160 (awstats-7.0/awstats-7.0.tar.gz) = 0bd46afbd3159cf5f3e517b37a43b7d0852fc2a3
Size (awstats-7.0/awstats-7.0.tar.gz) = 1254327 bytes
-SHA1 (patch-aa) = 77505c9894b0be638d748c506feb93e065a3318f
+SHA1 (patch-aa) = fcbd1e95612891e31f996bbfc4ebb88ddb29eac7
SHA1 (patch-ab) = 9ae474058a1803c1132b36448c1a6987c58e8823
SHA1 (patch-ad) = 9c08fff3fcc3871a08c73c9509fbeb5baca06c09
SHA1 (patch-wwwroot_cgi-bin_awredir.pl) = 3e3a41ab4bfbe633f78af182f5d2692bd678595d
diff --git a/www/awstats/patches/patch-aa b/www/awstats/patches/patch-aa
index 319d1f9a1e8..76e0560e60b 100644
--- a/www/awstats/patches/patch-aa
+++ b/www/awstats/patches/patch-aa
@@ -1,7 +1,19 @@
-$NetBSD: patch-aa,v 1.10 2010/11/09 07:14:48 adam Exp $
+$NetBSD: patch-aa,v 1.11 2012/02/13 22:34:38 gls Exp $
---- wwwroot/cgi-bin/awstats.pl.orig 2010-08-18 10:47:10.000000000 +0000
+Check for configdir.
+Fix behavior with perl 5.14: http://sourceforge.net/tracker/index.php?func=detail&aid=3311848&group_id=13764&atid=113764
+
+--- wwwroot/cgi-bin/awstats.pl.orig 2010-10-16 17:24:03.000000000 +0000
+++ wwwroot/cgi-bin/awstats.pl
+@@ -1354,7 +1354,7 @@ sub debug {
+ sub OptimizeArray {
+ my $array = shift;
+ my @arrayunreg = map {
+- if (/\(\?[-\w]*:(.*)\)/) { $1 }
++ if (/\(\?[-^\w]*:(.*)\)/) { $1 }
+ } @$array;
+ my $notcasesensitive = shift;
+ my $searchlist = 0;
@@ -1717,7 +1717,7 @@ sub Read_Config {
"/etc/opt/awstats"
);
@@ -11,3 +23,12 @@ $NetBSD: patch-aa,v 1.10 2010/11/09 07:14:48 adam Exp $
# Check if configdir is outside default values.
my $outsidedefaultvalue=1;
foreach (@PossibleConfigDir) {
+@@ -7809,7 +7809,7 @@ sub DecodeEncodedString {
+ # Return: standardregex
+ #------------------------------------------------------------------------------
+ sub UnCompileRegex {
+- shift =~ /\(\?[-\w]*:(.*)\)/;
++ shift =~ /\(\?[-^\w]*:(.*)\)/;
+ return $1;
+ }
+