Index: head/www/squid-devel/files/patch-configure
===================================================================
--- head/www/squid-devel/files/patch-configure	(revision 473582)
+++ head/www/squid-devel/files/patch-configure	(revision 473583)
@@ -1,82 +1,92 @@
---- configure.orig	2018-06-11 16:48:04 UTC
-+++ configure
-@@ -34345,7 +34345,7 @@ done
+--- configure.orig	2018-06-11 09:48:04.000000000 -0700
++++ configure	2018-06-22 20:34:58.827873000 -0700
+@@ -34345,7 +34345,7 @@
  ##
  
  BUILD_HELPER="NIS"
 -for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h
 +for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h
  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" "
-@@ -34360,8 +34360,10 @@ if eval test \"x\$"$as_ac_Header"\" = x"
+@@ -34360,8 +34360,10 @@
  #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
  
 -else
 -  BUILD_HELPER=""
 +# XXX: On FreeBSD we have to do this to make NIS work
 +# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247
 +# is resolved.
 +  BUILD_HELPER="NIS"
  fi
  
  done
-@@ -34834,7 +34836,7 @@ done
+@@ -34834,7 +34836,7 @@
  
    # unconditionally requires crypt(3), for now
    if test "x$ac_cv_func_crypt" != "x"; then
 -    for ac_header in unistd.h crypt.h shadow.h
 +    for ac_header in unistd.h rpcsvc/crypt.h shadow.h
  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"
-@@ -37226,7 +37228,7 @@ for ac_header in \
+@@ -37226,7 +37228,7 @@
    arpa/nameser.h \
    assert.h \
    bstring.h \
 -  crypt.h \
 +  rpcsvc/crypt.h \
    ctype.h \
    direct.h \
    errno.h \
-@@ -37434,6 +37436,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
+@@ -37434,6 +37436,7 @@
  #include <netinet/ip.h>
  #endif
  #if HAVE_NETINET_IP_COMPAT_H
 +#include <net/if.h>	/* IFNAMSIZ */
  #include <netinet/ip_compat.h>
  #endif
  #if HAVE_NETINET_IP_FIL_H
-@@ -41450,6 +41453,7 @@ if test "x$enable_ipf_transparent" != "x
+@@ -41450,6 +41453,7 @@
  #     include <sys/ioccom.h>
  #     include <netinet/in.h>
  
 +#     include <net/if.h>	/* IFNAMSIZ */
  #     include <netinet/ip_compat.h>
  #     include <netinet/ip_fil.h>
  #     include <netinet/ip_nat.h>
-@@ -41480,6 +41484,7 @@ else
+@@ -41480,6 +41484,7 @@
  #       include <sys/ioccom.h>
  #       include <netinet/in.h>
  #undef minor_t
 +#       include <net/if.h>	/* IFNAMSIZ */
  #       include <netinet/ip_compat.h>
  #       include <netinet/ip_fil.h>
  #       include <netinet/ip_nat.h>
-@@ -41524,6 +41529,7 @@ _ACEOF
+@@ -41524,6 +41529,7 @@
  	ip_fil_compat.h \
  	ip_fil.h \
  	ip_nat.h \
 +	net/if.h \
  	netinet/ip_compat.h \
  	netinet/ip_fil_compat.h \
  	netinet/ip_fil.h \
-@@ -41553,6 +41559,7 @@ ac_fn_cxx_check_header_compile "$LINENO"
+@@ -41553,6 +41559,7 @@
  #if HAVE_IP_COMPAT_H
  #include <ip_compat.h>
  #elif HAVE_NETINET_IP_COMPAT_H
 +#include <net/if.h>	/* IFNAMSIZ */
  #include <netinet/ip_compat.h>
  #endif
  #if HAVE_IP_FIL_H
+@@ -41616,8 +41623,7 @@
+ 
+ 
+ fi
+-ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6"
+-   "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
++ac_fn_cxx_check_member "$LINENO" "struct natlookup" "nl_realipaddr.in6" "ac_cv_member_struct_natlookup_nl_realipaddr_in6___" "
+ #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
+ #define minor_t fubar
+ #endif