From owner-cvs-ports@FreeBSD.ORG  Thu Jun 23 15:11:19 2011
Return-Path: <owner-cvs-ports@FreeBSD.ORG>
Delivered-To: cvs-ports@FreeBSD.org
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 45FA21065670;
	Thu, 23 Jun 2011 15:11:19 +0000 (UTC) (envelope-from flo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id D866F8FC1C;
	Thu, 23 Jun 2011 15:11:18 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p5NFBIQg008250;
	Thu, 23 Jun 2011 15:11:18 GMT (envelope-from flo@repoman.freebsd.org)
Received: (from flo@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p5NFBIaG008249;
	Thu, 23 Jun 2011 15:11:18 GMT (envelope-from flo)
Message-Id: <201106231511.p5NFBIaG008249@repoman.freebsd.org>
From: Florian Smeets <flo@FreeBSD.org>
Date: Thu, 23 Jun 2011 15:11:18 +0000 (UTC)
To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: ports/www/squid Makefile ports/www/squid30 Makefile
 ports/www/squid31 Makefile
X-BeenThere: cvs-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the ports tree <cvs-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-ports>
List-Post: <mailto:cvs-ports@freebsd.org>
List-Help: <mailto:cvs-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-ports>,
	<mailto:cvs-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2011 15:11:19 -0000

flo         2011-06-23 15:11:18 UTC

  FreeBSD ports repository

  Modified files:
    www/squid            Makefile 
    www/squid30          Makefile 
    www/squid31          Makefile 
  Log:
  change all squid ports from CONFLICTS to CONFLICTS_INSTALL
  
  PR:             ports/158194
  Submitted by:   Fedor A Borshev <fedor9@gmail.com>
  Approved by:    maintainer
  
  Revision  Changes    Path
  1.229     +1 -1      ports/www/squid/Makefile
  1.240     +1 -1      ports/www/squid30/Makefile
  1.252     +1 -1      ports/www/squid31/Makefile