Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Nov 2000 22:15:38 -0500 (EST)
From:      jdunn@aquezada.com
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/22763: adzapper port upgrade
Message-ID:  <20001111031538.7B807B75A@aquarius.aquezada.com>

next in thread | raw e-mail | index | archive | help

>Number:         22763
>Category:       ports
>Synopsis:       adzapper port upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 10 19:20:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Julian C. Dunn
>Release:        FreeBSD 3.5-STABLE i386
>Organization:
Aquezada Productions
>Environment:

	

>Description:

	Adzapper port upgrade from 0.1.30 to 0.3.0

>How-To-Repeat:

	N/A

>Fix:

	Unified diff of source trees:


diff -ruN adzapper.old/Makefile adzapper/Makefile
--- adzapper.old/Makefile	Sat Apr 15 04:15:22 2000
+++ adzapper/Makefile	Fri Nov 10 21:25:33 2000
@@ -1,17 +1,18 @@
 # New ports collection makefile for:		adzapper
-# Date created:			01 Oct 1999
-# Whom:                 Dominik Rothert <dr@domix.de>
+# Date created:		10 Nov 2000
+# Whom:                 Julian Dunn <jdunn@aquezada.com>
 #
 # $FreeBSD: ports/www/adzapper/Makefile,v 1.3 2000/04/10 00:04:09 cpiazza Exp $
 #
 
 PORTNAME=	adzapper
-PORTVERSION= 	0.1.30
+PORTVERSION= 	0.3.0
 CATEGORIES=	www
-MASTER_SITES=	http://www.halcyon.com/adamf/adzapper/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://www.zaplet.org/adzapper/ \
+		ftp://ftp.aquezada.com/pub/distrib/adzapper/
+EXTRACT_SUFX=	.tar.gz
 
-MAINTAINER=	dr@domix.de
+MAINTAINER=	jdunn@aquezada.com
 
 BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS=	python:${PORTSDIR}/lang/python
@@ -19,10 +20,9 @@
 NO_BUILD=	yes
 
 post-extract:
-	@${RM} -rf ${WRKSRC}/src/medusa/CVS
 	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${FILESDIR}/adzapper.sh > \
 		${WRKSRC}/adzapper.sh
-	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${FILESDIR}/adzapper.sh > \
+	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${FILESDIR}/rc.adzapper.sh > \
 		${WRKSRC}/rc.adzapper.sh
 
 do-install:
