diff -ruN /home/timp/squid.orig/Makefile squid/Makefile
--- /home/timp/squid.orig/Makefile	2015-09-02 07:52:09.169616000 +0300
+++ squid/Makefile	2015-09-02 07:54:30.262071000 +0300
@@ -1,7 +1,7 @@
 # $FreeBSD: head/www/squid/Makefile 393602 2015-08-05 18:32:18Z robak $
 
 PORTNAME=	squid
-PORTVERSION=	3.5.7
+PORTVERSION=	3.5.8
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
 		http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \
diff -ruN /home/timp/squid.orig/distinfo squid/distinfo
--- /home/timp/squid.orig/distinfo	2015-09-02 07:52:09.169723000 +0300
+++ squid/distinfo	2015-09-02 08:42:47.671404000 +0300
@@ -1,2 +1,2 @@
-SHA256 (squid3.5/squid-3.5.7.tar.xz) = ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699
-SIZE (squid3.5/squid-3.5.7.tar.xz) = 2294580
+SHA256 (squid3.5/squid-3.5.8.tar.xz) = f402a21d4fae8b3e9df13683dc530366e4b1753df21e91c05a0a9514a1abfc62
+SIZE (squid3.5/squid-3.5.8.tar.xz) = 2295644
diff -ruN /home/timp/squid.orig/files/patch-build-clang-ecap squid/files/patch-build-clang-ecap
--- /home/timp/squid.orig/files/patch-build-clang-ecap	2015-09-02 07:52:09.341848000 +0300
+++ squid/files/patch-build-clang-ecap	1970-01-01 03:00:00.000000000 +0300
@@ -1,40 +0,0 @@
---- src/adaptation/ecap/ServiceRep.cc.orig	2015-08-01 06:08:17 UTC
-+++ src/adaptation/ecap/ServiceRep.cc
-@@ -234,7 +234,7 @@ bool Adaptation::Ecap::ServiceRep::probe
- 
- bool Adaptation::Ecap::ServiceRep::up() const
- {
--    return theService != NULL;
-+    return theService;
- }
- 
- bool Adaptation::Ecap::ServiceRep::wantsUrl(const String &urlPath) const
---- src/adaptation/ecap/XactionRep.cc.orig	2015-08-01 06:08:17 UTC
-+++ src/adaptation/ecap/XactionRep.cc
-@@ -72,7 +72,7 @@ void
- Adaptation::Ecap::XactionRep::master(const AdapterXaction &x)
- {
-     Must(!theMaster);
--    Must(x != NULL);
-+    Must(x);
-     theMaster = x;
- }
- 
-@@ -259,7 +259,7 @@ Adaptation::Ecap::XactionRep::swanSong()
-     // clear body_pipes, if any
-     // this code does not maintain proxying* and canAccessVb states; should it?
- 
--    if (theAnswerRep != NULL) {
-+    if (theAnswerRep) {
-         BodyPipe::Pointer body_pipe = answer().body_pipe;
-         if (body_pipe != NULL) {
-             Must(body_pipe->stillProducing(this));
-@@ -318,7 +318,7 @@ Adaptation::Ecap::XactionRep::cause()
- libecap::Message &
- Adaptation::Ecap::XactionRep::adapted()
- {
--    Must(theAnswerRep != NULL);
-+    Must(theAnswerRep);
-     return *theAnswerRep;
- }
-