Bring the squid-2.5 port up to 2.5.STABLE2.

Expect another few commits soon to improve features :)

12 files changed, 18 insertions, 834 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 2f9196bd71d..812357b7112 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -16,78 +16,10 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE1
+DISTNAME=	squid-2.5.STABLE2
 EXTRACT_SUFX=	.tar.gz
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
-		squid-2.5.STABLE1-disable-http-violations.patch \
-		squid-2.5.STABLE1-proxy_auth.patch \
-		squid-2.5.STABLE1-max_user_ip.patch \
-		squid-2.5.STABLE1-cache_dir_docs.patch \
-		squid-2.5.STABLE1-load_icons.patch \
-		squid-2.5.STABLE1-referer_log.patch \
-		squid-2.5.STABLE1-ldap_auth.patch \
-		squid-2.5.STABLE1-addlang.patch \
-		squid-2.5.STABLE1-pthreads.patch \
-		squid-2.5.STABLE1-strwordtok.patch \
-		squid-2.5.STABLE1-wccp.patch \
-		squid-2.5.STABLE1-memstat.patch \
-		squid-2.5.STABLE1-aufs.patch \
-		squid-2.5.STABLE1-acl_leak.patch \
-		squid-2.5.STABLE1-ext_acl_comma.patch \
-		squid-2.5.STABLE1-request_entity.patch \
-		squid-2.5.STABLE1-ext_acl_exit.patch \
-		squid-2.5.STABLE1-uninstall.patch \
-		squid-2.5.STABLE1-cachemgr.patch \
-		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch \
-		squid-2.5.STABLE1-spaces.patch \
-		squid-2.5.STABLE1-flags_open.patch \
-		squid-2.5.STABLE1-ldap_group-compile.patch \
-		squid-2.5.STABLE1-aufs_performance.patch \
-		squid-2.5.STABLE1-RunCache.patch \
-		squid-2.5.STABLE1-rebuild_assert.patch \
-		squid-2.5.STABLE1-offline_mode.patch \
-		squid-2.5.STABLE1-S.patch \
-		squid-2.5.STABLE1-chroot.patch \
-		squid-2.5.STABLE1-aufs_reentrant.patch\
-		squid-2.5.STABLE1-relnote11.patch \
-		squid-2.5.STABLE1-ldap_group.patch \
-		squid-2.5.STABLE1-offline_toggle.patch \
-		squid-2.5.STABLE1-failure_ratio.patch \
-		squid-2.5.STABLE1-hostnames.patch \
-		squid-2.5.STABLE1-sbrk.patch \
-		squid-2.5.STABLE1-log_mime_hdrs.patch \
-		squid-2.5.STABLE1-peer_select_alg.patch \
-		squid-2.5.STABLE1-mempoolstat.patch \
-		squid-2.5.STABLE1-copy_offset.patch \
-		squid-2.5.STABLE1-select_fds_hist.patch \
-		squid-2.5.STABLE1-select_stat.patch \
-		squid-2.5.STABLE1-pidfile.patch \
-		squid-2.5.STABLE1-http_reply_max_size.patch \
-		squid-2.5.STABLE1-cachemgr_non_get.patch \
-		squid-2.5.STABLE1-authsheme_realloc.patch \
-		squid-2.5.STABLE1-ftp_abort.patch \
-		squid-2.5.STABLE1-helper_stats.patch \
-		squid-2.5.STABLE1-delay_pools_docs.patch \
-		squid-2.5.STABLE1-auth_connection.patch \
-		squid-2.5.STABLE1-authenticate_program_docs.patch \
-		squid-2.5.STABLE1-with_aufs_threads_trap.patch \
-		squid-2.5.STABLE1-shutdown_assert.patch \
-		squid-2.5.STABLE1-cachemgr_passwd.patch \
-		squid-2.5.STABLE1-etc_hosts_fdleak.patch \
-		squid-2.5.STABLE1-openssl097.patch \
-		squid-2.5.STABLE1-HEAD_bad_headers.patch \
-		squid-2.5.STABLE1-time_acl_list.patch \
-		squid-2.5.STABLE1-CONNECT_pipeline.patch \
-		squid-2.5.STABLE1-winbind.patch \
-		squid-2.5.STABLE1-mib.patch \
-		squid-2.5.STABLE1-error-http-ident.patch \
-		squid-2.5.STABLE1-distclean_icons.patch \
-		squid-2.5.STABLE1-external_acl_auth_segfault.patch \
-		squid-2.5.STABLE1-auth_digest.patch \
-		squid-2.5.STABLE1-external_acl_user.patch
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 37f1e24c31e..9c61b0c20e1 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,69 +1 @@
-MD5 (squid2.5/squid-2.5.STABLE1.tar.gz) = cd26774cd917842a689fee5f76c8d752
-MD5 (squid2.5/squid-2.5.STABLE1-CONNECT_pipeline.patch) = ca83a0cec8b3fd3b01ac5bc04f68dbac
-MD5 (squid2.5/squid-2.5.STABLE1-HEAD_bad_headers.patch) = 2b9577757d49f30f7d654303afdf6d53
-MD5 (squid2.5/squid-2.5.STABLE1-RunCache.patch) = 398e65c2ba646955c8da85b78094b5df
-MD5 (squid2.5/squid-2.5.STABLE1-S.patch) = 169f0893ed7a4dc6565400f2e2c1ce59
-MD5 (squid2.5/squid-2.5.STABLE1-acl_leak.patch) = 4560a1f09fec829e1c76bce436d464f3
-MD5 (squid2.5/squid-2.5.STABLE1-addlang.patch) = bbc7a67e9ebfe80e3c2e3d1cb487fa8e
-MD5 (squid2.5/squid-2.5.STABLE1-aufs.patch) = 6fcc60011da9e4cc52edde8570567360
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_performance.patch) = 2e31a2decf450aeeb47e3d41386c00c4
-MD5 (squid2.5/squid-2.5.STABLE1-aufs_reentrant.patch) = d1f81faa3bed2eae8296f977dff22d94
-MD5 (squid2.5/squid-2.5.STABLE1-auth-proxy.patch) = 2257795597d0efb514ae93b32f4c05b4
-MD5 (squid2.5/squid-2.5.STABLE1-auth_connection.patch) = 91d5dea19cb440c8546d44f4c37e8612
-MD5 (squid2.5/squid-2.5.STABLE1-auth_digest.patch) = 3e4a18cb9700982a0f0eed6256a335f6
-MD5 (squid2.5/squid-2.5.STABLE1-authenticate_program_docs.patch) = 8ad129869c83de654d1e060da1b0c3fd
-MD5 (squid2.5/squid-2.5.STABLE1-authsheme_realloc.patch) = 459972ade51eb84a613ab91eabdcb98a
-MD5 (squid2.5/squid-2.5.STABLE1-cache_dir_docs.patch) = 8b566c98a39b0abda2d02c0f84e647ee
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr.patch) = bd23aedd830ee640214deca512a20f02
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_non_get.patch) = 824b8c217eacfd39130bdf12c986616e
-MD5 (squid2.5/squid-2.5.STABLE1-cachemgr_passwd.patch) = e5d2415965b2488cd2a8f20a05b4dcbc
-MD5 (squid2.5/squid-2.5.STABLE1-chroot.patch) = 2194c0654750ba2ae40d69915219c101
-MD5 (squid2.5/squid-2.5.STABLE1-copy_offset.patch) = 6db1e444d8c689454afca1588758d62f
-MD5 (squid2.5/squid-2.5.STABLE1-delay_pools_docs.patch) = 7f3a5ce77fe88147973b9507dbe90ffe
-MD5 (squid2.5/squid-2.5.STABLE1-disable-http-violations.patch) = 4bfd3394c230251142c9e71f4b0e3cd3
-MD5 (squid2.5/squid-2.5.STABLE1-disable-ident-lookups.patch) = 20ca75a8e4f54b23f7b545b1cf718725
-MD5 (squid2.5/squid-2.5.STABLE1-distclean_icons.patch) = 24f8441eee716306b2a2cc39df9a3da9
-MD5 (squid2.5/squid-2.5.STABLE1-dnsserver.patch) = cb59578ca314d02416e0d003c3ce1392
-MD5 (squid2.5/squid-2.5.STABLE1-error-http-ident.patch) = b7a830caaea83d1180987b266fefa21b
-MD5 (squid2.5/squid-2.5.STABLE1-etc_hosts_fdleak.patch) = 19589dbe950da368d82731fd9a60a1b7
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_comma.patch) = b4ffef406d12c46e04758b68ffb488d0
-MD5 (squid2.5/squid-2.5.STABLE1-ext_acl_exit.patch) = ad21c15264fc04bfdd71d55139f65873
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_auth_segfault.patch) = d7c5351561d2043e33efb4166b117c21
-MD5 (squid2.5/squid-2.5.STABLE1-external_acl_user.patch) = 43471b9bb938f39830ef88b874e1606b
-MD5 (squid2.5/squid-2.5.STABLE1-failure_ratio.patch) = c1d3cb32fb7c98188739f713cc56d293
-MD5 (squid2.5/squid-2.5.STABLE1-flags_open.patch) = 1244c407e18214c9bcce2850d1e3017e
-MD5 (squid2.5/squid-2.5.STABLE1-ftp_abort.patch) = 7bfff3692a1fc2f63e4f8d321739afe3
-MD5 (squid2.5/squid-2.5.STABLE1-helper_stats.patch) = 1766a70f3ea668cfd1b8805a7bb9658d
-MD5 (squid2.5/squid-2.5.STABLE1-hostnames.patch) = 6b6131ee4e4338777fad5fb3de36def6
-MD5 (squid2.5/squid-2.5.STABLE1-http_reply_max_size.patch) = ea43808f8ae5c3152d07f25165642d6c
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_auth.patch) = 91a4409f13bad84ae652c805321a5c59
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group-compile.patch) = b2f4521b2db281606ce4b029cfcb44ca
-MD5 (squid2.5/squid-2.5.STABLE1-ldap_group.patch) = 334816023b46b549eb3f91bee8489632
-MD5 (squid2.5/squid-2.5.STABLE1-load_icons.patch) = 384b266ee4c26a2adaa3f498c52c4b34
-MD5 (squid2.5/squid-2.5.STABLE1-log_mime_hdrs.patch) = 7b644e4a5bd5019d23e5b4a272ff2218
-MD5 (squid2.5/squid-2.5.STABLE1-max_user_ip.patch) = 93530cfd9522bbf37321bc6f451179f5
-MD5 (squid2.5/squid-2.5.STABLE1-mempoolstat.patch) = f70a939e15dbe603eaacc2c2fdf828f1
-MD5 (squid2.5/squid-2.5.STABLE1-memstat.patch) = 108bf9f57424147ac408451476d5ba2f
-MD5 (squid2.5/squid-2.5.STABLE1-mib.patch) = a8303ef80e36be85e6eca5c4d4812b1f
-MD5 (squid2.5/squid-2.5.STABLE1-offline_mode.patch) = 056611c14992fca7b19b0770c5cbe847
-MD5 (squid2.5/squid-2.5.STABLE1-offline_toggle.patch) = 82c557be22c2137e4cc655d9608c8be6
-MD5 (squid2.5/squid-2.5.STABLE1-openssl097.patch) = 1a985987c5c483a746d2210118cdfc10
-MD5 (squid2.5/squid-2.5.STABLE1-peer_select_alg.patch) = 653477b8452e71ed9cc520bff091e050
-MD5 (squid2.5/squid-2.5.STABLE1-pidfile.patch) = 4c1054de8084536366e7d76cbc02f0c3
-MD5 (squid2.5/squid-2.5.STABLE1-proxy_auth.patch) = 9a1b998e289969ffe2a6e6ad2c8d1c84
-MD5 (squid2.5/squid-2.5.STABLE1-pthreads.patch) = 2edfea9977fc28deca9fef64ea801b75
-MD5 (squid2.5/squid-2.5.STABLE1-rebuild_assert.patch) = ec7ccb2dddb988833535f3f435f3c031
-MD5 (squid2.5/squid-2.5.STABLE1-referer_log.patch) = 23609e99750fd9776b0917a4a2e17bec
-MD5 (squid2.5/squid-2.5.STABLE1-relnote11.patch) = a6fb9274e7ff481e4bfba2710f0bc5b9
-MD5 (squid2.5/squid-2.5.STABLE1-request_entity.patch) = 102363b0e9e3839affde7d5d18ed5861
-MD5 (squid2.5/squid-2.5.STABLE1-sbrk.patch) = b30196b75ad99c0bb3a04969b781783e
-MD5 (squid2.5/squid-2.5.STABLE1-select_fds_hist.patch) = 9bc8a9fdb24c489a30e8fb89da225aae
-MD5 (squid2.5/squid-2.5.STABLE1-select_stat.patch) = b22ca68a607c2d2886608a2403aa7330
-MD5 (squid2.5/squid-2.5.STABLE1-shutdown_assert.patch) = 4d9780df39841711d2ef15fe545d4094
-MD5 (squid2.5/squid-2.5.STABLE1-spaces.patch) = 127806aba2c83a5247b7da9c921fa86e
-MD5 (squid2.5/squid-2.5.STABLE1-strwordtok.patch) = 0bee5a5b7bbebfde2130c4d588ce6b5f
-MD5 (squid2.5/squid-2.5.STABLE1-time_acl_list.patch) = a98e25cb3af1f0e1186a4604ebadfd96
-MD5 (squid2.5/squid-2.5.STABLE1-uninstall.patch) = 453ad78fd4a9297546f0ac78c43982d5
-MD5 (squid2.5/squid-2.5.STABLE1-wccp.patch) = a6fce0040ddecad6316131ddedd462cc
-MD5 (squid2.5/squid-2.5.STABLE1-winbind.patch) = b5ebcecc27559d5909ca7fa19275bcdf
-MD5 (squid2.5/squid-2.5.STABLE1-with_aufs_threads_trap.patch) = 2b49b62af3bcf911260948eb3cabf768
+MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1