diff --git a/www/squid/Makefile b/www/squid/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid/files/icap-2.5-core.patch b/www/squid/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid/files/icap-2.5-core.patch
+++ b/www/squid/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid25/files/icap-2.5-core.patch b/www/squid25/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid25/files/icap-2.5-core.patch
+++ b/www/squid25/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid26/files/icap-2.5-core.patch b/www/squid26/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid26/files/icap-2.5-core.patch
+++ b/www/squid26/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid27/files/icap-2.5-core.patch b/www/squid27/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid27/files/icap-2.5-core.patch
+++ b/www/squid27/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid30/files/icap-2.5-core.patch b/www/squid30/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid30/files/icap-2.5-core.patch
+++ b/www/squid30/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 3541d0c11994..ea00c7a154c5 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -77,9 +77,13 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://ftp.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
+		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
+		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/%SUBDIR%/ \
+		ftp://ftp.ntua.gr/pub/www/Squid/%SUBDIR%/ \
+		ftp://ftp.ccs.neu.edu/pub/mirrors/squid.nlanr.net/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE14
diff --git a/www/squid31/files/icap-2.5-core.patch b/www/squid31/files/icap-2.5-core.patch
index 4736c9487c3a..72fdb8065b08 100644
--- a/www/squid31/files/icap-2.5-core.patch
+++ b/www/squid31/files/icap-2.5-core.patch
@@ -20,7 +20,7 @@ for the "official" auto-generated patchset.
 See http://devel.squid-cache.org/icap/ for further information
 about the ICAP client project.
 
-Patch last updated: 2006-05-21
+Patch last updated: 2006-06-01
 
 Index: errors/Azerbaijani/ERR_ICAP_FAILURE
 ===================================================================
@@ -5441,8 +5441,8 @@ Index: src/icap_respmod.c
 RCS file: src/icap_respmod.c
 diff -N src/icap_respmod.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ src/icap_respmod.c	17 Feb 2006 12:45:23 -0000	1.1.2.64
-@@ -0,0 +1,1057 @@
++++ src/icap_respmod.c	25 May 2006 16:04:55 -0000	1.1.2.65
+@@ -0,0 +1,1055 @@
 +
 +/*
 + * $Id$
@@ -5522,8 +5522,6 @@ diff -N src/icap_respmod.c
 +	memBufPrintf(mb, "X-TE: trailers\r\n");
 +    }
 +#endif
-+    if (service->flags.allow_204)
-+	memBufPrintf(mb, "Allow: 204\r\n");
 +}
 +
 +static int
@@ -7101,7 +7099,10 @@ Index: src/url.c
 ===================================================================
 RCS file: /cvsroot/squid/squid/src/url.c,v
 retrieving revision 1.7.6.7
+retrieving revision 1.7.6.5.2.3
+diff -p -u -b -r1.7.6.7 -r1.7.6.5.2.3
 --- src/url.c	11 Mar 2006 03:16:31 -0000	1.7.6.7
++++ src/url.c	16 May 2006 17:56:59 -0000	1.7.6.5.2.3
 @@ -103,6 +103,9 @@ const char *ProtocolStr[] =
      "whois",
      "internal",