Update to version 20030811:

 - Add more ad patterns.
 - Hooks to get the printer-friendly version of some pages (disabled
   by default, controlled by STUBURL_PRINT in adzap.conf).

Note: adds the new STUBURL_PRINT variable; users should update to the
latest adzap.conf as shown in the install message.

4 files changed, 21 insertions, 16 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 560bead71b3..b6ec08fe4d8 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2003/07/22 04:14:17 martti Exp $
+# $NetBSD: Makefile,v 1.39 2003/08/13 03:05:48 simonb Exp $
 #
 
-DISTNAME=	adzap-20030525
+DISTNAME=	adzap-20030811
 WRKSRC=		${WRKDIR}/adzap
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index f8d69efd57e..6833bdaaa33 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2003/06/02 06:32:38 simonb Exp $
+$NetBSD: distinfo,v 1.25 2003/08/13 03:05:49 simonb Exp $
 
-SHA1 (adzap-20030525.tar.gz) = 04e0dce5254f863ec28f3ec8c89c18b273c162f1
-Size (adzap-20030525.tar.gz) = 33375 bytes
-SHA1 (patch-aa) = c39f5914c75fae2517a739e34791a7769f4d6917
-SHA1 (patch-ab) = 327f0d8d4d692115c43d9c8a5f2eecd7cf2b3848
+SHA1 (adzap-20030811.tar.gz) = 09875df4b349a7e5dc127e966e85c304bc52850e
+Size (adzap-20030811.tar.gz) = 35551 bytes
+SHA1 (patch-aa) = 2b83211b9eee28f508bc6ac40575a46c8bbbcc56
+SHA1 (patch-ab) = 7aa67928e6a49bee814a75eac52c58e4ab5eb8eb
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 95cdf7fbaef..3ee4a4d8b2e 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.11 2003/01/22 12:52:35 simonb Exp $
+$NetBSD: patch-aa,v 1.12 2003/08/13 03:05:49 simonb Exp $
 
---- scripts/wrapzap.orig	Mon Oct 28 15:02:14 2002
+--- scripts/wrapzap.orig	Sun Jul 20 21:38:48 2003
 +++ scripts/wrapzap
-@@ -16,36 +16,9 @@
+@@ -15,39 +15,9 @@
+ #	- Cameron Simpson <cs@zip.com.au> 21apr2000
  #
  
- # modify this to match your install
--zapper=/usr/local/script/squid_redirect
+-# modify this to match your install
+-zapper=/usr/local/bin/squid_redirect
 -
 -ZAP_MODE=				# or "CLEAR"
 -ZAP_BASE=http://adzapper.sourceforge.net/zaps	# a local web server will be better
@@ -36,6 +37,8 @@ $NetBSD: patch-aa,v 1.11 2003/01/22 12:52:35 simonb Exp $
 -STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
+-
+-STUBURL_PRINT=				# off by default, set to 1
 +zapper=@@PREFIX@@/libexec/squid_redirect
 +   
 +. /etc/adzap.conf
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 87a0ef1a2e1..e1b2dfe3c94 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2003/01/22 12:52:36 simonb Exp $
+$NetBSD: patch-ab,v 1.10 2003/08/13 03:05:50 simonb Exp $
 
---- scripts/adzap.conf.orig	Fri Nov 22 15:41:33 2002
-+++ scripts/adzap.conf	Fri Nov 22 15:41:33 2002
-@@ -0,0 +1,32 @@
+--- 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 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -35,3 +35,5 @@ $NetBSD: patch-ab,v 1.9 2003/01/22 12:52:36 simonb Exp $
 +STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 +STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
++
++STUBURL_PRINT=				# off by default, set to 1