[55311] trunk/dports/net
jmr at macports.org
jmr at macports.org
Sat Aug 8 18:47:07 PDT 2009
Revision: 55311
http://trac.macports.org/changeset/55311
Author: jmr at macports.org
Date: 2009-08-08 18:47:06 -0700 (Sat, 08 Aug 2009)
Log Message:
-----------
New port: squid3 (#20519)
Modified Paths:
--------------
trunk/dports/net/squid3/Portfile
trunk/dports/net/squid3/files/patch-cf.data.pre.diff
Added Paths:
-----------
trunk/dports/net/squid3/
trunk/dports/net/squid3/files/patch-include_squid_types.h.diff
Removed Paths:
-------------
trunk/dports/net/squid3/files/patch-configure.diff
Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile 2009-08-08 21:52:26 UTC (rev 55306)
+++ trunk/dports/net/squid3/Portfile 2009-08-09 01:47:06 UTC (rev 55311)
@@ -3,8 +3,8 @@
PortSystem 1.0
-name squid
-version 2.7.STABLE6
+name squid3
+version 3.0.STABLE18
set branch [join [lrange [split ${version} .] 0 1] .]
categories net
platforms darwin
@@ -20,30 +20,27 @@
implements negative caching of failed requests.
homepage http://www.squid-cache.org/
-master_sites http://mirrors.24-7-solutions.net/pub/squid/squid-2/STABLE/ \
- http://mirror.aarnet.edu.au/pub/squid/squid-2/STABLE/ \
- http://mirrors.dotsrc.org/squid/squid-2/STABLE/ \
- ftp://ftp.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid-2/STABLE/ \
- http://ftp.ring.gr.jp/archives/net/www/squid/squid-2/STABLE/ \
- ftp://ftp.is.co.za/pub/squid/squid-2/STABLE/ \
- ftp://ftp1.cl.squid-cache.org/pub/squid/squid-2/STABLE/ \
- http://www.squid-cache.org/Versions/v2/${branch}/ \
- ftp://ftp.squid-cache.org/pub/squid-2/STABLE/
+master_sites http://mirrors.24-7-solutions.net/pub/squid/ \
+ http://mirror.aarnet.edu.au/pub/squid/squid/ \
+ http://www.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid/ \
+ http://ftp.ring.gr.jp/archives/net/www/squid/ \
+ ftp://ftp.is.co.za/pub/squid/ \
+ ftp://ftp1.cl.squid-cache.org/pub/squid/ \
+ http://www.squid-cache.org/Versions/v3/${branch}/ \
+ ftp://ftp.squid-cache.org/pub/squid/
-checksums md5 6de3a6a7a56a7ecae092f2d31a04f039 \
- sha1 b4b323be1ff3617a22070c243b2504f30d6b302d \
- rmd160 d804175b95c6b026abed505b086eeaa2c479d2e2
+distname squid-${version}
+checksums md5 ad1e0bbb424c2f69195ae68b9baa99d6 \
+ sha1 8d7db1cda7595e7e8673e9394009192b5a703cb1 \
+ rmd160 5904724e51f0dec048568c03d244609b964f57c6
use_bzip2 yes
-patchfiles patch-cf.data.pre.diff
+patchfiles patch-cf.data.pre.diff patch-include_squid_types.h.diff
depends_lib port:openssl port:zlib
-platform darwin 9 {
- patchfiles-append patch-configure.diff
-}
-
configure.args --with-pthreads \
+ --enable-shared \
--mandir=${prefix}/share/man \
--sysconfdir=${prefix}/etc/squid \
--datadir=${prefix}/share/squid \
@@ -51,7 +48,10 @@
--with-openssl=${prefix} \
--enable-delay-pools \
--enable-removal-policies \
- --enable-storeio=ufs,aufs,diskd,coss,null
+ --enable-storeio=ufs,aufs,diskd,null \
+ --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
+ --enable-icap-client \
+ --with-default-user=squid
post-configure {
if {[variant_isset universal]} {
system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
@@ -85,7 +85,8 @@
${destroot}${prefix}/var/run/squid ${destroot}${prefix}/var/squid \
${destroot}${prefix}/var/squid/cache ${destroot}${prefix}/var/squid/logs
file delete -force ${destroot}${prefix}/etc/squid/squid.conf \
- ${destroot}${prefix}/etc/squid/mime.conf
+ ${destroot}${prefix}/etc/squid/mime.conf \
+ ${destroot}${prefix}/etc/squid/cachemgr.conf
}
destroot.keepdirs ${destroot}${prefix}/var/run/squid \
${destroot}${prefix}/var/squid/cache \
@@ -93,7 +94,7 @@
post-activate {
# Make sure initial conf files are present and setup correctly
- foreach f { squid.conf mime.conf } {
+ foreach f { squid.conf mime.conf cachemgr.conf } {
if {![file exists ${prefix}/etc/squid/${f}]} {
file copy ${prefix}/etc/squid/${f}.default \
${prefix}/etc/squid/${f}
Modified: trunk/dports/net/squid3/files/patch-cf.data.pre.diff
===================================================================
--- trunk/dports/net/squid/files/patch-cf.data.pre.diff 2009-08-08 21:52:26 UTC (rev 55306)
+++ trunk/dports/net/squid3/files/patch-cf.data.pre.diff 2009-08-09 01:47:06 UTC (rev 55311)
@@ -13,18 +13,3 @@
# Example rule allowing access from your local networks.
# Adapt localnet in the ACL section to list your (internal) IP networks
# from where browsing should be allowed
-@@ -3749,12 +3749,12 @@
-
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: squid
- LOC: Config.effectiveUser
- DOC_START
- If you start Squid as root, it will change its effective/real
- UID/GID to the user specified below. The default is to change
-- to UID to nobody. If you define cache_effective_user, but not
-+ to UID to squid. If you define cache_effective_user, but not
- cache_effective_group, Squid sets the GID to the effective
- user's default group ID (taken from the password file) and
- supplementary group list from the from groups membership of
Deleted: trunk/dports/net/squid3/files/patch-configure.diff
===================================================================
--- trunk/dports/net/squid/files/patch-configure.diff 2009-08-08 21:52:26 UTC (rev 55306)
+++ trunk/dports/net/squid3/files/patch-configure.diff 2009-08-09 01:47:06 UTC (rev 55311)
@@ -1,15 +0,0 @@
---- configure.orig 2008-01-10 23:34:23.000000000 +1100
-+++ configure 2008-01-26 15:32:17.000000000 +1100
-@@ -25837,7 +25837,12 @@
- if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
- perror("getrlimit: RLIMIT_NOFILE");
- } else {
-+#if defined(__APPLE__)
-+ /* asking for more than OPEN_MAX fails on Leopard */
-+ rl.rlim_cur = (OPEN_MAX < rl.rlim_max ? OPEN_MAX : rl.rlim_max);
-+#else
- rl.rlim_cur = rl.rlim_max; /* set it to the max */
-+#endif
- if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
- perror("setrlimit: RLIMIT_NOFILE");
- }
Added: trunk/dports/net/squid3/files/patch-include_squid_types.h.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-include_squid_types.h.diff (rev 0)
+++ trunk/dports/net/squid3/files/patch-include_squid_types.h.diff 2009-08-09 01:47:06 UTC (rev 55311)
@@ -0,0 +1,20 @@
+--- include/squid_types.h.orig 2009-08-04 21:57:45.000000000 +1000
++++ include/squid_types.h 2009-08-09 11:34:31.000000000 +1000
+@@ -86,7 +86,7 @@
+ #ifndef PRId64
+ #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
+ #define PRId64 "I64d"
+-#elif SIZEOF_INT64_T > SIZEOF_LONG
++#elif SIZEOF_INT64_T >= SIZEOF_LONG
+ #define PRId64 "lld"
+ #else
+ #define PRId64 "ld"
+@@ -96,7 +96,7 @@
+ #ifndef PRIu64
+ #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
+ #define PRIu64 "I64u"
+-#elif SIZEOF_INT64_T > SIZEOF_LONG
++#elif SIZEOF_INT64_T >= SIZEOF_LONG
+ #define PRIu64 "llu"
+ #else
+ #define PRIu64 "lu"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090808/c6652bee/attachment-0001.html>
More information about the macports-changes
mailing list