head	1.10;
access;
symbols
	RELEASE_6_0_0:1.9
	RELEASE_5_4_0:1.9
	RELEASE_4_11_0:1.9
	RELEASE_5_3_0:1.9
	RELEASE_4_10_0:1.9
	RELEASE_5_2_1:1.9
	RELEASE_5_2_0:1.9
	RELEASE_4_9_0:1.8
	RELEASE_5_1_0:1.8
	RELEASE_4_8_0:1.8
	RELEASE_5_0_0:1.8
	RELEASE_4_7_0:1.7
	RELEASE_4_6_2:1.7
	RELEASE_4_6_1:1.7
	RELEASE_4_6_0:1.7
	RELEASE_5_0_DP1:1.6
	RELEASE_4_5_0:1.6
	RELEASE_4_4_0:1.4
	RELEASE_4_3_0:1.2;
locks; strict;
comment	@# @;


1.10
date	2005.11.30.18.58.53;	author kris;	state dead;
branches;
next	1.9;

1.9
date	2003.10.05.04.17.38;	author kris;	state Exp;
branches;
next	1.8;

1.8
date	2002.11.17.04.04.50;	author kris;	state Exp;
branches;
next	1.7;

1.7
date	2002.05.17.08.55.35;	author kris;	state Exp;
branches;
next	1.6;

1.6
date	2002.01.13.09.04.55;	author kris;	state Exp;
branches;
next	1.5;

1.5
date	2002.01.06.02.27.08;	author kris;	state Exp;
branches;
next	1.4;

1.4
date	2001.07.03.08.31.20;	author kris;	state Exp;
branches;
next	1.3;

1.3
date	2001.05.06.05.52.24;	author kris;	state Exp;
branches;
next	1.2;

1.2
date	2001.04.17.16.11.10;	author kris;	state Exp;
branches;
next	1.1;

1.1
date	2001.03.04.05.07.23;	author kris;	state Exp;
branches;
next	;


desc
@@


1.10
log
@Update to 20051024 and clean up port a bit

PR:		ports/89535 (based on)
Submitted by:	Andrew Pantyukhin
@
text
@--- scripts/wrapzap.orig	Sun Jul 20 04:38:48 2003
+++ scripts/wrapzap	Sat Oct  4 21:14:49 2003
@@@@ -16,9 +16,9 @@@@
 #
 
 # modify this to match your install
-zapper=/usr/local/bin/squid_redirect
-
-ZAP_MODE=				# or "CLEAR"
+zapper=%%PREFIX%%/libexec/squid_redirect
+  
+ZAP_MODE=CLEAR				# or blank
 ZAP_BASE=http://adzapper.sourceforge.net/zaps	# a local web server will be better
 ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored
 
@@@@ -46,6 +46,8 @@@@
 STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html
 STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
 STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
+
+. %%PREFIX%%/etc/adzap.conf
 
 STUBURL_PRINT=				# off by default, set to 1
 
@


1.9
log
@Update to adzap 20030903
@
text
@@


1.8
log
@Update to adzap-20021116, now hosted on sourceforge
@
text
@d1 2
a2 2
--- scripts/wrapzap.orig	Sun Oct 27 20:02:14 2002
+++ scripts/wrapzap	Sat Nov 16 20:06:56 2002
d7 3
a9 1
-zapper=/usr/local/script/squid_redirect
d11 2
a12 3
 
-ZAP_MODE=				# or "CLEAR"
+ZAP_MODE=CLEAR				# or "CLEAR"
d23 2
a24 2
 export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH
 export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUBURL_ADMP3 \
@


1.7
log
@At some point I broke the ability to actually use adzap according to
the instructions.  Fix this by reconstructing the patches from scratch.
@
text
@d1 2
a2 2
--- scripts/wrapzap.orig	Fri May 17 01:37:42 2002
+++ scripts/wrapzap	Fri May 17 01:38:15 2002
d12 5
a16 5
 ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
 ZAP_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored
 ZAP_PREMATCH=				# pathname of extra pattern file
@@@@ -40,6 +40,8 @@@@
 STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js
d22 1
a22 1
 export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH
@


1.6
log
@Update to adzap-20020110, and correct the path to squid_redirect in
adzap; this was causing adzap to fail, and squid to abort().
@
text
@d1 3
a3 3
--- scripts/wrapzap.orig	Wed Jan  9 16:57:21 2002
+++ scripts/wrapzap	Sun Jan 13 01:02:59 2002
@@@@ -16,7 +16,7 @@@@
d10 2
a11 1
 ZAP_MODE=				# or "CLEAR"
d13 3
a15 11
@@@@ -28,6 +28,9 @@@@
 					# for patterns in addition to the
 					# stock zapper; this is the one to
 					# which you should add new ads
+
+. %%PREFIX%%/etc/adzap.conf
+
 STUBURL_AD=$ZAP_BASE/ad.gif
 STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
 STUBURL_ADBG=$ZAP_BASE/adbg.gif
@@@@ -40,6 +43,8 @@@@
d23 1
a23 1
 export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 \
@


1.5
log
@Update to adzap-20020105

Submitted by:	wca
@
text
@d1 11
a11 2
--- scripts/wrapzap	Fri Dec 28 09:11:04 2001
+++ scripts/wrapzap.new	Fri Dec 28 09:13:32 2001
d30 1
a30 1
 export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
@


1.4
log
@Upgrade to adzap 20010627
@
text
@d1 18
a18 4
--- wrapzap.orig	Fri Jun 22 18:39:22 2001
+++ wrapzap	Tue Jul  3 01:21:49 2001
@@@@ -16,27 +16,9 @@@@
 #
d20 2
a21 27
 # modify this to match your install
-zapper=/usr/local/script/squid_redirect
+zapper=@@@@PREFIX@@@@/libexec/squid_redirect
 
-ZAP_MODE=				# or "CLEAR"
-ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
-ZAP_PREMATCH=				# pathname of extra pattern file
-					# 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 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_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
+. @@@@PREFIX@@@@/etc/adzap.conf
 
 export ZAP_MODE ZAP_BASE ZAP_PREMATCH ZAP_POSTMATCH
 export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
@


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

Submitted by:	Roman Shterenzon <roman@@xpert.com>
@
text
@d1 2
a2 2
--- wrapzap.orig	Fri May  4 04:00:25 2001
+++ wrapzap	Fri May  4 15:07:04 2001
d8 2
a9 1
-
d28 2
a29 1
+zapper=@@@@PREFIX@@@@/libexec/squid_redirect
a30 1
+. @@@@PREFIX@@@@/etc/adzap.conf
a32 1
 	STUBURL_ADSWF STUBURL_COUNTER STUBURL_WEBBUG
@


1.2
log
@Update to adzap 20010417
@
text
@d1 3
a3 3
--- wrapzap.orig	Mon Apr  2 17:24:56 2001
+++ wrapzap	Tue Apr 17 09:08:03 2001
@@@@ -16,25 +16,9 @@@@
d22 1
d24 1
d29 1
a29 1
+. @@@@PREFIX@@@@/etc/adzap.conf 
d31 2
a32 2
 export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUBURL_ADPOPUP \
 	STUBURL_COUNTER STUBURL_WEBBUG
@


1.1
log
@adzap is a squid plugin which filters out banner ads, web bugs, javascript
popup consoles, and other annoying crap.

Obtained from:	NetBSD
@
text
@d1 3
a3 5
$NetBSD: patch-aa,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $

--- wrapzap.orig	Thu Jan 11 12:23:23 2001
+++ wrapzap	Mon Jan 15 00:49:46 2001
@@@@ -16,26 +16,9 @@@@
d8 1
a8 2
+zapper=@@@@PREFIX@@@@/libexec/squid_redirect
 
a10 2
-ZAP_CHAINING=				# set to "1" or "FULL" if chaining
-					# redirectors; see web page
d25 1
a25 1
+. %PREFIX%/etc/adzap.conf
d27 2
a28 1
 export ZAP_MODE ZAP_BASE ZAP_CHAINING ZAP_PREMATCH ZAP_POSTMATCH
d30 1
@

