ports/123432: [Maintainer] www/squid: update to 2.6.STABLE20

[Thomas-Martin Seck]

>Number:         123432
>Category:       ports
>Synopsis:       [Maintainer] www/squid: update to 2.6.STABLE20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 05 19:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of May 5, 2008.

	
>Description:
Update to 2.6.STABLE20.

	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid)	(revision 1363)
+++ Makefile	(.../local/squid)	(revision 1363)
@@ -75,7 +75,7 @@
 #     Enable experimental multicast notification of cachemisses.
 
 PORTNAME=	squid
-PORTVERSION=	2.6.19
+PORTVERSION=	2.6.20
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
@@ -94,7 +94,7 @@
 		http://www1.jp.squid-cache.org/Versions/v2/2.6/ \
 		http://www2.tw.squid-cache.org/Versions/v2/2.6/
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.6.STABLE19
+DISTNAME=	squid-2.6.STABLE20
 DIST_SUBDIR=	squid2.6
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
@@ -112,7 +112,7 @@
 MAINTAINER=	tmseck at web.de
 COMMENT=	HTTP Caching Proxy
 
-CONFLICTS=	squid-2.[^6]*
+CONFLICTS=	squid-2.[^6]* squid-3.* cacheboy-[0-9]*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
Index: distinfo
===================================================================
--- distinfo	(.../www/squid)	(revision 1363)
+++ distinfo	(.../local/squid)	(revision 1363)
@@ -1,3 +1,3 @@
-MD5 (squid2.6/squid-2.6.STABLE19.tar.bz2) = e1f355ab907369903b5e28aff0fe8386
-SHA256 (squid2.6/squid-2.6.STABLE19.tar.bz2) = 018f8f31eb40fff14f4d86bc1a40c18a0ee67d1412316de13f5975df6d2a0178
-SIZE (squid2.6/squid-2.6.STABLE19.tar.bz2) = 1324732
+MD5 (squid2.6/squid-2.6.STABLE20.tar.bz2) = 6e1d87e9ae47f825c814a954a6febc36
+SHA256 (squid2.6/squid-2.6.STABLE20.tar.bz2) = c6f4ceae6f9affd5a7a23746136ee440602a60ecb522d3eeb9cdecc96775ea88
+SIZE (squid2.6/squid-2.6.STABLE20.tar.bz2) = 1292755
Index: files/icap-2.6-bootstrap.patch
===================================================================
--- files/icap-2.6-bootstrap.patch	(.../www/squid)	(revision 1363)
+++ files/icap-2.6-bootstrap.patch	(.../local/squid)	(revision 1363)
@@ -7,10 +7,10 @@
 
 Please see icap-2.6-core.patch for further information.
 
-Patch last updated: 2008-04-02
+Patch last updated: 2008-05-05
 
---- configure.orig	2008-04-02 22:26:33.000000000 +0200
-+++ configure	2008-04-02 22:26:34.000000000 +0200
+--- configure.orig	2008-04-25 21:49:52.000000000 +0200
++++ configure	2008-05-05 20:50:40.000000000 +0200
 @@ -728,6 +728,8 @@
  ENABLE_PINGER_FALSE
  USE_DELAY_POOLS_TRUE
@@ -43,8 +43,8 @@
  
  # Define the identity of the package.
   PACKAGE='squid'
-- VERSION='2.6.STABLE19'
-+ VERSION='2.6.STABLE19+ICAP'
+- VERSION='2.6.STABLE20'
++ VERSION='2.6.STABLE20+ICAP'
  
  
  cat >>confdefs.h <<_ACEOF

	


>Release-Note:
>Audit-Trail:
>Unformatted: