Update to adzap-20020105

Submitted by:	wca

4 files changed, 40 insertions, 47 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 5770629cef46..9d2492798bef 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	adzap
-PORTVERSION=	20011013
+PORTVERSION=	20020105
 CATEGORIES=	www perl5
 MASTER_SITES=	http://www.zip.com.au/~cs/adzap/ \
 		${MASTER_SITE_LOCAL}
@@ -17,24 +17,27 @@ 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
 
 do-configure:
 .for FILE in squid_redirect 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}
+	${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
 .endfor
-#	${SED} s,%PREFIX%,${PREFIX}, < ${WRKSRC}/wrapzap > ${WRKSRC}/adzap
 
 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
 	${MKDIR} ${PREFIX}/share/examples/adzap
-.for FILE in adzap.conf proxy-cisra.pac proxy-home.pac proxy-zip.pac \
-	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
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/share/examples/adzap
+.for FILE in ${ZAPFILES}
+	${INSTALL_DATA} ${WRKSRC}/zaps/${FILE} ${PREFIX}/share/examples/adzap
+.endfor
+.for FILE in ${RCFILES}
+	${INSTALL_DATA} ${WRKSRC}/rc/${FILE} ${PREFIX}/share/examples/adzap
 .endfor
 
 post-install:
diff --git a/www/adzap/distinfo b/www/adzap/distinfo
index 6cfed842dbc7..9f58cced720d 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -1 +1 @@
-MD5 (adzap-20011013.tar.gz) = 87fc3b06d4328698bcc4f3340bce508f
+MD5 (adzap-20020105.tar.gz) = 649ffa89760cf82cad476a80fd19fa40
diff --git a/www/adzap/files/patch-aa b/www/adzap/files/patch-aa
index ddab808369b0..161e57070a77 100644
--- a/www/adzap/files/patch-aa
+++ b/www/adzap/files/patch-aa
@@ -1,32 +1,21 @@
---- wrapzap.orig	Fri Jun 22 18:39:22 2001
-+++ wrapzap	Tue Jul  3 01:21:49 2001
-@@ -16,27 +16,9 @@
- #
+--- scripts/wrapzap	Fri Dec 28 09:11:04 2001
++++ scripts/wrapzap.new	Fri Dec 28 09:13:32 2001
+@@ -28,6 +28,9 @@
+ 					# for patterns in addition to the
+ 					# stock zapper; this is the one to
+ 					# which you should add new ads
++
++. %%PREFIX%%/etc/adzap.conf
++
+ STUBURL_AD=$ZAP_BASE/ad.gif
+ STUBURL_ADSSL=$ZAP_BASE_SSL/ad.gif
+ STUBURL_ADBG=$ZAP_BASE/adbg.gif
+@@ -40,6 +43,8 @@
+ STUBURL_COUNTERJS=$ZAP_BASE/no-op-counter.js
+ STUBURL_WEBBUG=$ZAP_BASE/webbug.gif
+ STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
++
++. %%PREFIX%%/etc/adzap.conf
  
- # modify this to match your install
--zapper=/usr/local/script/squid_redirect
-+zapper=@@PREFIX@@/libexec/squid_redirect
- 
--ZAP_MODE=				# or "CLEAR"
--ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
--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_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_WEBBUG=$ZAP_BASE/webbug.gif
--STUBURL_WEBBUGJS=$ZAP_BASE/webbug.js
-+. @@PREFIX@@/etc/adzap.conf
- 
- export ZAP_MODE ZAP_BASE ZAP_PREMATCH ZAP_POSTMATCH
- export STUBURL_AD STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
+ export ZAP_MODE ZAP_BASE ZAP_BASE_SSL ZAP_PREMATCH ZAP_POSTMATCH
+ export STUBURL_AD STUBURL_ADSSL STUBURL_ADJS STUBURL_ADHTML STUDURL_ADMP3 STUBURL_ADPOPUP \
diff --git a/www/adzap/files/patch-ab b/www/adzap/files/patch-ab
index 13caa848cc0a..601c40c81930 100644
--- a/www/adzap/files/patch-ab
+++ b/www/adzap/files/patch-ab
@@ -1,10 +1,11 @@
---- adzap.conf.orig	Tue Jul  3 01:28:24 2001
-+++ adzap.conf	Tue Jul  3 01:28:41 2001
-@@ -0,0 +1,23 @@
+--- /dev/null	Fri Dec 28 09:15:33 2001
++++ zaps/adzap.conf	Fri Dec 28 09:15:03 2001
+@@ -0,0 +1,24 @@
 +# example adzap configuration file
 +# copy this file over to ${PREFIX}/etc/adzap.conf,
 +# then modify this to match your install
 +
++zapper=%%PREFIX%%/libexec/adzap		# location of the zapper
 +ZAP_MODE=CLEAR				# or "CLEAR"
 +ZAP_BASE=http://adzap.cs.zip.com.au	# a local web server will be better
 +ZAP_PREMATCH=				# pathname of extra pattern file