Update to version 20041124.

 - Many more ad pattern updates.
 - Add a "-l logfile" option.

3 files changed, 23 insertions, 12 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index e23a344c8d8..1edf3ad8842 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2004/10/08 05:14:06 simonb Exp $
+# $NetBSD: Makefile,v 1.46 2005/01/03 23:48:21 simonb Exp $
 #
 
-DISTNAME=	adzap-20040914
+DISTNAME=	adzap-20041124
 CATEGORIES=	www perl5
 # XXX: should use the following one day:
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
@@ -27,12 +27,19 @@ 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 \
-    closepopup-clear.html closepopup.html counter-clear.gif counter.gif \
-    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
+.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-clear.js \
+    counter.gif counter.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.html webbug-clear.js \
+    webbug.gif webbug.html webbug.js
 	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 .for FILE in proxy-home.pac proxy-zip.pac
diff --git a/www/adzap/PLIST b/www/adzap/PLIST
index e97a62aaf14..955e35fdbe7 100644
--- a/www/adzap/PLIST
+++ b/www/adzap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/10/18 23:23:41 kleink Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/01/03 23:48:21 simonb Exp $
 libexec/adzap
 libexec/squid_redirect
 share/examples/adzap/ad-clear.gif
@@ -15,7 +15,9 @@ share/examples/adzap/adzap.conf
 share/examples/adzap/closepopup-clear.html
 share/examples/adzap/closepopup.html
 share/examples/adzap/counter-clear.gif
+share/examples/adzap/counter-clear.js
 share/examples/adzap/counter.gif
+share/examples/adzap/counter.js
 share/examples/adzap/no-op-clear.html
 share/examples/adzap/no-op-clear.js
 share/examples/adzap/no-op-counter-clear.html
@@ -27,7 +29,9 @@ share/examples/adzap/no-op.js
 share/examples/adzap/proxy-home.pac
 share/examples/adzap/proxy-zip.pac
 share/examples/adzap/webbug-clear.gif
+share/examples/adzap/webbug-clear.html
 share/examples/adzap/webbug-clear.js
 share/examples/adzap/webbug.gif
+share/examples/adzap/webbug.html
 share/examples/adzap/webbug.js
 @dirrm share/examples/adzap
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 500b4366cd1..38c6801f0b5 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2004/10/08 05:14:06 simonb Exp $
+$NetBSD: distinfo,v 1.31 2005/01/03 23:48:21 simonb Exp $
 
-SHA1 (adzap-20040914.tar.gz) = 6080a7a31044704cf8e4cbcce2ef48c5517d677d
-Size (adzap-20040914.tar.gz) = 46695 bytes
+SHA1 (adzap-20041124.tar.gz) = d5e647630bd90a455b94fdefcf788408d28daed4
+Size (adzap-20041124.tar.gz) = 47760 bytes
 SHA1 (patch-aa) = 2b83211b9eee28f508bc6ac40575a46c8bbbcc56
 SHA1 (patch-ab) = 7aa67928e6a49bee814a75eac52c58e4ab5eb8eb