* Install more files now distributed with adzap

* Fix install (one file was removed) [1]
* Utilize EXAMPLESDIR
* Don't require perl at build time

PR:		ports/59100, ports/59041 [1]
Submitted by:	eik, Esa Karkkainen <ejk@iki.fi> [1]

2 files changed, 45 insertions, 26 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 67135ce47c34..de9cba1dfd18 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -16,29 +16,36 @@ COMMENT=	Filter out animated ad banners from web pages
 
 WRKSRC=		${WRKDIR}/adzap
 
-NO_BUILD=	# defined
-USE_PERL5=	# defined
-ZAPFILES=	adzap.conf closepopup-clear.html no-op-clear.html \
-		closepopup.html no-op.html no-op-clear.js no-op.js \
-		ad-clear.gif ad-clear.mp3 ad-clear.swf ad.gif
-RCFILES=	proxy-cisra.pac proxy-home.pac proxy-zip.pac
+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
+
+RCFILES=	proxy-home.pac proxy-zip.pac
 
 do-configure:
 .for FILE in squid_redirect wrapzap
-	${PERL} -pi -e "s:/usr/bin/perl:${PERL5}:g; \
-			s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/scripts/${FILE}
-	${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/zaps/adzap.conf
+	${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/wrapzap ${PREFIX}/libexec/adzap
 	${MKDIR} ${PREFIX}/share/examples/adzap
 .for FILE in ${ZAPFILES}
-	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap
+	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${EXAMPLESDIR}
 .endfor
 .for FILE in ${RCFILES}
-	${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${PREFIX}/share/examples/adzap
+	${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${EXAMPLESDIR}
 .endfor
 
 post-install:
diff --git a/www/adzap/pkg-plist b/www/adzap/pkg-plist
index 502669fd3bf8..20a486510636 100644
--- a/www/adzap/pkg-plist
+++ b/www/adzap/pkg-plist
@@ -1,17 +1,29 @@
 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.gif
-share/examples/adzap/adzap.conf
-share/examples/adzap/closepopup-clear.html
-share/examples/adzap/closepopup.html
-share/examples/adzap/no-op-clear.html
-share/examples/adzap/no-op-clear.js
-share/examples/adzap/no-op.html
-share/examples/adzap/no-op.js
-share/examples/adzap/proxy-cisra.pac
-share/examples/adzap/proxy-home.pac
-share/examples/adzap/proxy-zip.pac
-@dirrm share/examples/adzap
+%%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%%/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%%/webbug-clear.gif
+%%EXAMPLESDIR%%/webbug-clear.js
+%%EXAMPLESDIR%%/webbug.gif
+%%EXAMPLESDIR%%/webbug.js
+@dirrm %%EXAMPLESDIR%%