Update adzap to 20010112. No changelog, but many more ad sites zapped.

5 files changed, 26 insertions, 20 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 715bd18ac39..e82420b72d8 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2000/08/27 02:46:07 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/01/14 14:06:01 simonb Exp $
 #
 
-DISTNAME=	adzap-20000616
+DISTNAME=	adzap-20010112
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.zip.com.au/~cs/adzap/index.html
+WRKSRC=		${WRKDIR}/adzap
 
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
-NO_WRKSUBDIR=	# defined
 NO_BUILD=	# defined
 USE_PERL5=	# defined
 
diff --git a/www/adzap/files/md5 b/www/adzap/files/md5
index 3d5151883f8..083df4e7ae0 100644
--- a/www/adzap/files/md5
+++ b/www/adzap/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/06/18 00:07:06 wiz Exp $
+$NetBSD: md5,v 1.5 2001/01/14 14:06:01 simonb Exp $
 
-MD5 (adzap-20000616.tar.gz) = 2506ee164b22a20df10fb316b8df9ec6
+MD5 (adzap-20010112.tar.gz) = 44e87f8814c6cf8367c0360a2e915f62
diff --git a/www/adzap/files/patch-sum b/www/adzap/files/patch-sum
index 9c1a8f38f3a..7eb43567efd 100644
--- a/www/adzap/files/patch-sum
+++ b/www/adzap/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
+$NetBSD: patch-sum,v 1.3 2001/01/14 14:06:01 simonb Exp $
 
-MD5 (patch-aa) = b3e16d829f0a289fffc3d8c177d2af42
-MD5 (patch-ab) = e62c65fec2ea65cc33171f181ba10748
+MD5 (patch-aa) = 8b4e841c66db26cc180da69416882d07
+MD5 (patch-ab) = fc2846ff29202bc4dd81bf403390e882
diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa
index bd732238319..786ceeb8d23 100644
--- a/www/adzap/patches/patch-aa
+++ b/www/adzap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
+$NetBSD: patch-aa,v 1.3 2001/01/14 14:06:01 simonb Exp $
 
---- wrapzap.orig	Tue May  9 01:12:22 2000
-+++ wrapzap	Sat May 20 08:46:05 2000
-@@ -16,24 +16,9 @@
+--- wrapzap.orig	Thu Jan 11 12:23:23 2001
++++ wrapzap	Mon Jan 15 00:49:46 2001
+@@ -16,26 +16,9 @@
  #
  
  # modify this to match your install
@@ -21,10 +21,12 @@ $NetBSD: patch-aa,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
 -					# stock zapper; this is the one to
 -					# which you should add new ads
 -STUBURL_AD=$ZAP_BASE/ad.gif
+-STUBURL_ADBG=$ZAP_BASE/adbg.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
+-STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 +. /etc/adzap.conf
  
  export ZAP_MODE ZAP_BASE ZAP_CHAINING ZAP_PREMATCH ZAP_POSTMATCH
diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab
index 37fa0c186e2..fe112826825 100644
--- a/www/adzap/patches/patch-ab
+++ b/www/adzap/patches/patch-ab
@@ -1,23 +1,27 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
+$NetBSD: patch-ab,v 1.2 2001/01/14 14:06:01 simonb Exp $
 
---- /dev/null	Tue Apr 25 09:29:59 2000
-+++ adzap.conf	Tue Apr 25 10:47:19 2000
-@@ -0,0 +1,18 @@
+--- /dev/null	Mon Jan 15 00:57:20 2001
++++ adzap.conf	Mon Jan 15 00:59:08 2001
+@@ -0,0 +1,22 @@
 +# 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_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_ADBG=$ZAP_BASE/adbg.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
++STUBURL_WEBBUG=$ZAP_BASE/webbug.gif