The distribution tarball changed contents without changing names. The

"wrapper" script inside changed names from "zapwrap.sh" to "wrapzap".
Whack patches to match.

No release notes for this version appear to be available, either in
the tarball or on the web site.

4 files changed, 19 insertions, 17 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 216d849c5b6..1eed5d98050 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/20 13:32:13 sommerfeld Exp $
 #
 
 DISTNAME=	adzap
-PKGNAME=	${DISTNAME}-20000421
+PKGNAME=	${DISTNAME}-20000509
 CATEGORIES=	www perl
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
@@ -16,7 +16,7 @@ NO_BUILD=	YES
 USE_PERL5=	YES
 
 do-configure:
-.for file in squid_redirect zapwrap.sh
+.for file in squid_redirect wrapzap
 	${CP} ${WRKSRC}/${file} ${WRKSRC}/${file}.orig
 	${SED} -e "s:/usr/bin/perl:${PREFIX}/bin/perl:g" \
 	       -e "s:@@PREFIX@@:${PREFIX}:g" \
@@ -25,7 +25,7 @@ do-configure:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/squid_redirect ${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/zapwrap.sh ${PREFIX}/libexec/adzap
+	${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 \
diff --git a/www/adzap/files/md5 b/www/adzap/files/md5
index cd0138d504e..15146f568f3 100644
--- a/www/adzap/files/md5
+++ b/www/adzap/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+$NetBSD: md5,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
 
-MD5 (adzap.tar.gz) = 2b9519d2677eec671a1bbf78acedfb33
+MD5 (adzap.tar.gz) = 4e8d2aa5193748dad0e8a79efcfd47b2
diff --git a/www/adzap/files/patch-sum b/www/adzap/files/patch-sum
index efd64f3a303..9c1a8f38f3a 100644
--- a/www/adzap/files/patch-sum
+++ b/www/adzap/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+$NetBSD: patch-sum,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
 
-MD5 (patch-aa) = bf21c5eb72514784ee513e4aea28805e
+MD5 (patch-aa) = b3e16d829f0a289fffc3d8c177d2af42
 MD5 (patch-ab) = e62c65fec2ea65cc33171f181ba10748
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index 3d32f7f0b78..bd732238319 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+$NetBSD: patch-aa,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
 
---- zapwrap.sh.orig	Fri Apr 21 04:44:53 2000
-+++ zapwrap.sh	Tue Apr 25 10:45:26 2000
-@@ -16,22 +16,9 @@
+--- wrapzap.orig	Tue May  9 01:12:22 2000
++++ wrapzap	Sat May 20 08:46:05 2000
+@@ -16,24 +16,9 @@
  #
  
  # modify this to match your install
@@ -11,19 +11,21 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
  
 -ZAP_MODE=				# or "CLEAR"
 -ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
--ZAP_CHAINING=				# set to one if chaining redirectors
+-ZAP_CHAINING=				# set to "1" or "FULL" if chaining
+-					# redirectors; see web page
 -ZAP_PREMATCH=				# pathname of extra pattern file
--					# for patterns to preempty the stock
+-					# for patterns to preempt the stock
 -					# zapper
 -ZAP_POSTMATCH=				# pathname of extra pattern file
 -					# for patterns in addition to the
--					# stock zapper; this is the one you
--					# should add new ads to
+-					# stock zapper; this is the one to
+-					# which you should add new ads
 -STUBURL_AD=$ZAP_BASE/ad.gif
 -STUBURL_ADJS=$ZAP_BASE/no-op.js
 -STUBURL_ADHTML=$ZAP_BASE/no-op.html
 -STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
+-STUBURL_COUNTER=$ZAP_BASE/counter.gif
 +. /etc/adzap.conf
  
  export ZAP_MODE ZAP_BASE ZAP_CHAINING ZAP_PREMATCH ZAP_POSTMATCH
- export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUBURL_ADPOPUP
+ export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUBURL_ADPOPUP \