Update to version 20030120. Adds more ad patterns. Adds a new variable

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

5 files changed, 42 insertions, 27 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index d207ed25165..5852ae462cd 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.30 2002/10/03 23:50:42 simonb Exp $
+# $NetBSD: Makefile,v 1.31 2003/01/22 12:52:35 simonb Exp $
 #
 
-DISTNAME=	adzap-20021003
+DISTNAME=	adzap-20030120
 CATEGORIES=	www perl5
-MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
+# XXX: should use the following one day:
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
+MASTER_SITES=	http://adzapper.sourceforge.net/
 
 MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.zip.com.au/~cs/adzap/index.html
+HOMEPAGE=	http://adzapper.sourceforge.net/
 COMMENT=	filter out animated ad banners from web pages
 
 WRKSRC=		${WRKDIR}/adzap
@@ -26,11 +28,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${PREFIX}/libexec/adzap
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/adzap
-.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf ad-grey.gif ad-old.gif ad.gif ad.mp3 ad.swf \
-    adbg-clear.gif adbg.gif \
+.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf ad-grey.gif ad-old.gif \
+    ad.gif ad.mp3 ad.swf adbg-clear.gif adbg.gif \
     closepopup-clear.html closepopup.html counter-clear.gif counter.gif \
-    no-op-clear.html no-op-clear.js no-op-counter-clear.js no-op-counter.js no-op.html no-op.js webbug-clear.gif \
-    webbug-clear.js webbug.gif webbug.js
+    no-op-clear.html no-op-clear.js no-op-counter-clear.html \
+    no-op-counter-clear.js no-op-counter.html no-op-counter.js \
+    no-op.html no-op.js webbug-clear.gif webbug-clear.js webbug.gif webbug.js
 	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 .for FILE in proxy-cisra.pac proxy-home.pac proxy-zip.pac
diff --git a/www/adzap/PLIST b/www/adzap/PLIST
index ae714bfe36d..85cfac21a62 100644
--- a/www/adzap/PLIST
+++ b/www/adzap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/10 00:41:45 simonb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/22 12:52:35 simonb Exp $
 libexec/adzap
 libexec/squid_redirect
 share/examples/adzap/ad-clear.gif
@@ -18,7 +18,9 @@ share/examples/adzap/counter-clear.gif
 share/examples/adzap/counter.gif
 share/examples/adzap/no-op-clear.html
 share/examples/adzap/no-op-clear.js
+share/examples/adzap/no-op-counter-clear.html
 share/examples/adzap/no-op-counter-clear.js
+share/examples/adzap/no-op-counter.html
 share/examples/adzap/no-op-counter.js
 share/examples/adzap/no-op.html
 share/examples/adzap/no-op.js
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index e3dbc3ab838..f9219508736 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.20 2002/10/03 23:50:43 simonb Exp $
+$NetBSD: distinfo,v 1.21 2003/01/22 12:52:35 simonb Exp $
 
-SHA1 (adzap-20021003.tar.gz) = 696b957d41d6219ecfea8d60f94edf129278a601
-Size (adzap-20021003.tar.gz) = 58852 bytes
-SHA1 (patch-aa) = c0de599040a3305f8f8b683d2f8dc91cf4e8cf2a
-SHA1 (patch-ab) = ace53d3f8815cf13decfe232e4b907d3a9354b8d
+SHA1 (adzap-20030120.tar.gz) = 758e1768a647615dce5353677306c8667fc868ac
+Size (adzap-20030120.tar.gz) = 32183 bytes
+SHA1 (patch-aa) = c39f5914c75fae2517a739e34791a7769f4d6917
+SHA1 (patch-ab) = 327f0d8d4d692115c43d9c8a5f2eecd7cf2b3848
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 36ebbe2dd63..95cdf7fbaef 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.10 2002/09/07 14:23:26 simonb Exp $
+$NetBSD: patch-aa,v 1.11 2003/01/22 12:52:35 simonb Exp $
 
---- scripts/wrapzap.orig	Fri Aug 23 10:32:23 2002
-+++ scripts/wrapzap	Tue Sep  3 09:59:48 2002
-@@ -16,31 +16,9 @@
+--- scripts/wrapzap.orig	Mon Oct 28 15:02:14 2002
++++ scripts/wrapzap
+@@ -16,36 +16,9 @@
  #
  
  # modify this to match your install
 -zapper=/usr/local/script/squid_redirect
 -
 -ZAP_MODE=				# or "CLEAR"
--ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
--ZAP_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored
+-ZAP_BASE=http://adzapper.sourceforge.net/zaps	# a local web server will be better
+-ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored
+-
 -ZAP_PREMATCH=				# pathname of extra pattern file
 -					# for patterns to preempt the stock
 -					# zapper
@@ -18,6 +19,10 @@ $NetBSD: patch-aa,v 1.10 2002/09/07 14:23:26 simonb Exp $
 -					# for patterns in addition to the
 -					# stock zapper; this is the one to
 -					# which you should add new ads
+-ZAP_MATCH=				# pathname of extra pattern file
+-					# for patterns to use instead of the
+-					# inbuilt pattern list
+-
 -STUBURL_AD=$ZAP_BASE/ad.gif
 -STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 -STUBURL_ADBG=$ZAP_BASE/adbg.gif
@@ -35,5 +40,5 @@ $NetBSD: patch-aa,v 1.10 2002/09/07 14:23:26 simonb Exp $
 +   
 +. /etc/adzap.conf
  
- export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH
+ export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH
  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 3562ffb8e80..87a0ef1a2e1 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,15 +1,16 @@
-$NetBSD: patch-ab,v 1.8 2002/09/07 14:23:26 simonb Exp $
+$NetBSD: patch-ab,v 1.9 2003/01/22 12:52:36 simonb Exp $
 
---- 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 @@
+--- 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 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
 +
 +ZAP_MODE=				# or "CLEAR"
-+ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
-+ZAP_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored
++ZAP_BASE=http://adzapper.sourceforge.net/zaps	# a local web server will be better
++ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored
++
 +ZAP_PREMATCH=				# pathname of extra pattern file
 +					# for patterns to preempt the stock
 +					# zapper
@@ -17,6 +18,10 @@ $NetBSD: patch-ab,v 1.8 2002/09/07 14:23:26 simonb Exp $
 +					# for patterns in addition to the
 +					# stock zapper; this is the one to
 +					# which you should add new ads
++ZAP_MATCH=				# pathname of extra pattern file
++					# for patterns to use instead of the
++					# inbuilt pattern list
++
 +STUBURL_AD=$ZAP_BASE/ad.gif
 +STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 +STUBURL_ADBG=$ZAP_BASE/adbg.gif