<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/750edbb18536c25ffc2d015bebe1dc3d12be8536">https://github.com/macports/macports-ports/commit/750edbb18536c25ffc2d015bebe1dc3d12be8536</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 750edbb squid: rename to squid2
</span>750edbb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 750edbb18536c25ffc2d015bebe1dc3d12be8536
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jul 22 13:46:55 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> squid: rename to squid2
</span>---
net/squid/Portfile | 120 +--------------------
net/{squid => squid2}/Portfile | 11 +-
net/{squid => squid2}/files/include_autoconf.h.ed | 0
net/{squid => squid2}/files/patch-cf.data.pre.diff | 0
net/{squid => squid2}/files/patch-configure.diff | 0
net/{squid => squid2}/files/patch-pam_auth.c.diff | 0
.../files/src__ssl_support.c.diff | 0
net/squid3/Portfile | 2 +-
8 files changed, 11 insertions(+), 122 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/Portfile b/net/squid/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c23357e..74c6e19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,124 +1,10 @@
</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 squid
version 2.7.STABLE9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by squid2
</span> categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><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;'>-
</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/v2/${branch}/ \
</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;'>-checksums md5 3c6642c85470b1079207d43bba25a819 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 bd389da9b74fd338e358f6b3f83bd3a1ed4d4f6f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bfa7c3dc3ede68646603f3379de35f44d7d8e97d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</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-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pam_auth.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src__ssl_support.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --with-pthreads \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --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;'>- --enable-delay-pools \
</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,coss,null \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth=negotiate,ntlm,digest,basic \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-negotiate-auth-helpers=squid_kerb_auth \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ntlm-auth-helpers=SMB,fakeauth,no_check \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-digest-auth-helpers=eDirectory,ldap,password \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-basic-auth-helpers=DB,LDAP,MSNT,NCSA,PAM,POP3,SASL,SMB,YP,getpwnam,multi-domain-NTLM,squid_radius_auth
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ed - ${worksrcpath}/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;'>-set pidfile ${prefix}/var/run/squid/squid.pid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args DEFAULT_PID_FILE=${pidfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</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.pidfile auto ${pidfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cd ${prefix}/var/squid" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${prefix}/sbin/squid -s -z" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "fi" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/sbin/squid -s"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cd ${prefix}/var/squid" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/sbin/squid -k shutdown" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "while ${prefix}/sbin/squid -k check; do" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " sleep 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "done"
</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;'>-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/msntauth.conf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/etc/squid/cachemgr.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/squid/cachemgr.conf.default
</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 msntauth.conf } {
</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 description "Enable SSL/TLS support using OpenSSL" {
</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;'>- configure.args-append --with-openssl=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ssl
</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;'>-default_variants +openssl
</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/v2/${branch}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex squid-(${branch}\\.STABLE\[0-9\\.\]+)-RELEASENOTES
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/Portfile b/net/squid2/Portfile
</span>similarity index 93%
copy from net/squid/Portfile
copy to net/squid2/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index c23357e..9718894 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid/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;'>@@ -2,9 +2,8 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name squid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name squid2
</span> version 2.7.STABLE9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +17,10 @@ long_description Squid is a high-performance proxy caching server for \
</span> I/O-driven process. Squid keeps meta data and \
especially hot objects cached in RAM, caches DNS \
lookups, supports non-blocking DNS lookups, and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implements negative caching of failed requests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implements negative caching of failed requests. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Squid 2.x is an old release series, which is mostly \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ obsolete but still has a few features that have not \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yet been ported to 3.x or 4.x.
</span>
homepage http://www.squid-cache.org/
master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,6 +31,8 @@ master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
</span> http://www.squid-cache.org/Versions/v2/${branch}/ \
ftp://ftp.squid-cache.org/pub/squid/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+distname squid-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir squid
</span> checksums md5 3c6642c85470b1079207d43bba25a819 \
sha1 bd389da9b74fd338e358f6b3f83bd3a1ed4d4f6f \
rmd160 bfa7c3dc3ede68646603f3379de35f44d7d8e97d
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +70,6 @@ post-configure {
</span> set pidfile ${prefix}/var/run/squid/squid.pid
build.args DEFAULT_PID_FILE=${pidfile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span>
startupitem.create yes
startupitem.name Squid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/files/include_autoconf.h.ed b/net/squid2/files/include_autoconf.h.ed
</span>similarity index 100%
rename from net/squid/files/include_autoconf.h.ed
rename to net/squid2/files/include_autoconf.h.ed
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/files/patch-cf.data.pre.diff b/net/squid2/files/patch-cf.data.pre.diff
</span>similarity index 100%
rename from net/squid/files/patch-cf.data.pre.diff
rename to net/squid2/files/patch-cf.data.pre.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/files/patch-configure.diff b/net/squid2/files/patch-configure.diff
</span>similarity index 100%
rename from net/squid/files/patch-configure.diff
rename to net/squid2/files/patch-configure.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/files/patch-pam_auth.c.diff b/net/squid2/files/patch-pam_auth.c.diff
</span>similarity index 100%
rename from net/squid/files/patch-pam_auth.c.diff
rename to net/squid2/files/patch-pam_auth.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid/files/src__ssl_support.c.diff b/net/squid2/files/src__ssl_support.c.diff
</span>similarity index 100%
rename from net/squid/files/src__ssl_support.c.diff
rename to net/squid2/files/src__ssl_support.c.diff
<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 5c74b9e..d33a452 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;'>@@ -45,7 +45,7 @@ platform darwin 10 {
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2
</span>
set pidfile ${prefix}/var/run/squid/squid.pid
</pre><pre style='margin:0'>
</pre>