diff options
| author | flo <flo@FreeBSD.org> | 2011-06-23 23:11:18 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2011-06-23 23:11:18 +0800 |
| commit | 34fa9536950189d523c7f5f79a17f163eb7043ae (patch) | |
| tree | ad81560b19ff63852d1213891232cfd97baa6ce7 | |
| parent | c15dd908badec3bc1a7329e20b47021ca7feafde (diff) | |
| download | freebsd-ports-gnome-34fa9536950189d523c7f5f79a17f163eb7043ae.tar.gz freebsd-ports-gnome-34fa9536950189d523c7f5f79a17f163eb7043ae.tar.zst freebsd-ports-gnome-34fa9536950189d523c7f5f79a17f163eb7043ae.zip | |
change all squid ports from CONFLICTS to CONFLICTS_INSTALL
PR: ports/158194
Submitted by: Fedor A Borshev <fedor9@gmail.com>
Approved by: maintainer
| -rw-r--r-- | www/squid/Makefile | 2 | ||||
| -rw-r--r-- | www/squid30/Makefile | 2 | ||||
| -rw-r--r-- | 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 |