git: dea0931f9bc9 - 2021Q4 - www/squid: Fix build on current with _WITH_CPU_SET_T

The branch 2021Q4 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dea0931f9bc92048af773e3140eb354a3fbba0d7

commit dea0931f9bc92048af773e3140eb354a3fbba0d7
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-11-29 20:33:34 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-12-10 04:32:24 +0000

    www/squid: Fix build on current with _WITH_CPU_SET_T
    
    (cherry picked from commit 9be82b2f413287fcb193ec19b23b1ed62f3fc2d7)
---
 www/squid/files/patch-compat_cpu.h    | 11 +++++++++++
 www/squid/files/patch-configure       | 30 +++++++++++++++++++-----------
 www/squid/files/patch-include_squid.h | 10 ++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/www/squid/files/patch-compat_cpu.h b/www/squid/files/patch-compat_cpu.h
new file mode 100644
index 000000000000..4df40e6b26b4
--- /dev/null
+++ b/www/squid/files/patch-compat_cpu.h
@@ -0,0 +1,11 @@
+--- compat/cpu.h.orig	2021-05-10 02:02:34.000000000 -0700
++++ compat/cpu.h	2021-11-29 10:31:25.381434000 -0800
+@@ -15,6 +15,8 @@
+ #if HAVE_SCHED_H
+ #include <sched.h>
+ #endif
++#undef CPU_COUNT
++#undef CPU_AND
+ 
+ #if !HAVE_CPU_AFFINITY
+ /* failing replacements to minimize the number of if-HAVE_CPU_AFFINITYs */
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
index 75d767667ada..ad7f6f291bc2 100644
--- a/www/squid/files/patch-configure
+++ b/www/squid/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2020-06-09 07:15:48 UTC
-+++ configure
-@@ -35092,7 +35092,7 @@ done
+--- configure.orig	2021-05-10 03:35:34.000000000 -0700
++++ configure	2021-11-29 12:11:20.139764000 -0800
+@@ -35087,7 +35087,7 @@
  ##
  
  BUILD_HELPER="NIS"
@@ -9,7 +9,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -35107,8 +35107,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+@@ -35102,8 +35102,10 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
@@ -22,7 +22,7 @@
  fi
  
  done
-@@ -35581,7 +35583,7 @@ done
+@@ -35576,7 +35578,7 @@
  
    # unconditionally requires crypt(3), for now
    if test "x$ac_cv_func_crypt" != "x"; then
@@ -31,7 +31,7 @@
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-@@ -37973,7 +37975,7 @@ for ac_header in \
+@@ -37982,7 +37984,7 @@
    arpa/nameser.h \
    assert.h \
    bstring.h \
@@ -40,7 +40,7 @@
    ctype.h \
    direct.h \
    errno.h \
-@@ -38181,6 +38183,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
+@@ -38190,6 +38192,7 @@
  #include <netinet/ip.h>
  #endif
  #if HAVE_NETINET_IP_COMPAT_H
@@ -48,7 +48,15 @@
  #include <netinet/ip_compat.h>
  #endif
  #if HAVE_NETINET_IP_FIL_H
-@@ -42228,6 +42231,7 @@ if test "x$enable_ipf_transparent" != "xno" ; then
+@@ -39490,6 +39493,7 @@
+ 
+ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type_cpu_set_t" "
+ #if HAVE_SCHED_H
++#define _WITH_CPU_SET_T
+ #include <sched.h>
+ #endif
+ 
+@@ -42237,6 +42241,7 @@
  #     include <sys/ioccom.h>
  #     include <netinet/in.h>
  
@@ -56,7 +64,7 @@
  #     include <netinet/ip_compat.h>
  #     include <netinet/ip_fil.h>
  #     include <netinet/ip_nat.h>
-@@ -42258,6 +42262,7 @@ else
+@@ -42267,6 +42272,7 @@
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t
@@ -64,7 +72,7 @@
  #       include <netinet/ip_compat.h>
  #       include <netinet/ip_fil.h>
  #       include <netinet/ip_nat.h>
-@@ -42302,6 +42307,7 @@ _ACEOF
+@@ -42311,6 +42317,7 @@
  	ip_fil_compat.h \
  	ip_fil.h \
  	ip_nat.h \
@@ -72,7 +80,7 @@
  	netinet/ip_compat.h \
  	netinet/ip_fil_compat.h \
  	netinet/ip_fil.h \
-@@ -42331,6 +42337,7 @@ ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" 
+@@ -42340,6 +42347,7 @@
  #if HAVE_IP_COMPAT_H
  #include <ip_compat.h>
  #elif HAVE_NETINET_IP_COMPAT_H
diff --git a/www/squid/files/patch-include_squid.h b/www/squid/files/patch-include_squid.h
new file mode 100644
index 000000000000..85951b1b6e02
--- /dev/null
+++ b/www/squid/files/patch-include_squid.h
@@ -0,0 +1,10 @@
+--- include/squid.h.orig	2021-05-10 02:02:34.000000000 -0700
++++ include/squid.h	2021-11-29 08:48:04.020714000 -0800
+@@ -9,6 +9,7 @@
+ #ifndef SQUID_CONFIG_H
+ #define SQUID_CONFIG_H
+ 
++#define _WITH_CPU_SET_T
+ #include "autoconf.h"       /* For GNU autoconf variables */
+ 
+ #if !defined(HAVE_SQUID)