8 files changed, 102 insertions, 103 deletions

diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index c1c79d0f62d5..fe6cf55de54f 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	adzap
-PORTVERSION=	20051006
+PORTVERSION=	20051024
 CATEGORIES=	www perl5
 MASTER_SITES=	http://adzapper.sourceforge.net/ \
 		${MASTER_SITE_LOCAL}
@@ -20,34 +20,22 @@ 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 --git a/www/adzap/distinfo b/www/adzap/distinfo
index 4391a25d534c..f12f30483383 100644
--- a/www/adzap/distinfo
+++ b/www/adzap/distinfo
@@ -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 --git a/www/adzap/files/adzap.conf.in b/www/adzap/files/adzap.conf.in
new file mode 100644
index 000000000000..4217a34182cd
--- /dev/null
+++ b/www/adzap/files/adzap.conf.in
@@ -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 --git a/www/adzap/files/patch-ab b/www/adzap/files/patch-ab
deleted file mode 100644
index 8439ae98a21a..000000000000
--- a/www/adzap/files/patch-ab
+++ /dev/null
@@ -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 --git a/www/adzap/files/patch-aa b/www/adzap/files/patch-scripts-wrapzap
index 8f2642ac7d58..42e1691d5a29 100644
--- a/www/adzap/files/patch-aa
+++ b/www/adzap/files/patch-scripts-wrapzap
@@ -1,24 +1,23 @@
---- scripts/wrapzap.orig	Sun Jul 20 04:38:48 2003
-+++ scripts/wrapzap	Sat Oct  4 21:14:49 2003
+--- 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
--
--ZAP_MODE=				# or "CLEAR"
 +zapper=%%PREFIX%%/libexec/squid_redirect
-+  
-+ZAP_MODE=CLEAR				# or blank
+ 
+-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
  
-@@ -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
+@@ -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 --git a/www/adzap/files/pkg-message.in b/www/adzap/files/pkg-message.in
new file mode 100644
index 000000000000..dc93b071d544
--- /dev/null
+++ b/www/adzap/files/pkg-message.in
@@ -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 --git a/www/adzap/pkg-message b/www/adzap/pkg-message
deleted file mode 100644
index 250e9e5d11eb..000000000000
--- a/www/adzap/pkg-message
+++ /dev/null
@@ -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 --git a/www/adzap/pkg-plist b/www/adzap/pkg-plist
index 8771301bc538..78c6e4dca781 100644
--- a/www/adzap/pkg-plist
+++ b/www/adzap/pkg-plist
@@ -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%%