[pkgsrc/trunk]: pkgsrc/www/calamaris Use of defined on aggregates (hashes and...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c2e8cdac4ea1
branches:  trunk
changeset: 382914:c2e8cdac4ea1
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Tue Jul 17 19:17:17 2018 +0000

description:
Use of defined on aggregates (hashes and arrays) is no longer supported.

Fix two instances of this. PR pkg/53454.
Bump revision.

diffstat:

 www/calamaris/Makefile                |   4 ++--
 www/calamaris/distinfo                |   3 ++-
 www/calamaris/patches/patch-calamaris |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diffs (51 lines):

diff -r 7fdff0caaee3 -r c2e8cdac4ea1 www/calamaris/Makefile
--- a/www/calamaris/Makefile    Tue Jul 17 17:14:58 2018 +0000
+++ b/www/calamaris/Makefile    Tue Jul 17 19:17:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/07/09 06:39:11 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/07/17 19:17:17 bsiegert Exp $
 
 DISTNAME=      calamaris-2.59
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    www
 MASTER_SITES=  http://cord.de/tools/squid/calamaris/
 
diff -r 7fdff0caaee3 -r c2e8cdac4ea1 www/calamaris/distinfo
--- a/www/calamaris/distinfo    Tue Jul 17 17:14:58 2018 +0000
+++ b/www/calamaris/distinfo    Tue Jul 17 19:17:17 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 02:46:51 agc Exp $
+$NetBSD: distinfo,v 1.7 2018/07/17 19:17:17 bsiegert Exp $
 
 SHA1 (calamaris-2.59.tar.gz) = 5dc703e247b707482ce28d4612598aa51b101c31
 RMD160 (calamaris-2.59.tar.gz) = f1050e0b896eb851412e754b8137484113ddb19b
 SHA512 (calamaris-2.59.tar.gz) = 8c8ed820a1af6e21cfe9f03397c159b2261c8253b3395a8d6dbd21064151439406496132917d0ef087eed805c7945cf28f2d12dc1e52340991c18e6a27484ade
 Size (calamaris-2.59.tar.gz) = 56168 bytes
+SHA1 (patch-calamaris) = c71790df2a3e2eb8fe7678471f67e9ddc4000d6f
diff -r 7fdff0caaee3 -r c2e8cdac4ea1 www/calamaris/patches/patch-calamaris
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/calamaris/patches/patch-calamaris     Tue Jul 17 19:17:17 2018 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-calamaris,v 1.1 2018/07/17 19:17:17 bsiegert Exp $
+
+--- calamaris.orig     2004-06-06 16:26:14.000000000 +0000
++++ calamaris
+@@ -1341,7 +1341,7 @@ Thank You.\n\n";
+   $time_end = $log_date if $log_date > $time_end;';
+   if ( defined $opt_p ) {
+     $loop .= '
+-  if ( defined(@peak_all) ) {
++  if ( @peak_all ) {
+     if ( $log_date < $peak_all[$#peak_all] ) {
+       $peak_warn =
+       \'Peak values are most likely wrong due to unsorted input!\';
+@@ -2606,7 +2606,7 @@ if ($opt_t) {
+           100, 100 * $tcp_hit / $tcp );
+   }
+   outstop(10);
+-  if ( defined(%tcp_content) ) {
++  if ( %tcp_content ) {
+     outstart(11);
+     if ( $tcp == 0 ) {
+       outline( 11, 'no matching requests' );