From owner-svn-ports-head@freebsd.org  Fri Jul  1 09:16:33 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E537BB886E8;
 Fri,  1 Jul 2016 09:16:33 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id B20ED2763;
 Fri,  1 Jul 2016 09:16:33 +0000 (UTC)
 (envelope-from demon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u619GWDn001017;
 Fri, 1 Jul 2016 09:16:32 GMT (envelope-from demon@FreeBSD.org)
Received: (from demon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u619GWpg001015;
 Fri, 1 Jul 2016 09:16:32 GMT (envelope-from demon@FreeBSD.org)
Message-Id: <201607010916.u619GWpg001015@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: demon set sender to
 demon@FreeBSD.org using -f
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Fri, 1 Jul 2016 09:16:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417870 - in head/www/calamaris: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Jul 2016 09:16:34 -0000

Author: demon
Date: Fri Jul  1 09:16:32 2016
New Revision: 417870
URL: https://svnweb.freebsd.org/changeset/ports/417870

Log:
  Understand log format produced by new versions of squid.
  
  Submitted by:	Dimitris Kalogeras <D.Kalogeras@noc.ntua.gr>

Modified:
  head/www/calamaris/Makefile
  head/www/calamaris/files/patch-calamaris

Modified: head/www/calamaris/Makefile
==============================================================================
--- head/www/calamaris/Makefile	Fri Jul  1 09:07:35 2016	(r417869)
+++ head/www/calamaris/Makefile	Fri Jul  1 09:16:32 2016	(r417870)
@@ -3,7 +3,7 @@
 
 PORTNAME=	calamaris
 PORTVERSION=	2.59
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www textproc
 MASTER_SITES=	http://cord.de/files/calamaris/
 

Modified: head/www/calamaris/files/patch-calamaris
==============================================================================
--- head/www/calamaris/files/patch-calamaris	Fri Jul  1 09:07:35 2016	(r417869)
+++ head/www/calamaris/files/patch-calamaris	Fri Jul  1 09:16:32 2016	(r417870)
@@ -1,5 +1,14 @@
---- calamaris.orig	2013-03-11 16:52:12.000000000 +0400
-+++ calamaris	2013-03-11 16:52:45.000000000 +0400
+--- calamaris.orig	2016-07-01 12:14:22.630107000 +0300
++++ calamaris	2016-07-01 12:14:58.852151000 +0300
+@@ -1728,7 +1728,7 @@
+       $hier++;
+       $hier_size += $log_size;
+       $hier_time += $log_reqtime;
+-      if ( $log_hier_method =~ m#DIRECT|SOURCE_FASTEST#o ) {
++      if ( $log_hier_method =~ m#ORIGINAL_DST|DIRECT|SOURCE_FASTEST#o ) {
+ 	$hier_direct++;
+ 	$hier_direct_size += $log_size;
+ 	$hier_direct_time += $log_reqtime;';
 @@ -2606,7 +2606,7 @@
  	    100, 100 * $tcp_hit / $tcp );
    }