Update to adzap-20010504 and clean up the port a little bit

Submitted by:	Roman Shterenzon <roman@xpert.com>

5 files changed, 22 insertions, 16 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 04128b5953f0..5f82c534ee4e 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	adzap
-PORTVERSION=	20010417
+PORTVERSION=	20010504
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
@@ -31,7 +31,7 @@ do-install:
 	${MKDIR} ${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
+	no-op-clear.js no-op.js ad-clear.gif ad-clear.mp3 ad-clear.swf ad.gif
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index aadfe4d6ba62..f1578827ee57 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1 +1 @@
-MD5 (adzap-20010417.tar.gz) = 6dbb664a731c6fe1c19914d572b687d8
+MD5 (adzap-20010504.tar.gz) = e16d1e88a004a697a65e6c86a12a1610
diff --git a/www/adzap/files/patch-aa b/www/adzap/files/patch-aa
index 6584416a28a5..0764595db92f 100644
--- a/www/adzap/files/patch-aa
+++ b/www/adzap/files/patch-aa
@@ -1,6 +1,6 @@
---- wrapzap.orig	Mon Apr  2 17:24:56 2001
-+++ wrapzap	Tue Apr 17 09:08:03 2001
-@@ -16,25 +16,9 @@
+--- wrapzap.orig	Fri May  4 04:00:25 2001
++++ wrapzap	Fri May  4 15:07:04 2001
+@@ -16,27 +16,9 @@
  #
  
  # modify this to match your install
@@ -19,12 +19,14 @@
 -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
 +zapper=@@PREFIX@@/libexec/squid_redirect
  
-+. @@PREFIX@@/etc/adzap.conf 
++. @@PREFIX@@/etc/adzap.conf
  export ZAP_MODE ZAP_BASE ZAP_PREMATCH ZAP_POSTMATCH
- export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUBURL_ADPOPUP \
- 	STUBURL_COUNTER STUBURL_WEBBUG
+ export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
+ 	STUBURL_ADSWF STUBURL_COUNTER STUBURL_WEBBUG
diff --git a/www/adzap/files/patch-ab b/www/adzap/files/patch-ab
index 6f3162a98110..0087c8aeceb1 100644
--- a/www/adzap/files/patch-ab
+++ b/www/adzap/files/patch-ab
@@ -20,6 +20,8 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/04/25 09:40:25 rh 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
diff --git a/www/adzap/pkg-plist b/www/adzap/pkg-plist
index c024129daa75..502669fd3bf8 100644
--- a/www/adzap/pkg-plist
+++ b/www/adzap/pkg-plist
@@ -1,15 +1,17 @@
 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/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/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
 @dirrm share/examples/adzap