summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2001-04-17 16:11:10 +0000
committerKris Kennaway <kris@FreeBSD.org>2001-04-17 16:11:10 +0000
commit6322bbde7c60128f8648b8fcecbefdb7faa700f7 (patch)
tree409bb808725d5ccd2db5c7b38bb8ce2b3dbed17e /www
parentMore bento debugging. (diff)
Update to adzap 20010417
Diffstat (limited to 'www')
-rw-r--r--www/adzap/Makefile6
-rw-r--r--www/adzap/distinfo2
-rw-r--r--www/adzap/files/patch-aa19
-rw-r--r--www/adzap/files/patch-ab4
4 files changed, 13 insertions, 18 deletions
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 5c1c6dfdbd6a..04128b5953f0 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= adzap
-PORTVERSION= 20010227
+PORTVERSION= 20010417
CATEGORIES= www perl5
MASTER_SITES= http://www.zip.com.au/~cs/adzap/
@@ -23,11 +23,11 @@ do-configure:
-e "s:@@PREFIX@@:${PREFIX}:g" \
<${WRKSRC}/${FILE}.orig >${WRKSRC}/${FILE}
.endfor
- ${SED} s,%PREFIX%,${PREFIX}, < ${WRKSRC}/wrapzap > ${WRKSRC}/adzap
+# ${SED} s,%PREFIX%,${PREFIX}, < ${WRKSRC}/wrapzap > ${WRKSRC}/adzap
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/squid_redirect ${PREFIX}/libexec
- ${INSTALL_SCRIPT} ${WRKSRC}/adzap ${PREFIX}/libexec
+ ${INSTALL_SCRIPT} ${WRKSRC}/wrapzap ${PREFIX}/libexec/adzap
${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 \
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index d57972907044..aadfe4d6ba62 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1 +1 @@
-MD5 (adzap-20010227.tar.gz) = 2c8f9c957d320630c0550a3415790bcb
+MD5 (adzap-20010417.tar.gz) = 6dbb664a731c6fe1c19914d572b687d8
diff --git a/www/adzap/files/patch-aa b/www/adzap/files/patch-aa
index ca52f4843c5e..6584416a28a5 100644
--- a/www/adzap/files/patch-aa
+++ b/www/adzap/files/patch-aa
@@ -1,18 +1,13 @@
-$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 @@
+--- wrapzap.orig Mon Apr 2 17:24:56 2001
++++ wrapzap Tue Apr 17 09:08:03 2001
+@@ -16,25 +16,9 @@
#
# 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_CHAINING= # set to "1" or "FULL" if chaining
-- # redirectors; see web page
-ZAP_PREMATCH= # pathname of extra pattern file
- # for patterns to preempt the stock
- # zapper
@@ -27,7 +22,9 @@ $NetBSD: patch-aa,v 1.2 2000/05/20 13:32:14 sommerfeld Exp $
-STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html
-STUBURL_COUNTER=$ZAP_BASE/counter.gif
-STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
-+. %PREFIX%/etc/adzap.conf
++zapper=@@PREFIX@@/libexec/squid_redirect
- export ZAP_MODE ZAP_BASE ZAP_CHAINING ZAP_PREMATCH ZAP_POSTMATCH
++. @@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
diff --git a/www/adzap/files/patch-ab b/www/adzap/files/patch-ab
index 506eb1df32c6..6f3162a98110 100644
--- a/www/adzap/files/patch-ab
+++ b/www/adzap/files/patch-ab
@@ -2,15 +2,13 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/04/25 09:40:25 rh Exp $
--- /dev/null Mon Jan 15 00:57:20 2001
+++ adzap.conf Mon Jan 15 00:59:08 2001
-@@ -0,0 +1,22 @@
+@@ -0,0 +1,20 @@
+# example adzap configuration file
+# copy this file over to ${PREFIX}/etc/adzap.conf,
+# then modify this to match your install
+
+ZAP_MODE=CLEAR # or "CLEAR"
+ZAP_BASE=http://adzap.cs.zip.com.au # a local web server will be better
-+ZAP_CHAINING= # set to "1" or "FULL" if chaining
-+ # redirectors; see web page
+ZAP_PREMATCH= # pathname of extra pattern file
+ # for patterns to preempt the stock
+ # zapper