@@ -30,11 +30,15 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/adzapper.sh ${PREFIX}/sbin/adzapper
 	${INSTALL_SCRIPT} ${WRKSRC}/adzapper.py ${PREFIX}/share/adzapper/
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.adzapper.sh ${PREFIX}/etc/rc.d/adzapper.sh
+	@if [ -d ${PREFIX}/share/adzapper/zaplets ]; then \
+		${MV} -f ${PREFIX}/share/adzapper/zaplets ${PREFIX}/share/adzapper/zaplets.old; \
+	fi
 	${CP} -Rp ${WRKSRC}/zaplets ${PREFIX}/share/adzapper
 	${CP} -Rp ${WRKSRC}/doc ${PREFIX}/share/adzapper
 	${CP} -Rp ${WRKSRC}/src ${PREFIX}/share/adzapper
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/adzapper
-	${INSTALL_DATA} ${WRKSRC}/adzapper.conf ${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/adzapper.conf ${PREFIX}/etc/adzapper.conf.sample
+	@${ECHO_MSG} "===> Copy the ${PREFIX}/etc/adzapper.conf.sample to ${PREFIX}/etc/adzapper.conf,"
+	@${ECHO_MSG} "===> adding your own customizations, before starting adzapperd."
 
 .include <bsd.port.mk>
diff -ruN adzapper.old/distinfo adzapper/distinfo
--- adzapper.old/distinfo	Sun Oct 31 21:33:09 1999
+++ adzapper/distinfo	Fri Nov 10 20:15:42 2000
@@ -1 +1 @@
-MD5 (adzapper-0.1.30.tgz) = abec2429b519ad06d26014ff50548c9d
+MD5 (adzapper-0.3.0.tar.gz) = 585e1b96ac7203eeda93b7359e2c66af
diff -ruN adzapper.old/files/rc.adzapper.sh adzapper/files/rc.adzapper.sh
--- adzapper.old/files/rc.adzapper.sh	Sat Jul  8 04:21:53 2000
+++ adzapper/files/rc.adzapper.sh	Fri Nov 10 21:35:26 2000
@@ -1,19 +1,6 @@
 #!/bin/sh
 
-case $1 in
-start)
-	if [ -f __PREFIX__/etc/adzapper.conf ]; then
-		__PREFIX__/sbin/adzapper &
-		test $? -eq 0 && echo -n ' adzapper'
-	fi
-	;;
-stop)
-	killall adzapper && echo -n ' adzapper'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
-
-exit 0
+if [ -f __PREFIX__/etc/adzapper.conf ]; then
+exec python __PREFIX__/share/adzapper/adzapper.py -f __PREFIX__/etc/adzapper.conf  >>/var/log/adzapperd.log 2>>/var/log/adzapperd.log &
+echo -n ' adzapperd'
+fi
diff -ruN adzapper.old/pkg-descr adzapper/pkg-descr
--- adzapper.old/pkg-descr	Sun Oct 31 21:33:09 1999
+++ adzapper/pkg-descr	Fri Nov 10 22:07:32 2000
@@ -1,3 +1,5 @@
 adzapper is a filtering proxy that can block ads from being displayed
 on your web browser. instead of ad banners, you see blank spaces:
 adzapper transforms the ads into transparent gifs.
+
+- Julian C. Dunn <jdunn@aquezada.com>
diff -ruN adzapper.old/pkg-plist adzapper/pkg-plist
--- adzapper.old/pkg-plist	Wed May 31 02:42:22 2000
+++ adzapper/pkg-plist	Fri Nov 10 22:02:48 2000
@@ -2,126 +2,253 @@
 etc/adzapper.conf.sample
 sbin/adzapper
 etc/rc.d/adzapper.sh
-share/adzapper/README
 share/adzapper/adzapper.py
-share/adzapper/doc/CHANGELOG
-share/adzapper/doc/COPYING
-share/adzapper/doc/COPYING-Zaplet
-share/adzapper/doc/PythonPowered.gif
-share/adzapper/doc/THANKS
-share/adzapper/doc/TODO
-share/adzapper/doc/about-adzapper.html
-share/adzapper/doc/description.txt
-share/adzapper/doc/index.html
-share/adzapper/doc/install.html
-share/adzapper/doc/template.html
-share/adzapper/doc/zaplet-file-format-v0.5.txt
-share/adzapper/doc/zaplet-file-format.html
-share/adzapper/doc/zaplets.html
-share/adzapper/doc/zpowered.jpg
-share/adzapper/src/adzapper_engine.py
-share/adzapper/src/asyncore_fixes.py
-share/adzapper/src/blank_gif.py
-share/adzapper/src/debug.py
-share/adzapper/src/http_proxy.py
-share/adzapper/src/http_server_fixes.py
-share/adzapper/src/medusa/__init__.py
-share/adzapper/src/medusa/asynchat.py
-share/adzapper/src/medusa/asyncore.py
-share/adzapper/src/medusa/counter.py
-share/adzapper/src/medusa/default_handler.py
-share/adzapper/src/medusa/filesys.py
-share/adzapper/src/medusa/ftp_server.py
-share/adzapper/src/medusa/http_date.py
-share/adzapper/src/medusa/http_server.py
-share/adzapper/src/medusa/logger.py
-share/adzapper/src/medusa/m_syslog.py
-share/adzapper/src/medusa/max_sockets.py
-share/adzapper/src/medusa/medusa_gif.py
-share/adzapper/src/medusa/mime_type_table.py
-share/adzapper/src/medusa/monitor.py
-share/adzapper/src/medusa/monitor_client.py
-share/adzapper/src/medusa/monitor_client_win32.py
-share/adzapper/src/medusa/producers.py
-share/adzapper/src/medusa/resolver.py
-share/adzapper/src/medusa/select_trigger.py
-share/adzapper/src/medusa/status_handler.py
-share/adzapper/src/platform_dependent.py
-share/adzapper/src/zaplet_engine.py
-share/adzapper/zaplets/204.71.200.zap
-share/adzapper/zaplets/207.87.18.203.zap
-share/adzapper/zaplets/209.132.99.165.zap
+share/adzapper/zaplets/xb.xoom.com.zap
+share/adzapper/zaplets/206.41.20.7.zap
+share/adzapper/zaplets/207.87.18.zap
 share/adzapper/zaplets/209.207.224.zap
