[pkgsrc/pkgsrc-2008Q3]: pkgsrc/www Pullup ticket #2559 - requested by taca

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec687631f7b9
branches:  pkgsrc-2008Q3
changeset: 547844:ec687631f7b9
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Oct 26 14:42:30 2008 +0000

description:
Pullup ticket #2559 - requested by taca
squid26: Fix transparent proxy option
squid27: Fix transparent proxy option
squid30: Fix transparent proxy option

Revisions pulled up:
www/squid/options.mk            1.15 via patch
www/squid26/Makefile            1.3 via patch
www/squid27/Makefile            1.3 via patch
www/squid30/Makefile            1.3 via patch
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Oct 24 14:14:53 UTC 2008

Modified Files:
        pkgsrc/www/squid: options.mk

Log Message:
I forgot to update transparent proxy related options' processing and
these options were no effect.  So, fix  these options' processing.

Noted by Greg Kerr via private mail and much thanks to him.
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Oct 24 14:15:49 UTC 2008

Modified Files:
        pkgsrc/www/squid26: Makefile
        pkgsrc/www/squid27: Makefile
        pkgsrc/www/squid30: Makefile

Log Message:
Bump squid's PKGREVISION to reflect fix of transparent proxy package options.

diffstat:

 www/squid/options.mk |  12 ++++++------
 www/squid26/Makefile |   4 ++--
 www/squid27/Makefile |   3 ++-
 www/squid30/Makefile |   3 ++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diffs (68 lines):

diff -r 71e4176f7805 -r ec687631f7b9 www/squid/options.mk
--- a/www/squid/options.mk      Thu Oct 23 06:54:08 2008 +0000
+++ b/www/squid/options.mk      Sun Oct 26 14:42:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2008/09/12 14:59:52 taca Exp $
+# $NetBSD: options.mk,v 1.14.4.1 2008/10/26 14:42:30 tron Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.squid
 PKG_SUPPORTED_OPTIONS= snmp ssl \
@@ -78,15 +78,15 @@
 
 #
 # squid's code has preference as:
-#      ipf-transparent > pf-transparent > linux-netfilter
+#      squid-ipf > squid-pf > squid-netfilter
 # So, options.mk introduce preference as:
-#      linux-netfilter > pf-transparnet > ipf-transparent
+#      squid-netfilter > squid-pf > squid-ipf
 #
-.if !empty(PKG_OPTIONS:Mlinux-netfilter)
+.if !empty(PKG_OPTIONS:Msquid-netfilter)
 CONFIGURE_ARGS+=       --enable-linux-netfilter
-.elif !empty(PKG_OPTIONS:Mpf-transparent)
+.elif !empty(PKG_OPTIONS:Msquid-pf)
 CONFIGURE_ARGS+=       --enable-pf-transparent
-.elif !empty(PKG_OPTIONS:Mipf-transparent)
+.elif !empty(PKG_OPTIONS:Msquid-ipf)
 CONFIGURE_ARGS+=       --enable-ipf-transparent
 .endif
 
diff -r 71e4176f7805 -r ec687631f7b9 www/squid26/Makefile
--- a/www/squid26/Makefile      Thu Oct 23 06:54:08 2008 +0000
+++ b/www/squid26/Makefile      Sun Oct 26 14:42:30 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:09:19 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $
 
 DISTNAME=      squid-2.6.STABLE21
 PKGNAME=       ${DISTNAME:S/STABLE//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.6/
 EXTRACT_SUFX=  .tar.bz2
diff -r 71e4176f7805 -r ec687631f7b9 www/squid27/Makefile
--- a/www/squid27/Makefile      Thu Oct 23 06:54:08 2008 +0000
+++ b/www/squid27/Makefile      Sun Oct 26 14:42:30 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $
 
 DISTNAME=      squid-2.7.STABLE4
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v2/2.7/
diff -r 71e4176f7805 -r ec687631f7b9 www/squid30/Makefile
--- a/www/squid30/Makefile      Thu Oct 23 06:54:08 2008 +0000
+++ b/www/squid30/Makefile      Sun Oct 26 14:42:30 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/12 15:05:57 taca Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/10/26 14:42:30 tron Exp $
 
 DISTNAME=      squid-3.0.STABLE9
+PKGREVISION=   1
 PKGNAME=       ${DISTNAME:S/STABLE//}
 CATEGORIES=    www
 MASTER_SITES=  http://www.squid-cache.org/Versions/v3/3.0/