aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2009-06-28 16:20:42 +0000
committerMartin Wilke <miwi@FreeBSD.org>2009-06-28 16:20:42 +0000
commite63a1bce8eda3c5398d7a891aa3a8dd7ffec653c (patch)
tree5d24d5497ea654d45de872399b70ca1cc6183d77 /www
parent4fe679854420056d80edfd924255c5f89a8a2f1d (diff)
Notes
Diffstat (limited to 'www')
-rw-r--r--www/squid/Makefile2
-rw-r--r--www/squid30/Makefile4
-rw-r--r--www/squid31/Makefile4
3 files changed, 5 insertions, 5 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index cb99077a6395..7fb0439cec74 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -94,7 +94,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://www1.uk.squid-cache.org/Versions/v2/2.7/ \
http://www1.jp.squid-cache.org/Versions/v2/2.7/ \
http://www2.tw.squid-cache.org/Versions/v2/2.7/
-MASTER_SITE_SUBDIR= squid-2/STABLE
+MASTER_SITE_SUBDIR= squid
DISTNAME= squid-2.7.STABLE${SQUID_STABLE_VER}
DIST_SUBDIR= squid2.7
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index ff169dfbfd42..6c014b01a105 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -78,7 +78,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://www1.uk.squid-cache.org/Versions/v3/3.0/ \
http://www1.jp.squid-cache.org/Versions/v3/3.0/ \
http://www2.tw.squid-cache.org/Versions/v3/3.0/
-MASTER_SITE_SUBDIR= squid-3/STABLE
+MASTER_SITE_SUBDIR= squid
DISTNAME= squid-3.0.STABLE${SQUID_STABLE_VER}
DIST_SUBDIR= squid3.0
@@ -101,7 +101,7 @@ LATEST_LINK= squid30
SQUID_STABLE_VER= 16
-CONFLICTS= squid-2.[0-9].* cacheboy-[0-9]*
+CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]*
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index ff169dfbfd42..6c014b01a105 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -78,7 +78,7 @@ MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://www1.uk.squid-cache.org/Versions/v3/3.0/ \
http://www1.jp.squid-cache.org/Versions/v3/3.0/ \
http://www2.tw.squid-cache.org/Versions/v3/3.0/
-MASTER_SITE_SUBDIR= squid-3/STABLE
+MASTER_SITE_SUBDIR= squid
DISTNAME= squid-3.0.STABLE${SQUID_STABLE_VER}
DIST_SUBDIR= squid3.0
@@ -101,7 +101,7 @@ LATEST_LINK= squid30
SQUID_STABLE_VER= 16
-CONFLICTS= squid-2.[0-9].* cacheboy-[0-9]*
+CONFLICTS= squid-2.[0-9].* squid-3.[^0].* cacheboy-[0-9]*
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_PERL5= yes