[89648] trunk/dports/net/squid3

[jmr at macports.org]

Revision: 89648
          http://trac.macports.org/changeset/89648
Author:   jmr at macports.org
Date:     2012-02-05 13:11:45 -0800 (Sun, 05 Feb 2012)
Log Message:
-----------
squid3: update to 3.1.19

Modified Paths:
--------------
    trunk/dports/net/squid3/Portfile

Removed Paths:
-------------
    trunk/dports/net/squid3/files/patch-src_store.cc.diff

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2012-02-05 12:41:47 UTC (rev 89647)
+++ trunk/dports/net/squid3/Portfile	2012-02-05 21:11:45 UTC (rev 89648)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            squid3
-version         3.1.18
+version         3.1.19
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      net
 platforms       darwin
@@ -31,20 +31,19 @@
                 ftp://ftp.squid-cache.org/pub/squid/
 
 distname        squid-${version}
-checksums       md5 b53f8fb6e22551c2a7376292df5b6ec7 \
-                sha1 45926da99e3ea8320cb891275738c63b0367eac6 \
-                rmd160 badf72c534ffd05bb6c2884bdcb9d54b15d9dc02
+checksums       md5 9b6ffaf96bee8f05f0085bc6361d7c94 \
+                sha1 fae2ef3d8a994297efe62d504d09e4c79b34db04 \
+                rmd160 47ec0fcf230f47ebc78c61a83721aa624e507a3b
 
 use_bzip2       yes
 patchfiles      patch-cf.data.pre.diff \
                 patch-include_squid_types.h.diff \
                 patch-pam_auth.c.diff \
-                patch-src_ssl_gadgets.cc.diff \
-                patch-src_store.cc.diff
+                patch-src_ssl_gadgets.cc.diff
 
 depends_lib     port:zlib
 
-conflicts       squid
+conflicts       squid squid3-devel
 
 configure.args  --mandir=${prefix}/share/man \
                 --sysconfdir=${prefix}/etc/squid \

Deleted: trunk/dports/net/squid3/files/patch-src_store.cc.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-src_store.cc.diff	2012-02-05 12:41:47 UTC (rev 89647)
+++ trunk/dports/net/squid3/files/patch-src_store.cc.diff	2012-02-05 21:11:45 UTC (rev 89648)
@@ -1,22 +0,0 @@
---- src/store.cc.orig	2011-12-03 17:18:46.000000000 +1100
-+++ src/store.cc	2011-12-06 14:15:54.000000000 +1100
-@@ -368,7 +368,7 @@ StoreEntry::StoreEntry(const char *aUrl,
- 
- #if USE_ADAPTATION
- void
--StoreEntry::deferProducer(const AsyncCall::Pointer &producer)
-+StoreEntry::deferProducer(AsyncCall::Pointer &producer)
- {
-     if (!deferredProducer)
-         deferredProducer = producer;
---- src/Store.h.orig	2011-12-03 17:18:46.000000000 +1100
-+++ src/Store.h	2011-12-06 14:21:26.000000000 +1100
-@@ -191,7 +191,7 @@ public:
- 
- #if USE_ADAPTATION
-     /// call back producer when more buffer space is available
--    void deferProducer(const AsyncCall::Pointer &producer);
-+    void deferProducer(AsyncCall::Pointer &producer);
-     /// calls back producer registered with deferProducer
-     void kickProducer();
- #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120205/15eda944/attachment.html>