Date: Fri, 25 Nov 2005 18:52:06 +0300 (MSK) From: infofarmer@gmail.com To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/89535: update www/adzap Message-ID: <200511251552.jAPFq62X092427@proxy.gubkin.ru> Resent-Message-ID: <200511251600.jAPG0EjD091746@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 89535 >Category: ports >Synopsis: update www/adzap >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Nov 25 16:00:14 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrew Pantyukhin >Release: FreeBSD 6.0-RELEASE i386 >Organization: >Environment: System: FreeBSD proxy.gubkin.ru 6.0-RELEASE FreeBSD 6.0-RELEASE #2: Thu Nov 3 19:20:06 MSK 2005 sat@proxy.gubkin.ru:/usr/obj/usr/src/sys/SPG6 i386 >Description: o Update to 20051024 o Clean up the port structure a bit >How-To-Repeat: >Fix: --- adzap.diff begins here --- diff -urN /usr/ports/www/adzap/Makefile adzap/Makefile --- /usr/ports/www/adzap/Makefile Sat Oct 8 20:37:08 2005 +++ adzap/Makefile Fri Nov 25 18:17:21 2005 @@ -5,7 +5,7 @@ # $FreeBSD: ports/www/adzap/Makefile,v 1.42 2005/10/08 16:37:08 kris Exp $ PORTNAME= adzap -PORTVERSION= 20051006 +PORTVERSION= 20051024 CATEGORIES= www perl5 MASTER_SITES= http://adzapper.sourceforge.net/ \ ${MASTER_SITE_LOCAL} @@ -14,40 +14,28 @@ MAINTAINER= kris@FreeBSD.org COMMENT= Filter out animated ad banners from web pages -WRKSRC= ${WRKDIR}/adzap +WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes USE_PERL5_RUN= yes USE_REINPLACE= yes -ZAPFILES= 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.html no-op-counter-clear.js \ - no-op-counter.html no-op-counter.js no-op.html no-op.js \ - webbug-clear.gif webbug-clear.js webbug.gif webbug.js \ - adzap.conf - -RCFILES= proxy-home.pac proxy-zip.pac +SUB_FILES= adzap.conf pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message do-configure: .for FILE in squid_redirect wrapzap ${REINPLACE_CMD} -e "s:/usr/bin/perl:${PERL5}:g" \ -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/scripts/${FILE} .endfor - ${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/zaps/adzap.conf do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${PREFIX}/libexec + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${PREFIX}/libexec/ ${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${PREFIX}/libexec/adzap - ${MKDIR} ${PREFIX}/share/examples/adzap -.for FILE in ${ZAPFILES} - ${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${EXAMPLESDIR} -.endfor -.for FILE in ${RCFILES} - ${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${EXAMPLESDIR} -.endfor + ${INSTALL} -d ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/zaps ${EXAMPLESDIR} + ${CP} -R ${WRKSRC}/rc ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKDIR}/adzap.conf ${EXAMPLESDIR} post-install: @${CAT} ${PKGMESSAGE} diff -urN /usr/ports/www/adzap/distinfo adzap/distinfo --- /usr/ports/www/adzap/distinfo Sat Oct 8 20:37:08 2005 +++ adzap/distinfo Thu Nov 24 20:24:44 2005 @@ -1,2 +1,3 @@ -MD5 (adzap-20051006.tar.gz) = d52398e30eae3bafae9ae286d76d27c0 -SIZE (adzap-20051006.tar.gz) = 51470 +MD5 (adzap-20051024.tar.gz) = 3e3e5e2bb7752be5c3c5c36d0eca41f0 +SHA256 (adzap-20051024.tar.gz) = 71c15a339543e6258d6320e1b28c66beea43bf390e4e831c056f8b9ad47e15d0 +SIZE (adzap-20051024.tar.gz) = 51811 diff -urN /usr/ports/www/adzap/files/adzap.conf.in adzap/files/adzap.conf.in --- /usr/ports/www/adzap/files/adzap.conf.in Thu Jan 1 03:00:00 1970 +++ adzap/files/adzap.conf.in Fri Nov 25 18:21:44 2005 @@ -0,0 +1,31 @@ +# 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://adzapper.sourceforge.net/zaps # a local web server will be better +ZAP_BASE_SSL=https://adzapper.sourceforge.net/zaps # this can probably be ignored +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_ADSSL=$ZAP_BASE_SSL/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_COUNTERJS=$ZAP_BASE/no-op-counter.js +STUBURL_COUNTERHTML=$ZAP_BASE/no-op-counter.html +STUBURL_WEBBUG=$ZAP_BASE/webbug.gif +STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js +STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html + +STUBURL_PRINT= # off by default, set to 1 diff -urN /usr/ports/www/adzap/files/patch-aa adzap/files/patch-aa --- /usr/ports/www/adzap/files/patch-aa Sun Oct 5 08:17:38 2003 +++ adzap/files/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,24 +0,0 @@ ---- 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 - diff -urN /usr/ports/www/adzap/files/patch-ab adzap/files/patch-ab --- /usr/ports/www/adzap/files/patch-ab Fri May 17 12:55:35 2002 +++ adzap/files/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,29 +0,0 @@ ---- /dev/null Fri May 17 01:36:29 2002 -+++ zaps/adzap.conf Fri May 17 01:39:27 2002 -@@ -0,0 +1,26 @@ -+# 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_BASE_SSL=https://adzap.cs.zip.com.au # this can probably be ignored -+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_ADSSL=$ZAP_BASE_SSL/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_COUNTERJS=$ZAP_BASE/no-op-counter.js -+STUBURL_WEBBUG=$ZAP_BASE/webbug.gif -+STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js diff -urN /usr/ports/www/adzap/files/patch-scripts-wrapzap adzap/files/patch-scripts-wrapzap --- /usr/ports/www/adzap/files/patch-scripts-wrapzap Thu Jan 1 03:00:00 1970 +++ adzap/files/patch-scripts-wrapzap Fri Nov 25 15:41:25 2005 @@ -0,0 +1,23 @@ +--- scripts/wrapzap.orig Fri Nov 25 14:36:00 2005 ++++ scripts/wrapzap Fri Nov 25 15:39:42 2005 +@@ -16,9 +16,9 @@ + # + + # modify this to match your install +-zapper=/usr/local/bin/squid_redirect ++zapper=%%PREFIX%%/libexec/squid_redirect + +-ZAP_MODE= # or "CLEAR" ++ZAP_MODE=blank # 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 + +@@ -50,6 +50,8 @@ + STUBURL_WEBBUGHTML=$ZAP_BASE/webbug.html + + STUBURL_PRINT= # off by default, set to 1 ++ ++. %%PREFIX%%/etc/adzap.conf + + export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH ZAP_MATCH ZAP_NO_CHANGE + export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUBURL_ADMP3 \ diff -urN /usr/ports/www/adzap/files/pkg-message.in adzap/files/pkg-message.in --- /usr/ports/www/adzap/files/pkg-message.in Thu Jan 1 03:00:00 1970 +++ adzap/files/pkg-message.in Fri Nov 25 18:08:33 2005 @@ -0,0 +1,15 @@ +========================================================================== + + Adzap has now been installed. To get it up and running, copy + %%EXAMPLESDIR%%/adzap.conf to %%PREFIX%%/etc/ and + modify it to match your setup. Then edit your squid configuration + and add %%PREFIX%%/libexec/adzap as your http-redirector. + + If you run a web server, you can copy files from + %%PREFIX%%/share/examples/adzap/zaps to your htdocs tree and + modify the web locations in %%PREFIX%%/etc/adzap.conf accordingly. + + You can find JavaScript proxy auto-configuration scripts in + %%EXAMPLESDIR%%/rc + +========================================================================== diff -urN /usr/ports/www/adzap/pkg-message adzap/pkg-message --- /usr/ports/www/adzap/pkg-message Sun Mar 4 08:07:22 2001 +++ adzap/pkg-message Thu Jan 1 03:00:00 1970 @@ -1,12 +0,0 @@ -========================================================================== - - Adzap has now been installed. To get it up and running, copy - ${PREFIX}/share/examples/adzap/adzap.conf to ${PREFIX}/etc and modify - it to match your setup. Then edit your squid configuration and - add ${PREFIX}/libexec/adzap as your http-redirector. - - If you run a web server, you can copy the *.{html,js,gif} files from - ${PREFIX}/share/examples/adzap to your htdocs tree and modify - the web locations in ${PREFIX}/etc/adzap.conf accordingly. - -========================================================================== diff -urN /usr/ports/www/adzap/pkg-plist adzap/pkg-plist --- /usr/ports/www/adzap/pkg-plist Fri Feb 13 13:22:31 2004 +++ adzap/pkg-plist Fri Nov 25 18:27:45 2005 @@ -1,32 +1,38 @@ libexec/adzap libexec/squid_redirect -%%EXAMPLESDIR%%/ad-clear.gif -%%EXAMPLESDIR%%/ad-clear.mp3 -%%EXAMPLESDIR%%/ad-clear.swf -%%EXAMPLESDIR%%/ad-grey.gif -%%EXAMPLESDIR%%/ad-old.gif -%%EXAMPLESDIR%%/ad.gif -%%EXAMPLESDIR%%/ad.mp3 -%%EXAMPLESDIR%%/ad.swf -%%EXAMPLESDIR%%/adbg-clear.gif -%%EXAMPLESDIR%%/adbg.gif %%EXAMPLESDIR%%/adzap.conf -%%EXAMPLESDIR%%/closepopup-clear.html -%%EXAMPLESDIR%%/closepopup.html -%%EXAMPLESDIR%%/counter-clear.gif -%%EXAMPLESDIR%%/counter.gif -%%EXAMPLESDIR%%/no-op-clear.html -%%EXAMPLESDIR%%/no-op-clear.js -%%EXAMPLESDIR%%/no-op-counter-clear.html -%%EXAMPLESDIR%%/no-op-counter-clear.js -%%EXAMPLESDIR%%/no-op-counter.html -%%EXAMPLESDIR%%/no-op-counter.js -%%EXAMPLESDIR%%/no-op.html -%%EXAMPLESDIR%%/no-op.js -%%EXAMPLESDIR%%/proxy-home.pac -%%EXAMPLESDIR%%/proxy-zip.pac -%%EXAMPLESDIR%%/webbug-clear.gif -%%EXAMPLESDIR%%/webbug-clear.js -%%EXAMPLESDIR%%/webbug.gif -%%EXAMPLESDIR%%/webbug.js +%%EXAMPLESDIR%%/rc/proxy-home.pac +%%EXAMPLESDIR%%/rc/proxy-zip.pac +%%EXAMPLESDIR%%/zaps/ad-clear.gif +%%EXAMPLESDIR%%/zaps/ad-clear.mp3 +%%EXAMPLESDIR%%/zaps/ad-clear.swf +%%EXAMPLESDIR%%/zaps/ad-grey.gif +%%EXAMPLESDIR%%/zaps/ad-old.gif +%%EXAMPLESDIR%%/zaps/ad.gif +%%EXAMPLESDIR%%/zaps/ad.mp3 +%%EXAMPLESDIR%%/zaps/ad.swf +%%EXAMPLESDIR%%/zaps/adbg-clear.gif +%%EXAMPLESDIR%%/zaps/adbg.gif +%%EXAMPLESDIR%%/zaps/closepopup-clear.html +%%EXAMPLESDIR%%/zaps/closepopup.html +%%EXAMPLESDIR%%/zaps/counter-clear.gif +%%EXAMPLESDIR%%/zaps/counter-clear.js +%%EXAMPLESDIR%%/zaps/counter.gif +%%EXAMPLESDIR%%/zaps/counter.js +%%EXAMPLESDIR%%/zaps/no-op-clear.html +%%EXAMPLESDIR%%/zaps/no-op-clear.js +%%EXAMPLESDIR%%/zaps/no-op-counter-clear.html +%%EXAMPLESDIR%%/zaps/no-op-counter-clear.js +%%EXAMPLESDIR%%/zaps/no-op-counter.html +%%EXAMPLESDIR%%/zaps/no-op-counter.js +%%EXAMPLESDIR%%/zaps/no-op.html +%%EXAMPLESDIR%%/zaps/no-op.js +%%EXAMPLESDIR%%/zaps/webbug-clear.gif +%%EXAMPLESDIR%%/zaps/webbug-clear.html +%%EXAMPLESDIR%%/zaps/webbug-clear.js +%%EXAMPLESDIR%%/zaps/webbug.gif +%%EXAMPLESDIR%%/zaps/webbug.html +%%EXAMPLESDIR%%/zaps/webbug.js +@dirrm %%EXAMPLESDIR%%/rc +@dirrm %%EXAMPLESDIR%%/zaps @dirrm %%EXAMPLESDIR%% --- adzap.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511251552.jAPFq62X092427>