diff --git a/www/squid-devel/Makefile b/www/squid-devel/Makefile
index 69a482cf5747..dd804362868c 100644
--- a/www/squid-devel/Makefile
+++ b/www/squid-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v5/ \
 		http://www2.us.squid-cache.org/Versions/v5/ \
diff --git a/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc b/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
index b11dc3ee2c05..e5189a91bc1a 100644
--- a/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
+++ b/www/squid-devel/files/patch-src_acl_external_eDirectory__userip_ext__edirectory__userip__acl.cc
@@ -1,12 +1,15 @@
---- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig	2020-04-19 10:50:48 UTC
+--- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig	2020-04-19 12:38:51 UTC
 +++ src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
-@@ -69,6 +69,9 @@
+@@ -69,6 +69,12 @@
  #ifdef HAVE_NETDB_H
  #include <netdb.h>
  #endif
-+#include <sys/types.h>
++#ifdef HAVE_SYS_SOCKET_H
 +#include <sys/socket.h>
++#endif
++#ifdef HAVE_NETINET_IN_H
 +#include <netinet/in.h>
++#endif
  
  #ifdef HELPER_INPUT_BUFFER
  #define EDUI_MAXLEN     HELPER_INPUT_BUFFER
diff --git a/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc b/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
new file mode 100644
index 000000000000..8aaf7af308d1
--- /dev/null
+++ b/www/squid-devel/files/patch-src_acl_external_kerberos__ldap__group_support__krb5.cc
@@ -0,0 +1,19 @@
+--- src/acl/external/kerberos_ldap_group/support_krb5.cc.orig	2020-04-19 12:38:51 UTC
++++ src/acl/external/kerberos_ldap_group/support_krb5.cc
+@@ -467,10 +467,15 @@ krb5_create_cache(char *domain, char *service_principa
+                 }
+ 
+                 // overwrite limitation of enctypes
++#if USE_HEIMDAL_KRB5
++                creds->session.keytype = 0;
++                if (creds->session.keyvalue.length>0)
++                    krb5_free_keyblock_contents(kparam.context, &creds->session);
++#else
+                 creds->keyblock.enctype = 0;
+                 if (creds->keyblock.contents)
+                     krb5_free_keyblock_contents(kparam.context, &creds->keyblock);
+-
++#endif
+                 code = krb5_get_credentials(kparam.context, 0, kparam.cc[ccindex], creds, &tgt_creds);
+                 if (code) {
+                     k5_error("Error while getting tgt", code);
diff --git a/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc b/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
index 63c6988de825..719046b5b61d 100644
--- a/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
+++ b/www/squid-devel/files/patch-src_acl_external_session_ext__session__acl.cc
@@ -1,11 +1,13 @@
---- src/acl/external/session/ext_session_acl.cc.orig	2020-04-19 10:50:48 UTC
+--- src/acl/external/session/ext_session_acl.cc.orig	2020-05-10 08:32:32 UTC
 +++ src/acl/external/session/ext_session_acl.cc
-@@ -137,7 +137,7 @@ static void init_db(void)
+@@ -137,6 +137,10 @@ static void init_db(void)
          }
      }
  #elif USE_TRIVIALDB
--    db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_DSYNC, 0666);
-+    db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_SYNC, 0666);
++#if _SQUID_FREEBSD_ && !defined(O_DSYNC)
++    // FreeBSD lacks O_DSYNC, O_SYNC is closest to correct behaviour
++#define O_DSYNC O_SYNC
++#endif
+     db = tdb_open(db_path, 0, TDB_CLEAR_IF_FIRST, O_CREAT|O_DSYNC, 0666);
  #endif
      if (!db) {
-         fprintf(stderr, "FATAL: %s: Failed to open session db '%s'\n", program_name, db_path);
diff --git a/www/squid-devel/pkg-plist b/www/squid-devel/pkg-plist
index f562d8685cc0..49aaf89df48c 100644
--- a/www/squid-devel/pkg-plist
+++ b/www/squid-devel/pkg-plist
@@ -50,11 +50,7 @@ libexec/squid/basic_db_auth
 %%TDB%%libexec/squid/ext_session_acl
 %%SSL%%man/man8/security_file_certgen.8.gz
 %%SSL%%libexec/squid/security_file_certgen
-%%ICMP%%libexec/squid/pinger
-%%ICMP%%@mode 4510
-%%ICMP%%@mode
-%%ICMP%%@group squid
-%%ICMP%%@group
+%%ICMP%%@(,squid,4510) libexec/squid/pinger
 %%FS_DISKD%%libexec/squid/diskd
 %%ETCDIR%%/squid.conf.documented
 %%ETCDIR%%/mib.txt