From e86b0c0b484b2bfecdc14326f4f37c4df76de57a Mon Sep 17 00:00:00 2001 From: simonb Date: Thu, 10 Jan 2002 00:41:45 +0000 Subject: Update adzap to version 20020107. Adds support for javascript counters, plus more ads to be zapped. Needs a new variable in adzap.conf - STUBURL_COUNTERJS. --- www/adzap/Makefile | 25 +++++++++++++++---------- www/adzap/PLIST | 8 +++++++- www/adzap/distinfo | 10 +++++----- www/adzap/patches/patch-aa | 9 +++++---- www/adzap/patches/patch-ab | 7 ++++--- 5 files changed, 36 insertions(+), 23 deletions(-) (limited to 'www/adzap') diff --git a/www/adzap/Makefile b/www/adzap/Makefile index 46debfe6dc5..b7337d8ca55 100644 --- a/www/adzap/Makefile +++ b/www/adzap/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.17 2001/11/23 02:18:21 simonb Exp $ +# $NetBSD: Makefile,v 1.18 2002/01/10 00:41:45 simonb Exp $ # -DISTNAME= adzap-20011120 +DISTNAME= adzap-20020107 CATEGORIES= www perl5 MASTER_SITES= http://www.zip.com.au/~cs/adzap/ @@ -15,7 +15,7 @@ NO_BUILD= # defined USE_PERL5= # defined do-configure: -.for FILE in squid_redirect wrapzap +.for FILE in scripts/squid_redirect scripts/wrapzap ${CP} ${WRKSRC}/${FILE} ${WRKSRC}/${FILE}.ORIG ${SED} -e "s:/usr/bin/perl:${PERL5}:g" \ -e "s:@@PREFIX@@:${PREFIX}:g" \ @@ -23,15 +23,20 @@ do-configure: .endfor do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/squid_redirect ${PREFIX}/libexec - ${INSTALL_SCRIPT} ${WRKSRC}/wrapzap ${PREFIX}/libexec/adzap + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${PREFIX}/libexec/adzap ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/adzap -.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf ad.gif ad.mp3 ad.swf \ - adzap.conf closepopup-clear.html closepopup.html counter-clear.gif \ - counter.gif no-op-clear.html no-op-clear.js no-op.html no-op.js \ - proxy-cisra.pac proxy-home.pac proxy-zip.pac webbug-clear.gif \ +.for FILE in ad-clear.gif ad-clear.mp3 ad-clear.swf ad-grey.gif ad-old.gif ad.gif ad.mp3 ad.swf \ + adbg-clear.gif adbg.gif \ + closepopup-clear.html closepopup.html counter-clear.gif counter.gif \ + no-op-clear.html no-op-clear.js no-op-counter-clear.js no-op-counter.js no-op.html no-op.js webbug-clear.gif \ webbug-clear.js webbug.gif webbug.js - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap + ${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap .endfor +.for FILE in proxy-cisra.pac proxy-home.pac proxy-zip.pac + ${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${PREFIX}/share/examples/adzap +.endfor + ${INSTALL_DATA} ${WRKSRC}/scripts/adzap.conf \ + ${PREFIX}/share/examples/adzap .include "../../mk/bsd.pkg.mk" diff --git a/www/adzap/PLIST b/www/adzap/PLIST index 2e8cf7d06b9..ae714bfe36d 100644 --- a/www/adzap/PLIST +++ b/www/adzap/PLIST @@ -1,12 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:25 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/01/10 00:41:45 simonb Exp $ 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-grey.gif +share/examples/adzap/ad-old.gif share/examples/adzap/ad.gif share/examples/adzap/ad.mp3 share/examples/adzap/ad.swf +share/examples/adzap/adbg-clear.gif +share/examples/adzap/adbg.gif share/examples/adzap/adzap.conf share/examples/adzap/closepopup-clear.html share/examples/adzap/closepopup.html @@ -14,6 +18,8 @@ share/examples/adzap/counter-clear.gif share/examples/adzap/counter.gif share/examples/adzap/no-op-clear.html share/examples/adzap/no-op-clear.js +share/examples/adzap/no-op-counter-clear.js +share/examples/adzap/no-op-counter.js share/examples/adzap/no-op.html share/examples/adzap/no-op.js share/examples/adzap/proxy-cisra.pac diff --git a/www/adzap/distinfo b/www/adzap/distinfo index 87b713ba3c9..8b6063bfce7 100644 --- a/www/adzap/distinfo +++ b/www/adzap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2001/11/23 02:18:21 simonb Exp $ +$NetBSD: distinfo,v 1.7 2002/01/10 00:41:46 simonb Exp $ -SHA1 (adzap-20011120.tar.gz) = e431f3681eff385f37f74dafb933511f669478ea -Size (adzap-20011120.tar.gz) = 26402 bytes -SHA1 (patch-aa) = 6da380b284d6498a8eef90d783451ed740f55114 -SHA1 (patch-ab) = 63cb93a6dec9ffbd7d090390cc934c1efd53b686 +SHA1 (adzap-20020107.tar.gz) = 799549abc49bd8d1bd3d1ad21fbf2635254170dc +Size (adzap-20020107.tar.gz) = 27232 bytes +SHA1 (patch-aa) = 75578595003d899fcd76c21db92d34e1327e535b +SHA1 (patch-ab) = 358cf3edb1bcdc1a0df380bc0cb973002f283103 diff --git a/www/adzap/patches/patch-aa b/www/adzap/patches/patch-aa index b55d7c0e23c..4bee0739cc8 100644 --- a/www/adzap/patches/patch-aa +++ b/www/adzap/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.6 2001/11/23 02:18:22 simonb Exp $ +$NetBSD: patch-aa,v 1.7 2002/01/10 00:41:46 simonb Exp $ ---- wrapzap.orig Fri Nov 23 12:30:44 2001 -+++ wrapzap Fri Nov 23 12:34:21 2001 -@@ -16,29 +16,9 @@ +--- scripts/wrapzap.orig Fri Nov 23 12:30:44 2001 ++++ scripts/wrapzap Fri Nov 23 12:34:21 2001 +@@ -16,30 +16,9 @@ # # modify this to match your install @@ -27,6 +27,7 @@ $NetBSD: patch-aa,v 1.6 2001/11/23 02:18:22 simonb Exp $ -STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html -STUBURL_ADSWF=$ZAP_BASE/ad.swf -STUBURL_COUNTER=$ZAP_BASE/counter.gif +-STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js -STUBURL_WEBBUG=$ZAP_BASE/webbug.gif -STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js +zapper=@@PREFIX@@/libexec/squid_redirect diff --git a/www/adzap/patches/patch-ab b/www/adzap/patches/patch-ab index 915cb207b55..bf8e8f23ad6 100644 --- a/www/adzap/patches/patch-ab +++ b/www/adzap/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.5 2001/11/23 02:18:22 simonb Exp $ +$NetBSD: patch-ab,v 1.6 2002/01/10 00:41:46 simonb Exp $ ---- adzap.conf.orig Fri Nov 23 12:31:35 2001 -+++ adzap.conf Fri Nov 23 12:32:56 2001 +--- scripts/adzap.conf.orig Fri Nov 23 12:31:35 2001 ++++ scripts/adzap.conf Fri Nov 23 12:32:56 2001 @@ -0,0 +1,25 @@ +# example adzap configuration file +# copy this file over to /etc/adzap.conf, @@ -26,5 +26,6 @@ $NetBSD: patch-ab,v 1.5 2001/11/23 02:18:22 simonb Exp $ +STUBURL_ADPOPUP=$ZAP_BASE/closepopup.html +STUBURL_ADSWF=$ZAP_BASE/ad.swf +STUBURL_COUNTER=$ZAP_BASE/counter.gif ++STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif +STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js -- cgit v1.2.3