From 262194a5fcef9ee0a7a81fd68295cd1de8cbe2c2 Mon Sep 17 00:00:00 2001 From: Florian Smeets Date: Thu, 23 Jun 2011 15:11:18 +0000 Subject: [PATCH] change all squid ports from CONFLICTS to CONFLICTS_INSTALL PR: ports/158194 Submitted by: Fedor A Borshev Approved by: maintainer --- www/squid/Makefile | 2 +- www/squid30/Makefile | 2 +- www/squid31/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/squid/Makefile b/www/squid/Makefile index c2bef1511bf6..ec5cc9acf325 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -115,7 +115,7 @@ COMMENT= HTTP Caching Proxy SQUID_STABLE_VER= 9 -CONFLICTS= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 236c79b1e190..238b83ffae99 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -103,7 +103,7 @@ LATEST_LINK= squid30 SQUID_STABLE_VER= 25 -CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes diff --git a/www/squid31/Makefile b/www/squid31/Makefile index b6e653789ef3..56b5fdaf784c 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -90,7 +90,7 @@ LATEST_LINK= squid31 SQUID_STABLE_VER= 12 -CONFLICTS= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* +CONFLICTS_INSTALL= squid-2.[0-9].* squid-3.[^1].* cacheboy-[0-9]* lusca-head-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_PERL5= yes