ports/64385: [Maintainer] www/squid: integrate vendor patch and minor fixes

[Thomas-Martin Seck]

>Number:         64385
>Category:       ports
>Synopsis:       [Maintainer] www/squid: integrate vendor patch and minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 17 10:50:26 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Thomas-Martin Seck
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
a private site in Germany
>Environment:
FreeBSD ports collection as of Mar 17, 2004.

	
>Description:
- Add a vendor patch, see
  http://www.squid-cache.org/Versions/v2/2.5/bugs/squid-2.5.STABLE5-helper_warning
  for details
- fix options parser to make a default-to-on option actually work
  in the PACKAGE_BUILDING and BATCH cases
- use IGNORE instead of .error
- bump PORTREVISION
	
>How-To-Repeat:
	
>Fix:
Apply this patch:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/squid/Makefile,v
retrieving revision 1.116
diff -u -u -r1.116 Makefile
--- Makefile	17 Mar 2004 07:06:23 -0000	1.116
+++ Makefile	17 Mar 2004 18:41:41 -0000
@@ -29,6 +29,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -42,7 +43,8 @@
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
 PATCHFILES=	squid-2.5.STABLE5-ntlm_assert.patch \
-		squid-2.5.STABLE5-ldap.patch
+		squid-2.5.STABLE5-ldap.patch \
+		squid-2.5.STABLE5-helper_warning.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck at netcologne.de
@@ -163,7 +165,7 @@
 .if defined(WITHOUT_SQUID_WCCP)
 CONFIGURE_ARGS+=	--disable-wccp
 .endif
-.if defined(WITH_SQUID_UNDERSCORES)
+.if !defined(WITHOUT_SQUID_UNDERSCORES)
 CONFIGURE_ARGS+=	--enable-underscores
 .endif
 .if defined(WITHOUT_SQUID_CHECK_HOSTNAME)
@@ -188,7 +190,7 @@
 # on 5.[0-2] systems instead, go on, I will integrate your patch.
 CONFIGURE_ARGS+=	--enable-pf-transparent
 .else
-.error WITH_SQUID_PF only works on systems where pf is part of the base system.
+IGNORE=	WITH_SQUID_PF only works on systems where pf is part of the base system
 .endif
 .endif
 .if defined(WITH_SQUID_FOLLOW_XFF)
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/www/squid/distinfo,v
retrieving revision 1.82
diff -u -u -r1.82 distinfo
--- distinfo	17 Mar 2004 07:06:23 -0000	1.82
+++ distinfo	17 Mar 2004 18:27:49 -0000
@@ -4,3 +4,5 @@
 SIZE (squid2.5/squid-2.5.STABLE5-ntlm_assert.patch) = 545
 MD5 (squid2.5/squid-2.5.STABLE5-ldap.patch) = 81bdcaf96390eab1655fd8d65cf607ed
 SIZE (squid2.5/squid-2.5.STABLE5-ldap.patch) = 6245
+MD5 (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = f384daa03a07a4c99e84c922d9860524
+SIZE (squid2.5/squid-2.5.STABLE5-helper_warning.patch) = 3302
>Release-Note:
>Audit-Trail:
>Unformatted: