<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c563eea55a3b8b484d743a5c64c0aeeba3b8e984">https://github.com/macports/macports-ports/commit/c563eea55a3b8b484d743a5c64c0aeeba3b8e984</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c563eea55a3 squid4: replace with squid5
</span>c563eea55a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c563eea55a3b8b484d743a5c64c0aeeba3b8e984
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Mar 4 16:10:14 2023 +1100
<span style='display:block; white-space:pre;color:#404040;'> squid4: replace with squid5
</span>---
net/squid2/Portfile | 2 +-
net/squid3/Portfile | 2 +-
net/squid4/Portfile | 172 +--------------------
net/squid4/files/include_autoconf.h.ed | 22 ---
.../files/kerberos_ldap_group_Makefile.in.diff | 11 --
net/squid4/files/patch-basic_pam_auth.cc.diff | 14 --
net/squid4/files/patch-cf.data.pre.diff | 11 --
net/squid4/files/patch-compat_types.h.diff | 20 ---
net/squid4/files/snowleopard-bool.diff | 11 --
net/squid5/Portfile | 2 +-
10 files changed, 7 insertions(+), 260 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid2/Portfile b/net/squid2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71df1e1d341..a3e11d9ef4c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ patchfiles patch-cf.data.pre.diff \
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid3 squid4 squid5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid3 squid5
</span>
# replace old config.{guess,sub} with recent versions from automake
depends_build-append port:automake
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid3/Portfile b/net/squid3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9dba95196b4..a40dc67c99a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ platform darwin 10 {
</span> depends_build port:pkgconfig
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid4 squid5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid5
</span>
set pidfile ${prefix}/var/run/squid/squid.pid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/Portfile b/net/squid4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0a0600f611..a1c5940c02b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,177 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name squid4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by squid5
</span> version 4.17
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories net
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description advanced proxy caching server for http, https, ftp, gopher
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Squid is a high-performance proxy caching server for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- web clients, supporting FTP, gopher, and HTTP data \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objects. Unlike traditional caching software, Squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handles all requests in a single, non-blocking, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I/O-driven process. Squid keeps meta data and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- especially hot objects cached in RAM, caches DNS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lookups, supports non-blocking DNS lookups, and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implements negative caching of failed requests. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Squid 4.x is the previous release series, and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- migrating to squid5 is recommended.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.squid-cache.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://www.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://ftp.ring.gr.jp/archives/net/www/squid/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.is.co.za/pub/squid/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp1.cl.squid-cache.org/pub/squid/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.squid-cache.org/Versions/v4/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.squid-cache.org/pub/squid/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname squid-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 47b94b2d27516f1764c9d5dc1b9645e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bbd2ade0960eac70298b78a34bb85cdf6cce617c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cf.data.pre.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-compat_types.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-basic_pam_auth.cc.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kerberos_ldap_group_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 10 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append snowleopard-bool.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:expat port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid3 squid5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --sysconfdir=${prefix}/etc/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --datadir=${prefix}/share/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --localstatedir=${prefix}/var/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --libexecdir=${prefix}/libexec/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-swapdir=${prefix}/var/squid/cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pidfile=${prefix}/var/run/squid/squid.pid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-strict-error-checking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-loadable-modules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-arch-native \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-cppunit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gnugss \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gnutls \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mit-krb5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-heimdal-krb5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-nettle \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-delay-pools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-follow-x-forwarded-for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-zph-qos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-removal-policies \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-storeio=ufs,aufs,diskd,rock \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-log-daemon-helpers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-default-user=squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth-basic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth-digest \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth-negotiate="wrapper" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth-ntlm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Doesn't work and just generates failure messages in the log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-eui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.create yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.name Squid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.netchange yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.executable ${prefix}/sbin/squid -s --foreground
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-add_users squid group=squid home=${prefix}/var/squid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "Before starting $name for the first time, create the cache directories\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-with:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/sbin/squid -s -z --foreground
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Squid 4.x is no longer the current release series. Migrating to squid5\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is recommended. The squid4 port will be marked as replaced by squid5 on\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-around 2022-11-09, at which point upgrading squid4 will automatically\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-install squid5."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -o squid -g squid -m 755 -d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/run/squid ${destroot}${prefix}/var/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/squid/cache ${destroot}${prefix}/var/squid/logs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/etc/squid/squid.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/squid/mime.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/squid/cachemgr.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/squid/errorpage.css
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.keepdirs ${destroot}${prefix}/var/run/squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/squid/cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/squid/logs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Make sure initial conf files are present and setup correctly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f { squid.conf mime.conf cachemgr.conf errorpage.css } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists ${prefix}/etc/squid/${f}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${prefix}/etc/squid/${f}.default \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/etc/squid/${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openssl conflicts gnutls description "Enable SSL/TLS support using OpenSSL" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This release does not work with LibreSSL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #depends_lib-append port:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-append --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset gnutls]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset openssl]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gnutls conflicts openssl description "Enable SSL/TLS support using GnuTLS (experimental)" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/gnutls.pc:gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --without-gnutls
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ipfw_transparent description "Enable transparent proxy support using IPFW" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ipfw-transparent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant kerberos description "Enable MIT kerberos support" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:kerberos5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-auth-negotiate="wrapper" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-mit-krb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-auth-negotiate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ssl_crtd requires openssl description "Enable use of external certificate generator (for SSL-Bump)" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ssl-crtd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.squid-cache.org/Versions/v4/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "squid-(\[0-9.\]+)-RELEASENOTES\\.html"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 2024-03-04
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/include_autoconf.h.ed b/net/squid4/files/include_autoconf.h.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb8da08394b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/include_autoconf.h.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/#define SIZEOF_LONG/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/#define SIZEOF_SIZE_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/#define SIZEOF_VOID_P/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/kerberos_ldap_group_Makefile.in.diff b/net/squid4/files/kerberos_ldap_group_Makefile.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 292f527170b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/kerberos_ldap_group_Makefile.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/acl/external/kerberos_ldap_group/Makefile.in.orig 2018-10-28 07:45:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/acl/external/kerberos_ldap_group/Makefile.in 2018-11-22 13:23:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,7 +650,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WBINFO = @WBINFO@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WIN32_PSAPI = @WIN32_PSAPI@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XMLLIB = @XMLLIB@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--XTRA_LIBS = @XTRA_LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+XTRA_LIBS = @XTRA_LIBS@ -lresolv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XTRA_OBJS = @XTRA_OBJS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abs_builddir = @abs_builddir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- abs_srcdir = @abs_srcdir@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-basic_pam_auth.cc.diff b/net/squid4/files/patch-basic_pam_auth.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a0bd44d0776..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/patch-basic_pam_auth.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/auth/basic/PAM/basic_pam_auth.cc.orig 2018-07-02 13:26:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/auth/basic/PAM/basic_pam_auth.cc 2018-07-22 14:11:40.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,6 +84,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if HAVE_SECURITY_PAM_APPL_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <pam/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* The default PAM service name */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-cf.data.pre.diff b/net/squid4/files/patch-cf.data.pre.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 05ecdc69ce2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/patch-cf.data.pre.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/cf.data.pre.orig 2015-02-18 23:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/cf.data.pre 2015-02-21 20:42:21.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1387,7 +1387,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We strongly recommend the following be uncommented to protect innocent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # web applications running on the proxy server who think the only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # one who can access services on "localhost" is a local user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#http_access deny to_localhost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+http_access deny to_localhost
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-compat_types.h.diff b/net/squid4/files/patch-compat_types.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7ab841f073e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/patch-compat_types.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- compat/types.h.orig 2009-08-04 21:57:45.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ compat/types.h 2009-08-09 11:34:31.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef PRId64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if _SQUID_WINDOWS_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRId64 "I64d"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif SIZEOF_INT64_T > SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif SIZEOF_INT64_T >= SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRId64 "lld"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRId64 "ld"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef PRIu64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if _SQUID_WINDOWS_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRIu64 "I64u"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif SIZEOF_INT64_T > SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif SIZEOF_INT64_T >= SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRIu64 "llu"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PRIu64 "lu"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/snowleopard-bool.diff b/net/squid4/files/snowleopard-bool.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a7ba2a87da..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/files/snowleopard-bool.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/auth/basic/NIS/nis_support.cc.orig 2018-07-02 13:26:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/auth/basic/NIS/nis_support.cc 2018-07-22 14:15:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <rpc/rpc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if _SQUID_FREEBSD_ && !defined(BOOL_DEFINED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef BOOL_DEFINED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define BOOL_DEFINED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid5/Portfile b/net/squid5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ebac1fb328..f66a102a3f2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ platform darwin 10 {
</span> depends_build port:pkgconfig
depends_lib port:expat port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid3 squid4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid3
</span>
compiler.cxx_standard 2011
</pre><pre style='margin:0'>
</pre>