Update to version 20020906. Add more ad patterns. Also adds a new

variable (STUBURL_COUNTERHTML); users should update to the latest
adzap.conf as shown in the message.

4 files changed, 17 insertions, 15 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 6656d752fd5..1a6b52e10c6 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2002/07/17 09:49:13 martti Exp $
+# $NetBSD: Makefile,v 1.28 2002/09/07 14:23:25 simonb Exp $
 #
 
-DISTNAME=	adzap-20020717
+DISTNAME=	adzap-20020906
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 02b1f52dd72..e651ddaccda 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2002/07/17 09:49:14 martti Exp $
+$NetBSD: distinfo,v 1.18 2002/09/07 14:23:25 simonb Exp $
 
-SHA1 (adzap-20020717.tar.gz) = a69070acec4bbec2efc5019f1dd84202395d3c34
-Size (adzap-20020717.tar.gz) = 51588 bytes
-SHA1 (patch-aa) = 9b72f0c35753ee3259e37b534aadddac630dd629
-SHA1 (patch-ab) = 8fd469872a1c894f50879150b3dd5df708f440bc
+SHA1 (adzap-20020906.tar.gz) = 7796d515b98d9639bd5e78fff899b69875a66dca
+Size (adzap-20020906.tar.gz) = 58590 bytes
+SHA1 (patch-aa) = c0de599040a3305f8f8b683d2f8dc91cf4e8cf2a
+SHA1 (patch-ab) = ace53d3f8815cf13decfe232e4b907d3a9354b8d
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 667bda1dc95..36ebbe2dd63 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2002/02/11 05:49:35 simonb Exp $
+$NetBSD: patch-aa,v 1.10 2002/09/07 14:23:26 simonb Exp $
 
---- scripts/wrapzap.orig	Thu Jan 10 11:57:21 2002
-+++ scripts/wrapzap	Thu Jan 10 20:39:43 2002
-@@ -16,30 +16,9 @@
+--- scripts/wrapzap.orig	Fri Aug 23 10:32:23 2002
++++ scripts/wrapzap	Tue Sep  3 09:59:48 2002
+@@ -16,31 +16,9 @@
  #
  
  # modify this to match your install
@@ -28,6 +28,7 @@ $NetBSD: patch-aa,v 1.9 2002/02/11 05:49:35 simonb Exp $
 -STUBURL_ADSWF=$ZAP_BASE/ad.swf
 -STUBURL_COUNTER=$ZAP_BASE/counter.gif
 -STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js
+-STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
 +zapper=@@PREFIX@@/libexec/squid_redirect
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index df9028ee111..3562ffb8e80 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2002/01/10 00:48:41 simonb Exp $
+$NetBSD: patch-ab,v 1.8 2002/09/07 14:23:26 simonb Exp $
 
---- scripts/adzap.conf.orig	Fri Nov 23 12:31:35 2001
-+++ scripts/adzap.conf	Fri Nov 23 12:32:56 2001
-@@ -0,0 +1,26 @@
+--- scripts/adzap.conf.orig	Tue Sep  3 09:57:53 2002
++++ scripts/adzap.conf	Tue Sep  3 09:57:53 2002
+@@ -0,0 +1,27 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -27,5 +27,6 @@ $NetBSD: patch-ab,v 1.7 2002/01/10 00:48:41 simonb Exp $
 +STUBURL_ADSWF=$ZAP_BASE/ad.swf
 +STUBURL_COUNTER=$ZAP_BASE/counter.gif
 +STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js
++STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 +STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js