+share/adzapper/zaplets/209.244.186.44.zap
+share/adzapper/zaplets/216.207.47.35.zap
 share/adzapper/zaplets/216.34.69.zap
+share/adzapper/zaplets/216.35.211.245.zap
+share/adzapper/zaplets/216.87.208.127.zap
 share/adzapper/zaplets/247media.com.zap
-share/adzapper/zaplets/abcnews.go.com.zap
 share/adzapper/zaplets/ad.preferences.com.zap
+share/adzapper/zaplets/ad.rouze.com.zap
 share/adzapper/zaplets/adfu.blockstackers.com.zap
 share/adzapper/zaplets/adimages.go.com.zap
-share/adzapper/zaplets/ads.enliven.com
+share/adzapper/zaplets/admedia.xoom.com.zap
+share/adzapper/zaplets/ads.freshmeat.net.zap
 share/adzapper/zaplets/ads.imgis.com.zap
 share/adzapper/zaplets/ads.netgravity.net.zap
+share/adzapper/zaplets/ads.tripod.com.zap
 share/adzapper/zaplets/ads.tucows.com.zap
-share/adzapper/zaplets/ads.web.aol.com
+share/adzapper/zaplets/ads.web.aol.com.zap
 share/adzapper/zaplets/ads.x10.com.zap
-share/adzapper/zaplets/adtech.de
+share/adzapper/zaplets/adserv.quality-channel.de.zap
+share/adzapper/zaplets/adserver.zap
+share/adzapper/zaplets/adtech.de.zap
 share/adzapper/zaplets/akamaitech.net.zap
 share/adzapper/zaplets/andovernews.com.zap
+share/adzapper/zaplets/arstechnica.com.zap
+share/adzapper/zaplets/banner.orb.net.zap
 share/adzapper/zaplets/bfast.com.zap
-share/adzapper/zaplets/blue.gif
+share/adzapper/zaplets/biz.thomsoninvest.net.zap
+share/adzapper/zaplets/blueninja.com.zap
+share/adzapper/zaplets/burstnet.com.zap
 share/adzapper/zaplets/cdnow.com.zap
-share/adzapper/zaplets/clickhere.egroups.com.zap
 share/adzapper/zaplets/cmpnet.com.zap
+share/adzapper/zaplets/clickhere.egroups.com.zap
 share/adzapper/zaplets/cnet.com.zap
+share/adzapper/zaplets/cnn.com.zap
+share/adzapper/zaplets/codecatalog.com.zap
+share/adzapper/zaplets/core.freshmeat.net.zap
+share/adzapper/zaplets/cygnus.com.zap
+share/adzapper/zaplets/dailyradar.com.zap
+share/adzapper/zaplets/davecentral.com.zap
+share/adzapper/zaplets/default-numeric.zap
 share/adzapper/zaplets/default.zap
 share/adzapper/zaplets/deja.com.zap
 share/adzapper/zaplets/dhs.org.zap
 share/adzapper/zaplets/dogpile.com.zap
 share/adzapper/zaplets/doubleclick.net.zap
