Update to version 20060414:

 - Add more ad patterns.
 - Add ADJSTEXT and ADHTMLTEXT zap classes.

Note: adds the STUBURL_ADJSTEXT and STUBURL_ADHTMLTEXT variables; users
should update to the latest adzap.conf as shown in the install message.

4 files changed, 19 insertions, 15 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 691568016a8..1155d74810f 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2006/02/13 23:44:21 simonb Exp $
+# $NetBSD: Makefile,v 1.57 2006/04/17 08:56:08 simonb Exp $
 #
 
-DISTNAME=	adzap-20060203
+DISTNAME=	adzap-20060414
 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 637ffc2feb7..cd9b6ea8e9a 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.38 2006/02/13 23:44:21 simonb Exp $
+$NetBSD: distinfo,v 1.39 2006/04/17 08:56:08 simonb Exp $
 
-SHA1 (adzap-20060203.tar.gz) = e07969281065c12dae1e69d6a8344187c8890caa
-RMD160 (adzap-20060203.tar.gz) = 3536ee82d4c76a4a4ab9c07a5865db2a4bbb7240
-Size (adzap-20060203.tar.gz) = 52728 bytes
-SHA1 (patch-aa) = 4e529b73962112d48e2a28f33257a83845ca5180
-SHA1 (patch-ab) = 3e4cbc4ce1227f892981ef027e7ee3b83ceb3b83
+SHA1 (adzap-20060414.tar.gz) = 396836b79279a6a085744f527dfe1fe44738eb22
+RMD160 (adzap-20060414.tar.gz) = fd41fed3c246e7bfa26eb1f428702e6f773d9ba3
+Size (adzap-20060414.tar.gz) = 99457 bytes
+SHA1 (patch-aa) = 3837d35d3a02b405010ff6a7b213c12400d0800b
+SHA1 (patch-ab) = 840c8b7b8adfa6f324127a7a22204a7a7166a302
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 05a44ab2b56..058dad41324 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2005/11/18 01:06:27 simonb Exp $
+$NetBSD: patch-aa,v 1.15 2006/04/17 08:56:09 simonb Exp $
 
---- scripts/wrapzap.orig	Fri Nov 18 11:53:35 2005
+--- scripts/wrapzap.orig	2006-03-25 09:03:55.000000000 +1100
 +++ scripts/wrapzap
-@@ -15,41 +15,9 @@
+@@ -15,43 +15,9 @@
  #	- Cameron Simpson <cs@zip.com.au> 21apr2000
  #
  
@@ -29,7 +29,9 @@ $NetBSD: patch-aa,v 1.14 2005/11/18 01:06:27 simonb Exp $
 -STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 -STUBURL_ADBG=$ZAP_BASE/adbg.gif
 -STUBURL_ADJS=$ZAP_BASE/no-op.js
+-STUBURL_ADJSTEXT=
 -STUBURL_ADHTML=$ZAP_BASE/no-op.html
+-STUBURL_ADHTMLTEXT=
 -STUBURL_ADMP3=$ZAP_BASE/ad.mp3
 -STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
 -STUBURL_ADSWF=$ZAP_BASE/ad.swf
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 05028b5e2e3..dc041d1ec84 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2005/11/18 01:06:27 simonb Exp $
+$NetBSD: patch-ab,v 1.13 2006/04/17 08:56:09 simonb Exp $
 
---- scripts/adzap.conf.orig	Fri Nov 18 11:53:35 2005
-+++ scripts/adzap.conf	Fri Nov 18 11:53:35 2005
-@@ -0,0 +1,36 @@
+--- scripts/adzap.conf.orig	Mon Apr 17 08:45:56 2006
++++ scripts/adzap.conf	Mon Apr 17 08:45:56 2006
+@@ -0,0 +1,38 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -27,7 +27,9 @@ $NetBSD: patch-ab,v 1.12 2005/11/18 01:06:27 simonb Exp $
 +STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 +STUBURL_ADBG=$ZAP_BASE/adbg.gif
 +STUBURL_ADJS=$ZAP_BASE/no-op.js
++STUBURL_ADJSTEXT=
 +STUBURL_ADHTML=$ZAP_BASE/no-op.html
++STUBURL_ADHTMLTEXT=
 +STUBURL_ADMP3=$ZAP_BASE/ad.mp3
 +STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
 +STUBURL_ADSWF=$ZAP_BASE/ad.swf