Changes 20110915:

Bug fixes.

2 files changed, 25 insertions, 41 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index e69c491fc7e..5c199e58b2a 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,55 +1,39 @@
-# $NetBSD: Makefile,v 1.67 2013/05/31 12:42:30 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.68 2013/08/09 11:16:28 adam Exp $
 
-DISTNAME=	adzap-20080508
-PKGREVISION=	2
+DISTNAME=	adzap-20110915
 CATEGORIES=	www perl5
-# XXX: should use the following one day:
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=adzapper/}
 MASTER_SITES=	http://adzapper.sourceforge.net/
 
 MAINTAINER=	simonb@NetBSD.org
 HOMEPAGE=	http://adzapper.sourceforge.net/
 COMMENT=	Filter out animated ad banners from web pages
+LICENSE=	2-clause-bsd
 
-WRKSRC=		${WRKDIR}/adzap
-NO_BUILD=	yes
-USE_TOOLS+=	perl:run
+USE_TOOLS+=		perl:run
+NO_BUILD=		yes
 
 CHECK_PORTABILITY_SKIP=	scripts/update-zapper.damien
 
 INSTALLATION_DIRS=	libexec share/examples/adzap
 
-do-configure:
-.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" \
-		<${WRKSRC}/${file}.ORIG >${WRKSRC}/${file}
-.endfor
+REPLACE_PERL+=		scripts/squid_redirect-nodata
+
+SUBST_CLASSES+=		paths
+SUBST_MESSAGE.paths=	Fixing absolute paths.
+SUBST_FILES.paths=	scripts/squid_redirect
+SUBST_FILES.paths+=	scripts/wrapzap
+SUBST_VARS.paths=	PREFIX
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect ${DESTDIR}${PREFIX}/libexec
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap ${DESTDIR}${PREFIX}/libexec/adzap
-.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-clear.js \
-    counter.gif counter.js \
-    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.html webbug-clear.js \
-    webbug.gif webbug.html webbug.js
-	${INSTALL_DATA} ${WRKSRC}/zaps/${file} ${DESTDIR}${PREFIX}/share/examples/adzap
-.endfor
-.for file in proxy-home.pac proxy-zip.pac
-	${INSTALL_DATA} ${WRKSRC}/rc/${file} ${DESTDIR}${PREFIX}/share/examples/adzap
-.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect-nodata \
+		${DESTDIR}${PREFIX}/libexec/squid_redirect
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/wrapzap \
+		${DESTDIR}${PREFIX}/libexec/adzap
+	${INSTALL_DATA} ${WRKSRC}/zaps/* \
+		${DESTDIR}${PREFIX}/share/examples/adzap/
+	${INSTALL_DATA} ${WRKSRC}/rc/*.pac \
+		${DESTDIR}${PREFIX}/share/examples/adzap/
 	${INSTALL_DATA} ${WRKSRC}/scripts/adzap.conf \
-	    ${DESTDIR}${PREFIX}/share/examples/adzap
+	    ${DESTDIR}${PREFIX}/share/examples/adzap/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 35e78c53811..a8bf929ebe3 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2008/10/30 01:28:53 simonb Exp $
+$NetBSD: distinfo,v 1.44 2013/08/09 11:16:28 adam Exp $
 
-SHA1 (adzap-20080508.tar.gz) = ea58a23a1db4d1913b44a97cf10fe61b3af48d06
-RMD160 (adzap-20080508.tar.gz) = 2ed46689d44db601daaebd72c1fdf29069f00f91
-Size (adzap-20080508.tar.gz) = 57061 bytes
+SHA1 (adzap-20110915.tar.gz) = dd1d8a251c16fcaea339e5ea374be0d9adca153b
+RMD160 (adzap-20110915.tar.gz) = c7888c8240c8a227788f91166d8d2a771aa24296
+Size (adzap-20110915.tar.gz) = 128132 bytes
 SHA1 (patch-aa) = 3837d35d3a02b405010ff6a7b213c12400d0800b
 SHA1 (patch-ab) = 840c8b7b8adfa6f324127a7a22204a7a7166a302