+share/adzapper/zaplets/eads.com.zap
+share/adzapper/zaplets/economist.com.zap
+share/adzapper/zaplets/feedmag.com.zap
 share/adzapper/zaplets/flycast.com.zap
 share/adzapper/zaplets/focalink.com.zap
+share/adzapper/zaplets/i33.com.zap
 share/adzapper/zaplets/freshmeat.net.zap
-share/adzapper/zaplets/g.akamaitech.net
-share/adzapper/zaplets/geocities.com.zap
 share/adzapper/zaplets/go2net.com.zap
 share/adzapper/zaplets/headhunter.net.zap
+share/adzapper/zaplets/heise.de.zap
 share/adzapper/zaplets/herring.com.zap
 share/adzapper/zaplets/hotwired.com.zap
-share/adzapper/zaplets/i33.com.zap
+share/adzapper/zaplets/ibm.com.zap
 share/adzapper/zaplets/idirect.tucows.com.zap
 share/adzapper/zaplets/image.pathfinder.com.zap
+share/adzapper/zaplets/images.whatshotnow.com.zap
 share/adzapper/zaplets/imgis.com.zap
 share/adzapper/zaplets/infoseek.go.com.zap
+share/adzapper/zaplets/insight.com.zap
+share/adzapper/zaplets/intervu.net.zap
 share/adzapper/zaplets/link4ads.com.zap
 share/adzapper/zaplets/linkexchange.com.zap
 share/adzapper/zaplets/linuxjournal.com.zap
+share/adzapper/zaplets/linuxpower.com.zap
+share/adzapper/zaplets/linuxstart.com.zap
 share/adzapper/zaplets/linuxtoday.com.zap
 share/adzapper/zaplets/lwn.net.zap
+share/adzapper/zaplets/mercurycenter.com.zap
 share/adzapper/zaplets/msnbc.com.zap
+share/adzapper/zaplets/netg.vitaminshoppe.com.zap
 share/adzapper/zaplets/ngadcenter.net.zap
 share/adzapper/zaplets/ngserve.pcworld.com.zap
 share/adzapper/zaplets/promotions.yahoo.com.zap
+share/adzapper/zaplets/q.com.zap
+share/adzapper/zaplets/redherring.com.zap
 share/adzapper/zaplets/rouze.com.zap
 share/adzapper/zaplets/salon.com.zap
 share/adzapper/zaplets/salonmagazine.com.zap
-share/adzapper/zaplets/static.admaximize.com
+share/adzapper/zaplets/securityportal.com.zap
+share/adzapper/zaplets/sightings.com.zap
+share/adzapper/zaplets/static.admaximize.com.zap
+share/adzapper/zaplets/wired.com.zap
 share/adzapper/zaplets/technocrat.net.zap
+share/adzapper/zaplets/thechipmerchant.com.zap
 share/adzapper/zaplets/theonion.com.zap
 share/adzapper/zaplets/thestandard.com.zap
+share/adzapper/zaplets/thinksecret.com.zap
+share/adzapper/zaplets/uexpress.com.zap
+share/adzapper/zaplets/valueclick.com.zap
 share/adzapper/zaplets/view.avenuea.com.zap
 share/adzapper/zaplets/virtumundo.com.zap
 share/adzapper/zaplets/was.ads.link4ads.com.zap
-share/adzapper/zaplets/wired.com.zap
+share/adzapper/zaplets/websponsors.com.zap
 share/adzapper/zaplets/wsj.com.zap
 share/adzapper/zaplets/www.ad.tomshardware.com.zap
 share/adzapper/zaplets/www.go.com.zap
 share/adzapper/zaplets/www.rzeczpospolita.pl.zap
-share/adzapper/zaplets/yahoo.co.uk
+share/adzapper/zaplets/x10.com.zap
+share/adzapper/zaplets/yahoo.co.uk.zap
 share/adzapper/zaplets/yahoo.com.zap
 share/adzapper/zaplets/yimg.com.zap
