ports/163756: [Maintainer] www/squid31: fix SQUID_ICAP option, integrate additional vendor patches

[Thomas-Martin Seck]

>Number:         163756
>Category:       ports
>Synopsis:       [Maintainer] www/squid31: fix SQUID_ICAP option, integrate additional vendor patches
>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:   Sun Jan 01 19:50:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 8.2-RELEASE amd64
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of Jan 1, 2012.

	
>Description:

Integrate vendor patchset 10415 that fixes compilation when SQUID_ICAP is
selected with 'make config'.

While at it, integrate vendor patches 10417 (improved debug messages) and 10418
(fix for Squid bug 3442), too.

See http://www.squid-cache.org/Versions/v3/3.1/changesets/ for further
details.
	
>How-To-Repeat:
Run 'make config', select SQUID_ICAP and try to build the port.
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
--- Makefile	(.../www/squid31)	(Revision 1979)
+++ Makefile	(.../local/squid31)	(Revision 1979)
@@ -51,6 +51,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	3.1.${SQUID_STABLE_VER}
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://mirrors.ccs.neu.edu/Squid/ \
@@ -81,7 +82,8 @@
 		http://www1.jp.squid-cache.org/%SUBDIR%/ \
 		http://www2.tw.squid-cache.org/%SUBDIR%/
 PATCH_SITE_SUBDIR=	Versions/v3/3.1/changesets
-PATCHFILES=	#empty
+PATCHFILES=	squid-3.1-10415.patch squid-3.1-10417.patch \
+		squid-3.1-10418.patch
 
 MAINTAINER=	tmseck at web.de
 COMMENT=	HTTP Caching Proxy
Index: distinfo
===================================================================
--- distinfo	(.../www/squid31)	(Revision 1979)
+++ distinfo	(.../local/squid31)	(Revision 1979)
@@ -1,2 +1,8 @@
 SHA256 (squid3.1/squid-3.1.18.tar.bz2) = 2f9da30f7aef6950e2b8e3febfe3c4e3986d67fad6c3d5ec87c3315924271937
 SIZE (squid3.1/squid-3.1.18.tar.bz2) = 2510258
+SHA256 (squid3.1/squid-3.1-10415.patch) = d83e591dc773f2acd28ee5c9b247e75b0b59b3506c0ea6a847aeca69f7ef5945
+SIZE (squid3.1/squid-3.1-10415.patch) = 1790
+SHA256 (squid3.1/squid-3.1-10417.patch) = 2428ba95631b692d3042a050d54c11f7869e053b57132e429e3df4f8229e7882
+SIZE (squid3.1/squid-3.1-10417.patch) = 1831
+SHA256 (squid3.1/squid-3.1-10418.patch) = 28dfb6b9057729f79f084d71a813a32504f202bc4951c5ed7a6d6664c4935e16
+SIZE (squid3.1/squid-3.1-10418.patch) = 2493
	


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