diff --git a/www/squid/Makefile b/www/squid/Makefile
index 253b7c629874..8e69f05dd578 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,279 +1,282 @@
 PORTNAME=	squid
-DISTVERSION=	7.3
-PORTREVISION=	2
+DISTVERSION=	7.4
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}-cache/${PORTNAME}/releases/download/${PORTNAME:tu}_${DISTVERSION:S|.|_|g}/
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	HTTP Caching Proxy
 WWW=		https://www.squid-cache.org/ \
 		https://github.com/squid-cache/squid/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++17-lang cpe gmake localbase:ldflags perl5 \
 		pkgconfig shebangfix tar:xz
 CPE_VENDOR=	squid-cache
 USE_RC_SUBR=	squid
 
 SHEBANG_FILES=	contrib/*.pl scripts/*.pl tools/*.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin \
 		--datadir=${ETCDIR} \
 		--disable-arch-native \
 		--disable-epoll \
 		--disable-strict-error-checking \
 		--enable-build-info \
 		--enable-removal-policies="lru heap" \
 		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=/var \
 		--sbindir=${PREFIX}/sbin \
 		--sysconfdir=${ETCDIR} \
 		--with-default-user=squid \
 		--with-included-ltdl \
 		--with-logdir=/var/log/squid \
 		--with-pidfile=/var/run/squid/squid.pid \
 		--with-swapdir=/var/squid/cache \
 		--without-cap \
 		--without-gnutls \
 		--without-netfilter-conntrack \
 		--without-systemd
 
 CONFLICTS=	squid-devel
 
 SUB_FILES+=	900.squid-rotate-log pkg-install pkg-message
 
 USERS=		squid
 GROUPS=		squid
 
 .if !defined(SQUID_CONFIGURE_ARGS) || \
 	${SQUID_CONFIGURE_ARGS:M*--disable-unlinkd*} == ""
 PLIST_SUB+=	UNLINKD=""
 .else
 PLIST_SUB+=	UNLINKD="@comment "
 .endif
 PORTDOCS=	${MYDOCS:T}
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		ARP_ACL CACHE_DIGESTS DEBUG DELAY_POOLS DOCS ECAP \
 			EXAMPLES FOLLOW_XFF FS_AUFS FS_DISKD FS_ROCK HTCP ICAP \
 			ICMP IPV6 KQUEUE LARGEFILE LAX_HTTP NETTLE SNMP SSL \
 			SSL_CRTD STACKTRACES TDB VIA_DB WCCP WCCPV2
 OPTIONS_DEFAULT=	ARP_ACL AUTH_NIS CACHE_DIGESTS DELAY_POOLS FOLLOW_XFF \
 			FS_AUFS FS_DISKD FS_ROCK GSSAPI_BASE HTCP ICAP ICMP \
 			KQUEUE LARGEFILE LAX_HTTP SNMP SSL SSL_CRTD TP_IPFW \
 			VIA_DB WCCP WCCPV2
 OPTIONS_GROUP=		AUTH
 OPTIONS_GROUP_AUTH=	AUTH_LDAP AUTH_NIS AUTH_SASL AUTH_SMB AUTH_SQL
 OPTIONS_RADIO=		FW
 OPTIONS_RADIO_FW=	TP_IPF TP_IPFW TP_PF
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 OPTIONS_SUB=		yes
 
 ARP_ACL_DESC=		ARP/MAC/EUI based authentification
 AUTH_DESC=		Authentication helpers
 AUTH_LDAP_DESC=		Install LDAP authentication helpers
 AUTH_NIS_DESC=		Install NIS/YP authentication helpers
 AUTH_SASL_DESC=		Install SASL authentication helpers
 AUTH_SMB_DESC=		Install SMB auth. helpers (req. Samba)
 AUTH_SQL_DESC=		Install SQL based auth
 CACHE_DIGESTS_DESC=	Use cache digests
 DEBUG_DESC=		Build with extended debugging support
 DELAY_POOLS_DESC=	Delay pools (bandwidth limiting)
 ECAP_DESC=		Loadable content adaptation modules
 FOLLOW_XFF_DESC=	Support for the X-Following-For header
 FS_AUFS_DESC=		AUFS (threaded-io) support
 FS_DISKD_DESC=		DISKD storage engine controlled by separate service
 FS_ROCK_DESC=		ROCK storage engine
 HTCP_DESC=		HTCP support
 ICAP_DESC=		the ICAP client
 ICMP_DESC=		ICMP pinging and network measurement
 KQUEUE_DESC=		Kqueue(2) support
 LARGEFILE_DESC=		Support large (>2GB) cache and log files
 LAX_HTTP_DESC=		Do not enforce strict HTTP compliance
 NETTLE_DESC=		Nettle MD5 algorithm support
 SNMP_DESC=		SNMP support
 SSL_CRTD_DESC=		Use ssl_crtd to handle SSL cert requests
 SSL_DESC=		SSL gatewaying support
 STACKTRACES_DESC=	Enable automatic backtraces on fatal errors
 TDB_DESC=		TrivialDB support required for session and time quota external helpers
 TP_IPFW_DESC=		Transparent proxying with IPFW
 TP_IPF_DESC=		Transparent proxying with IPFilter
 TP_PF_DESC=		Transparent proxying with PF
 VIA_DB_DESC=		Forward/Via database
 WCCPV2_DESC=		Web Cache Coordination Protocol v2
 WCCP_DESC=		Web Cache Coordination Protocol
 
 ARP_ACL_CONFIGURE_ENABLE=	eui
 AUTH_LDAP_USES=			ldap
 AUTH_LDAP_CONFIGURE_WITH=	ldap
 AUTH_LDAP_VARS=			BASIC_AUTH+=LDAP \
 				DIGEST_AUTH+="eDirectory LDAP" \
 				EXTERNAL_ACL+="LDAP_group eDirectory_userip"
 AUTH_SASL_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
 AUTH_SASL_VARS=			BASIC_AUTH+=SASL
 AUTH_SMB_USES=			samba:run
 AUTH_SMB_VARS=			BASIC_AUTH+=SMB \
 				EXTERNAL_ACL+=wbinfo_group
 AUTH_SQL_RUN_DEPENDS=		p5-DBI>=1.08:databases/p5-DBI
 AUTH_SQL_VARS=			EXTERNAL_ACL+=SQL_session
 CACHE_DIGESTS_CONFIGURE_ENABLE=	cache-digests
 DELAY_POOLS_CONFIGURE_ENABLE=	delay-pools
 ECAP_LIB_DEPENDS=		libecap.so:www/libecap
 ECAP_CONFIGURE_ENABLE=		ecap
 FOLLOW_XFF_CONFIGURE_ENABLE=	follow-x-forwarded-for
 FS_AUFS_CONFIGURE_WITH=		pthreads
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS,
 # e.g. SQUID_CONFIGURE_ARGS=--with-aufs-threads=N
 FS_AUFS_LDFLAGS=		-pthread
 FS_AUFS_VARS=			DISKIO_MODULES+=DiskThreads \
 				STORAGE_SCHEMES+=aufs
 FS_DISKD_VARS=			DISKIO_MODULES+=DiskDaemon \
 				STORAGE_SCHEMES+=diskd
 FS_ROCK_VARS=			STORAGE_SCHEMES+=rock
 GSSAPI_BASE_USES=		gssapi
-GSSAPI_BASE_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
 .if exists(/usr/libdata/pkgconfig/mit-krb5.pc)
-GSSAPI_BASE_CONFIGURE_ON+=	--with-mit-krb5=${GSSAPIBASEDIR}
+GSSAPI_BASE_CONFIGURE_ON=	--with-mit-krb5=${GSSAPIBASEDIR} \
+				--without-heimdal-krb5
+GSSAPI_BASE_CONFIGURE_ENV=	LIBMIT_KRB5_CFLAGS="${GSSAPICPPFLAGS}" \
+				LIBMIT_KRB5_LIBS="${GSSAPILIBS}"
 .else
-GSSAPI_BASE_CONFIGURE_ON+=	--with-heimdal-krb5=${GSSAPIBASEDIR} \
+GSSAPI_BASE_CONFIGURE_ON=	--with-heimdal-krb5=${GSSAPIBASEDIR} \
 				--without-mit-krb5
+GSSAPI_BASE_CONFIGURE_ENV=	LIBHEIMDAL_KRB5_CFLAGS="${GSSAPICPPFLAGS}" \
+				LIBHEIMDAL_KRB5_LIBS="${GSSAPILIBS}"
 .endif
 GSSAPI_BASE_PLIST_SUB=		AUTH_KERB=""
 GSSAPI_HEIMDAL_USES=		gssapi:heimdal
-GSSAPI_HEIMDAL_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				--with-heimdal-krb5=${GSSAPIBASEDIR} \
-				--without-mit-krb5 \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
+GSSAPI_HEIMDAL_CONFIGURE_ON=	--with-heimdal-krb5=yes \
+				--without-mit-krb5
 GSSAPI_HEIMDAL_PLIST_SUB=	AUTH_KERB=""
 GSSAPI_MIT_USES=		gssapi:mit
-GSSAPI_MIT_CONFIGURE_ON=	${GSSAPI_CONFIGURE_ARGS} \
-				--with-mit-krb5=${GSSAPIBASEDIR} \
-				krb5_config=${GSSAPIBASEDIR}/bin/krb5-config
+GSSAPI_MIT_CONFIGURE_ON=	--with-mit-krb5=yes \
+				--without-heimdal-krb5
 GSSAPI_MIT_PLIST_SUB=		AUTH_KERB=""
 GSSAPI_NONE_CONFIGURE_ON=	--without-gss \
 				--without-heimdal-krb5 \
 				--without-mit-krb5
 HTCP_CONFIGURE_ENABLE=		htcp
 ICAP_CONFIGURE_ENABLE=		icap-client
 ICMP_CONFIGURE_ENABLE=		icmp
 IPV6_CONFIGURE_ENABLE=		ipv6
 KQUEUE_CONFIGURE_ENABLE=	kqueue
 LARGEFILE_CONFIGURE_WITH=	large-files
 LAX_HTTP_CONFIGURE_ENABLE=	http-violations
 NETTLE_LIB_DEPENDS=		libnettle.so:security/nettle
 NETTLE_CONFIGURE_WITH=		nettle
 SNMP_CONFIGURE_ENABLE=		snmp
 SSL_USES=			ssl
 SSL_CONFIGURE_ON=		--enable-security-cert-generators="file" \
 				--with-openssl \
 				LIBOPENSSL_CFLAGS=-I${OPENSSLINC} \
 				LIBOPENSSL_LIBS="-lcrypto -lssl"
 SSL_CONFIGURE_ENABLE=		ssl
 SSL_CRTD_IMPLIES=		SSL
 SSL_CRTD_CONFIGURE_ENABLE=	ssl-crtd
 STACKTRACES_LIB_DEPENDS=	libunwind.so:devel/libunwind
 STACKTRACES_CONFIGURE_ENABLE=	stacktraces
 STACKTRACES_CFLAGS=		-g
 STACKTRACES_LDFLAGS=		-lunwind
 STACKTRACES_EXTRA_PATCHES=	${FILESDIR}/extra-patch-gen-stacktrace
 STACKTRACES_VARS=		STRIP=""
 TDB_LIB_DEPENDS=		libtdb.so:${SAMBA_TDB_PORT}
 TDB_USES=			samba:env
 TDB_CONFIGURE_WITH=		tdb
 TDB_VARS=			EXTERNAL_ACL+="time_quota session"
 TP_IPFW_CONFIGURE_ENABLE=	ipfw-transparent
 TP_IPF_CONFIGURE_ENABLE=	ipf-transparent
 TP_PF_CONFIGURE_ENABLE=		pf-transparent
 TP_PF_CONFIGURE_WITH=		nat-devpf
 VIA_DB_CONFIGURE_ENABLE=	forw-via-db
 WCCPV2_CONFIGURE_ENABLE=	wccpv2
 WCCP_CONFIGURE_ENABLE=		wccp
 
 MYDOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
 
 change_files=	ChangeLog errors/Makefile.am errors/Makefile.in src/Makefile.am \
 		src/Makefile.in src/cf_gen.cc src/squid.8.in \
 		test-suite/Makefile.in test-suite/Makefile.am
 
 .include <bsd.port.options.mk>
 
 # Authentication methods and modules:
 BASIC_AUTH+=	DB NCSA PAM POP3 RADIUS fake getpwnam
 DIGEST_AUTH+=	file
 EXTERNAL_ACL+=	file_userip unix_group delayer
 
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if ${PORT_OPTIONS:MAUTH_NIS} && !defined(NO_NIS) && !defined(WITHOUT_NIS)
 BASIC_AUTH+=	NIS
 CPPFLAGS+=	-DBOOL_DEFINED
 .endif
 
 # POLA: allow the old global make.conf(5) (pre src.conf(5)) defines, too:
 .if ${PORT_OPTIONS:MGSSAPI_NONE} || defined(NO_KERBEROS) || \
 	defined(WITHOUT_KERBEROS)
 NEGOTIATE_AUTH=	none
 PLIST_SUB+=	AUTH_KERB="@comment "
 .else
 # The kerberos_ldap_group external helper also depends on LDAP and SASL:
 # The kerberos_sid_group external helper depends on kerberos_ldap_group meanwhile
 . if ${PORT_OPTIONS:MAUTH_LDAP} && ${PORT_OPTIONS:MAUTH_SASL}
 EXTERNAL_ACL+=	kerberos_ldap_group kerberos_sid_group
 . endif
 NEGOTIATE_AUTH=	kerberos wrapper
 .endif
 
 # Storage schemes:
 STORAGE_SCHEMES+=	ufs
 DISKIO_MODULES+=	AIO Blocking IpcIo Mmapped
 
 CONFIGURE_ARGS+=	--enable-auth-basic="${BASIC_AUTH}" \
 			--enable-auth-digest="${DIGEST_AUTH}" \
 			--enable-auth-negotiate="${NEGOTIATE_AUTH}" \
 			--enable-auth-ntlm="fake" \
 			--enable-disk-io="${DISKIO_MODULES}" \
 			--enable-external-acl-helpers="${EXTERNAL_ACL}" \
 			--enable-log-daemon-helpers="file DB" \
 			--enable-security-cert-validators="fake" \
 			--enable-storeid-rewrite-helpers="file" \
 			--enable-storeio="${STORAGE_SCHEMES}" \
 			--enable-url-rewrite-helpers="fake LFS"
 # Other options set via 'make config':
 
 .if ${PORT_OPTIONS:MDEBUG} || defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--disable-optimizations
 WITH_DEBUG?=		yes
 .endif
 
 # Finally, add additional user specified configuration options:
 CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} \
 		-e 's|\.conf\.default|.conf.sample|' \
 		-e 's|)\.default|).sample|' \
 		${change_files})
 	@(cd ${WRKSRC} && ${MV} src/mime.conf.default src/mime.conf.sample)
 
 post-patch-IPV6-off:
 	@${REINPLACE_CMD} -E -e's| ::1$$||' -e's| ::1?/128||g' \
 		-e'/acl localnet src f[ce][08]0::/d' \
 		-e's| 2001:DB8::[^[:space:]]+$$||' \
 		-e'/tcp_outgoing_address 2001:db8::/d' \
 		${WRKSRC}/src/cf.data.pre
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly \
-		  ${STAGEDIR}${EXAMPLESDIR} \
-		  ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly
 	${INSTALL_SCRIPT} ${WRKDIR}/900.squid-rotate-log \
 		${STAGEDIR}${PREFIX}/etc/periodic/weekly
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/auth/basic/DB/passwd.sql \
 		${STAGEDIR}${EXAMPLESDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/www/squid/distinfo b/www/squid/distinfo
index f30455af983d..c75a21e8fc90 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1761688531
-SHA256 (squid-7.3.tar.xz) = dadc2a9a3926ce1b3babeaa7a7d7b21cbb089025876daa3f5c19e7eb6391ddcd
-SIZE (squid-7.3.tar.xz) = 2441828
+TIMESTAMP = 1769176987
+SHA256 (squid-7.4.tar.xz) = e31976edd755c295bd5842a349c9c7dad16a683d066337cc09033c1302b4fed4
+SIZE (squid-7.4.tar.xz) = 2441824
diff --git a/www/squid/files/patch-configure b/www/squid/files/patch-configure
index 029b914fd6be..d3d51f3e4145 100644
--- a/www/squid/files/patch-configure
+++ b/www/squid/files/patch-configure
@@ -1,161 +1,161 @@
---- configure.orig	2025-10-28 20:25:31 UTC
+--- configure.orig	2026-01-20 21:46:17 UTC
 +++ configure
-@@ -29214,7 +29214,14 @@ fi
+@@ -29211,7 +29211,14 @@ fi
  
  fi
  
 -  ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa" "ac_cv_member_struct_arpreq_arp_pa" "
 +if test "x$ac_cv_header_sys_socket_h" = xyes
 +then :
 +  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
 +
 +fi
 +
 +
 +  ac_fn_cxx_check_member "$LINENO" "struct arpreq" "arp_pa.sa_family" "ac_cv_member_struct_arpreq_arp_pa" "
  #if HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
-@@ -32420,15 +32427,15 @@ then :
+@@ -32417,15 +32424,15 @@ then :
        with_mit_krb5=yes
        if test -d "$withval/lib64"
  then :
--  LIB_KRB5_PATH+="-L$withval/lib64"
-+  LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib64"
+-  LIBMIT_KRB5_PATH+="-L$withval/lib64"
++  LIBMIT_KRB5_PATH="$LIBMIT_KRB5_PATH -L$withval/lib64"
  fi
        if test -d "$withval/lib"
  then :
--  LIB_KRB5_PATH+="-L$withval/lib"
-+  LIBMIT_KRB5_LIBS="$LIBMIT_KRB5_LIBS -L$withval/lib"
+-  LIBMIT_KRB5_PATH+="-L$withval/lib"
++  LIBMIT_KRB5_PATH="$LIBMIT_KRB5_PATH -L$withval/lib"
  fi
        if test -d "$withval/include"
  then :
--  LIB_KRB5_CFLAGS+="-I$withval/include"
+-  LIBMIT_KRB5_CFLAGS+="-I$withval/include"
 +  LIBMIT_KRB5_CFLAGS="$LIBMIT_KRB5_CFLAGS -I$withval/include"
  fi
       ;;
  esac
-@@ -33791,9 +33798,6 @@ else $as_nop
+@@ -33669,9 +33676,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -33871,9 +33875,6 @@ else $as_nop
+@@ -33749,9 +33753,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -35197,9 +35198,6 @@ else $as_nop
+@@ -35075,9 +35076,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -35277,9 +35275,6 @@ else $as_nop
+@@ -35155,9 +35153,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -35530,15 +35525,15 @@ then :
+@@ -35408,15 +35403,15 @@ then :
        with_heimdal_krb5=yes
        if test -d "$withval/lib64"
  then :
 -  LIBHEIMDAL_KRB5_PATH+="-L$withval/lib64"
-+  LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib64"
++  LIBHEIMDAL_KRB5_PATH="$LIBHEIMDAL_KRB5_PATH -L$withval/lib64"
  fi
        if test -d "$withval/lib"
  then :
 -  LIBHEIMDAL_KRB5_PATH+="-L$withval/lib"
-+  LIBHEIMDAL_KRB5_LIBS="$LIBHEIMDAL_KRB5_LIBS -L$withval/lib"
++  LIBHEIMDAL_KRB5_PATH="$LIBHEIMDAL_KRB5_PATH -L$withval/lib"
  fi
        if test -d "$withval/include"
  then :
 -  LIBHEIMDAL_KRB5_CFLAGS+="-I$withval/include"
 +  LIBHEIMDAL_KRB5_CFLAGS="$LIBHEIMDAL_KRB5_CFLAGS -I$withval/include"
  fi
       ;;
  esac
-@@ -36777,9 +36772,6 @@ else $as_nop
+@@ -36680,9 +36675,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -36857,9 +36849,6 @@ else $as_nop
+@@ -36760,9 +36752,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -37250,9 +37239,6 @@ else $as_nop
+@@ -37153,9 +37142,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -37329,9 +37315,6 @@ else $as_nop
+@@ -37232,9 +37218,6 @@ else $as_nop
  #elif HAVE_GSSAPI_H
  #include <gssapi.h>
  #endif
 -#if HAVE_GSSAPI_GSSAPI_KRB5_H
 -#include <gssapi/gssapi_krb5.h>
 -#endif
  #if HAVE_GSSAPI_GSSAPI_GENERIC_H
  #include <gssapi/gssapi_generic.h>
  #endif
-@@ -40801,7 +40784,7 @@ BUILD_HELPER="NIS"
+@@ -40704,7 +40687,7 @@ BUILD_HELPER="NIS"
  ##
  
  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=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
-@@ -47289,6 +47272,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
+@@ -47192,6 +47175,7 @@ ac_fn_cxx_check_type "$LINENO" "cpu_set_t" "ac_cv_type
  
  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
  
-@@ -49806,6 +49790,7 @@ else $as_nop
+@@ -49709,6 +49693,7 @@ else $as_nop
  #       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>