+share/adzapper/zaplets/yoda.cybereps.com.zap
 share/adzapper/zaplets/zdnet.com.zap
-@dirrm share/adzapper/doc
+share/adzapper/zaplets/akamai.net.zap
+share/adzapper/zaplets/amedia.techies.com.zap
+share/adzapper/zaplets/angelfire.com.zap
+share/adzapper/zaplets/banners.uswestdex.com.zap
+share/adzapper/zaplets/beyond2000.com.zap
+share/adzapper/zaplets/businessweek.com.zap
+share/adzapper/zaplets/co.uk.zap
+share/adzapper/zaplets/coffeecup.com.zap
+share/adzapper/zaplets/dailynews.yahoo.com.zap
+share/adzapper/zaplets/dailynews1.yahoo.com.zap
+share/adzapper/zaplets/dir.yahoo.com.zap
+share/adzapper/zaplets/download.macromedia.com.zap
+share/adzapper/zaplets/fool.com.zap
+share/adzapper/zaplets/free-banners.com.zap
+share/adzapper/zaplets/gnu.org.zap
+share/adzapper/zaplets/google.com.zap.bak
+share/adzapper/zaplets/hondavfr.com.zap
+share/adzapper/zaplets/interadnet.com.zap
+share/adzapper/zaplets/linuxdevices.com.zap
+share/adzapper/zaplets/lycos.com.zap
+share/adzapper/zaplets/money.pagecount.com.zap
+share/adzapper/zaplets/newshub.com.zap
+share/adzapper/zaplets/pic.geocities.com.zap
+share/adzapper/zaplets/spiegel.com.zap
+share/adzapper/zaplets/store.yahoo.com.zap
+share/adzapper/zaplets/techrepublic.com.zap
+share/adzapper/zaplets/theregister.co.uk.zap
+share/adzapper/zaplets/worldforge.org.zap
+share/adzapper/zaplets/199.172.144.25.zap
+share/adzapper/doc/PythonPoweredSmall.gif
+share/adzapper/doc/COPYING
+share/adzapper/doc/COPYING-Zaplet
+share/adzapper/doc/PythonPowered.gif
+share/adzapper/doc/THANKS
+share/adzapper/doc/TODO
+share/adzapper/doc/about-adzapper.html
+share/adzapper/doc/description.txt
+share/adzapper/doc/index.html
+share/adzapper/doc/install.html
+share/adzapper/doc/sourceforge-description.txt
+share/adzapper/doc/template.html
+share/adzapper/doc/zaplet-file-format.html
+share/adzapper/doc/zaplets.html
+share/adzapper/doc/zaplet-0.9.dtd
+share/adzapper/doc/zpowered.jpg
+share/adzapper/doc/adzapper-bolt4.gif
+share/adzapper/doc/CHANGELOG
+share/adzapper/src/config_file/__init__.py
+share/adzapper/src/config_file/adzapper.conf.xml
+share/adzapper/src/config_file/foo.xml
+share/adzapper/src/config_file/foo1.xml
+share/adzapper/src/config_file/config_file-0.2.dtd
+share/adzapper/src/config_file/rw_config_file.py
+share/adzapper/src/debug/__init__.py
+share/adzapper/src/debug/debug.py
+share/adzapper/src/xml/parsers/xmlproc/xmlval.py
+share/adzapper/src/xml/parsers/xmlproc/catalog.py
+share/adzapper/src/xml/parsers/xmlproc/charconv.py
+share/adzapper/src/xml/parsers/xmlproc/dtdparser.py
+share/adzapper/src/xml/parsers/xmlproc/errors.py
+share/adzapper/src/xml/parsers/xmlproc/namespace.py
+share/adzapper/src/xml/parsers/xmlproc/xcatalog.py
+share/adzapper/src/xml/parsers/xmlproc/xmlapp.py
+share/adzapper/src/xml/parsers/xmlproc/xmldtd.py
+share/adzapper/src/xml/parsers/xmlproc/xmlproc.py
+share/adzapper/src/xml/parsers/xmlproc/xmlutils.py
+share/adzapper/src/xml/parsers/xmlproc/__init__.py
+share/adzapper/src/xml/parsers/__init__.py
+share/adzapper/src/xml/parsers/sgmllib.py
+share/adzapper/src/xml/parsers/xmllib.py
+share/adzapper/src/xml/sax/drivers/__init__.py
+share/adzapper/src/xml/sax/drivers/drv_xmllib.py
+share/adzapper/src/xml/sax/drivers/drv_xmlproc.py
+share/adzapper/src/xml/sax/drivers/drv_xmlproc_val.py
+share/adzapper/src/xml/sax/drivers/pylibs.py
+share/adzapper/src/xml/sax/__init__.py
+share/adzapper/src/xml/sax/saxexts.py
+share/adzapper/src/xml/sax/saxlib.py
+share/adzapper/src/xml/sax/saxutils.py
+share/adzapper/src/xml/__init__.py
+share/adzapper/src/zaplet/CVS/Root
+share/adzapper/src/zaplet/CVS/Repository
+share/adzapper/src/zaplet/CVS/Entries
+share/adzapper/src/zaplet/__init__.py
+share/adzapper/src/zaplet/zaplet_engine.py
+share/adzapper/src/zaplet/zaplet_object.py
+share/adzapper/src/zaplet/zaplet_sax_handler.py
+share/adzapper/src/ui/__init__.py
+share/adzapper/src/ui/actions.py
+share/adzapper/src/ui/dtml.py
+share/adzapper/src/ui/html_table.py
+share/adzapper/src/adzapper/CVS/Root
+share/adzapper/src/adzapper/CVS/Repository
+share/adzapper/src/adzapper/CVS/Entries
+share/adzapper/src/adzapper/__init__.py
+share/adzapper/src/adzapper/adzapper_engine.py
+share/adzapper/src/adzapper/blank_gif.py
+share/adzapper/src/adzapper/platform_dependent.py
+share/adzapper/src/medusa/CVS/Root
+share/adzapper/src/medusa/CVS/Repository
+share/adzapper/src/medusa/CVS/Entries
+share/adzapper/src/medusa/__init__.py
+share/adzapper/src/medusa/asynchat.py
+share/adzapper/src/medusa/asyncore.py
+share/adzapper/src/medusa/counter.py
+share/adzapper/src/medusa/default_handler.py
+share/adzapper/src/medusa/filesys.py
+share/adzapper/src/medusa/ftp_server.py
+share/adzapper/src/medusa/http_date.py
+share/adzapper/src/medusa/http_server.py
+share/adzapper/src/medusa/logger.py
+share/adzapper/src/medusa/m_syslog.py
+share/adzapper/src/medusa/max_sockets.py
+share/adzapper/src/medusa/medusa_gif.py
+share/adzapper/src/medusa/mime_type_table.py
+share/adzapper/src/medusa/monitor.py
+share/adzapper/src/medusa/monitor_client.py
+share/adzapper/src/medusa/monitor_client_win32.py
+share/adzapper/src/medusa/producers.py
+share/adzapper/src/medusa/resolver.py
+share/adzapper/src/medusa/select_trigger.py
+share/adzapper/src/medusa/status_handler.py
+share/adzapper/src/resolver_fixes.py
+share/adzapper/src/http_proxy.py
+share/adzapper/src/http_server_fixes.py
+share/adzapper/src/ui_handler.py
+share/adzapper/src/asyncore_fixes.py
+share/adzapper/README
+@dirrm share/adzapper/src/debug
+@dirrm share/adzapper/src/ui
 @dirrm share/adzapper/src/medusa
+@dirrm share/adzapper/src/xml
+@dirrm share/adzapper/src/zaplet
+@dirrm share/adzapper/src/config_file
 @dirrm share/adzapper/src
 @dirrm share/adzapper/zaplets
 @dirrm share/adzapper

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001111031538.7B807B75A>