Update to adzap 20010704. Changes include many new ad patterns, as well

as webbuf, shockwave and mp3 placeholders.

5 files changed, 45 insertions, 27 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index b67fbb78170..fb347e79f21 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/04/25 22:28:52 simonb Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/07 07:48:15 simonb Exp $
 #
 
-DISTNAME=	adzap-20010420
+DISTNAME=	adzap-20010704
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
@@ -26,9 +26,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/squid_redirect ${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/wrapzap ${PREFIX}/libexec/adzap
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/adzap
-.for FILE in adzap.conf proxy-cisra.pac proxy-home.pac proxy-zip.pac \
-	closepopup-clear.html no-op-clear.html closepopup.html no-op.html \
-	no-op-clear.js no-op.js ad-clear.gif ad.gif
+.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf ad.gif ad.mp3 ad.swf \
+    adzap.conf closepopup-clear.html closepopup.html counter-clear.gif \
+    counter.gif no-op-clear.html no-op-clear.js no-op.html no-op.js \
+    proxy-cisra.pac proxy-home.pac proxy-zip.pac webbug-clear.gif \
+    webbug-clear.js webbug.gif webbug.js
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 5b3a06d7850..a845e706151 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/25 22:28:53 simonb Exp $
+$NetBSD: distinfo,v 1.3 2001/07/07 07:48:15 simonb Exp $
 
-SHA1 (adzap-20010420.tar.gz) = dffaa021380de49e00bfca625641da8004b164cd
-Size (adzap-20010420.tar.gz) = 22633 bytes
-SHA1 (patch-aa) = 4bcfa1d96fecb3bea7d4abf410c71c446bfdae8c
-SHA1 (patch-ab) = a7c3d22cff52e65639b3f99e48f2a2424f152de0
+SHA1 (adzap-20010704.tar.gz) = fd18276c608022d9e1dd3620f979f2907bb85edf
+Size (adzap-20010704.tar.gz) = 23763 bytes
+SHA1 (patch-aa) = 1982dfbbc48be2e3783457c90ea9df26b591b87e
+SHA1 (patch-ab) = 2b41dcacbba7a6e6a15455a56dd41c97faead1d0
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index dd57e352be2..e8543537093 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2001/04/04 07:17:05 simonb Exp $
+$NetBSD: patch-aa,v 1.5 2001/07/07 07:48:15 simonb Exp $
 
---- wrapzap.orig	Tue Apr  3 10:24:56 2001
-+++ wrapzap	Wed Apr  4 17:01:34 2001
-@@ -16,24 +16,9 @@
+--- wrapzap.orig	Sat Jun 23 11:39:22 2001
++++ wrapzap	Fri Jul  6 23:33:13 2001
+@@ -16,27 +16,9 @@
  #
  
  # modify this to match your install
@@ -21,12 +21,15 @@ $NetBSD: patch-aa,v 1.4 2001/04/04 07:17:05 simonb Exp $
 -STUBURL_ADBG=$ZAP_BASE/adbg.gif
 -STUBURL_ADJS=$ZAP_BASE/no-op.js
 -STUBURL_ADHTML=$ZAP_BASE/no-op.html
+-STUBURL_ADMP3=$ZAP_BASE/ad.mp3
 -STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
+-STUBURL_ADSWF=$ZAP_BASE/ad.swf
 -STUBURL_COUNTER=$ZAP_BASE/counter.gif
 -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
+-STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
 +zapper=@@PREFIX@@/libexec/squid_redirect
 +  
 +. /etc/adzap.conf
  
  export ZAP_MODE ZAP_BASE ZAP_PREMATCH ZAP_POSTMATCH
- export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUBURL_ADPOPUP \
+ export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 65f43d33f3a..8b950c11323 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2001/04/04 07:17:05 simonb Exp $
+$NetBSD: patch-ab,v 1.4 2001/07/07 07:48:15 simonb Exp $
 
---- /dev/null	Mon Jan 15 00:57:20 2001
-+++ adzap.conf	Mon Jan 15 00:59:08 2001
-@@ -0,0 +1,20 @@
+--- /dev/null	Fri Jul  6 23:30:38 2001
++++ adzap.conf	Fri Jul  6 23:32:42 2001
+@@ -0,0 +1,23 @@
 +# example adzap configuration file
 +# copy this file over to /etc/adzap.conf,
 +# then modify this to match your install
@@ -20,6 +20,9 @@ $NetBSD: patch-ab,v 1.3 2001/04/04 07:17:05 simonb Exp $
 +STUBURL_ADBG=$ZAP_BASE/adbg.gif
 +STUBURL_ADJS=$ZAP_BASE/no-op.js
 +STUBURL_ADHTML=$ZAP_BASE/no-op.html
++STUBURL_ADMP3=$ZAP_BASE/ad.mp3
 +STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
++STUBURL_ADSWF=$ZAP_BASE/ad.swf
 +STUBURL_COUNTER=$ZAP_BASE/counter.gif
 +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
++STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
diff --git a/www/adzap/pkg/PLIST b/www/adzap/pkg/PLIST
index c56e69af560..f3b42e344ef 100644
--- a/www/adzap/pkg/PLIST
+++ b/www/adzap/pkg/PLIST
@@ -1,16 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/07 07:48:15 simonb Exp $
 libexec/adzap
 libexec/squid_redirect
+share/examples/adzap/ad-clear.gif
+share/examples/adzap/ad-clear.mp3
+share/examples/adzap/ad-clear.swf
+share/examples/adzap/ad.gif
+share/examples/adzap/ad.mp3
+share/examples/adzap/ad.swf
 share/examples/adzap/adzap.conf
-share/examples/adzap/proxy-cisra.pac
-share/examples/adzap/proxy-home.pac
-share/examples/adzap/proxy-zip.pac
 share/examples/adzap/closepopup-clear.html
-share/examples/adzap/no-op-clear.html
 share/examples/adzap/closepopup.html
-share/examples/adzap/no-op.html
+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.html
 share/examples/adzap/no-op.js
-share/examples/adzap/ad-clear.gif
-share/examples/adzap/ad.gif
+share/examples/adzap/proxy-cisra.pac
+share/examples/adzap/proxy-home.pac
+share/examples/adzap/proxy-zip.pac
+share/examples/adzap/webbug-clear.gif
+share/examples/adzap/webbug-clear.js
+share/examples/adzap/webbug.gif
+share/examples/adzap/webbug.js
 @dirrm share/examples/adzap