Update to version 20050504. Add support for a standalone mode that

can be used by Apache in proxy mode, adds many ad pattern updates.

4 files changed, 18 insertions, 16 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 1a3c6a374b4..0eb471afcb2 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2005/01/18 02:51:48 simonb Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/04 12:35:54 simonb Exp $
 #
 
-DISTNAME=	adzap-20050106
+DISTNAME=	adzap-20050504
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 38ca3e2fc2c..c277b79051f 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.33 2005/02/24 14:08:27 wiz Exp $
+$NetBSD: distinfo,v 1.34 2005/05/04 12:35:54 simonb Exp $
 
-SHA1 (adzap-20050106.tar.gz) = 1a4f58ce9235796cdede21267219c30dc3514129
-RMD160 (adzap-20050106.tar.gz) = a2238602ba15cd3c11c820e9bb62f33a0f545127
-Size (adzap-20050106.tar.gz) = 48058 bytes
-SHA1 (patch-aa) = 2b83211b9eee28f508bc6ac40575a46c8bbbcc56
-SHA1 (patch-ab) = 7aa67928e6a49bee814a75eac52c58e4ab5eb8eb
+SHA1 (adzap-20050504.tar.gz) = 6a2497a1877ad1c796464c78dc022c5df98eeced
+RMD160 (adzap-20050504.tar.gz) = 9cafd8a16ee53c99d16c0bfd3476b4b871b53493
+Size (adzap-20050504.tar.gz) = 49600 bytes
+SHA1 (patch-aa) = 6bdb5e8d2487a977907d20e0e40afbc900cad919
+SHA1 (patch-ab) = b98776ed6627e743b50cb233f5af0842a92cd6b7
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 3ee4a4d8b2e..455fb0bfc8e 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2003/08/13 03:05:49 simonb Exp $
+$NetBSD: patch-aa,v 1.13 2005/05/04 12:35:54 simonb Exp $
 
---- scripts/wrapzap.orig	Sun Jul 20 21:38:48 2003
+--- scripts/wrapzap.orig	2005-04-07 21:41:33.000000000 +1000
 +++ scripts/wrapzap
-@@ -15,39 +15,9 @@
+@@ -15,40 +15,9 @@
  #	- Cameron Simpson <cs@zip.com.au> 21apr2000
  #
  
@@ -23,6 +23,7 @@ $NetBSD: patch-aa,v 1.12 2003/08/13 03:05:49 simonb Exp $
 -ZAP_MATCH=				# pathname of extra pattern file
 -					# for patterns to use instead of the
 -					# inbuilt pattern list
+-ZAP_NO_CHANGE=				# set to "NULL" is your proxy is Apache2 instead of Squid
 -
 -STUBURL_AD=$ZAP_BASE/ad.gif
 -STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
@@ -43,5 +44,5 @@ $NetBSD: patch-aa,v 1.12 2003/08/13 03:05:49 simonb Exp $
 +   
 +. /etc/adzap.conf
  
- export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH
+ export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH ZAP_NO_CHANGE
  export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUBURL_ADMP3 \
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index e1b2dfe3c94..8cfea1c75ab 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2003/08/13 03:05:50 simonb Exp $
+$NetBSD: patch-ab,v 1.11 2005/05/04 12:35:54 simonb Exp $
 
---- scripts/adzap.conf.orig	Wed Aug 13 12:16:45 2003
-+++ scripts/adzap.conf	Wed Aug 13 12:16:45 2003
-@@ -0,0 +1,34 @@
+--- scripts/adzap.conf.orig	Sat Apr  7 21:41:33 2005
++++ scripts/adzap.conf	Sat Apr  7 21:41:33 2005
+@@ -0,0 +1,35 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -21,6 +21,7 @@ $NetBSD: patch-ab,v 1.10 2003/08/13 03:05:50 simonb Exp $
 +ZAP_MATCH=				# pathname of extra pattern file
 +					# for patterns to use instead of the
 +					# inbuilt pattern list
++ZAP_NO_CHANGE=				# set to "NULL" is your proxy is Apache2 instead of Squid
 +
 +STUBURL_AD=$ZAP_BASE/ad.gif
 +STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif