update to 3.0.6

3.0.6 is a stable release which includes many significant enhancements
and new features, including a number of new actions, multiple filter file
capability, full windows service functionality, as well as numerous
bugs done away with. See http://www.privoxy.org/user-manual/whatsnew.html
for details.

5 files changed, 39 insertions, 31 deletions

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index cdf0aaa44a9..cdd260e41ee 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2006/10/01 08:59:43 schwarz Exp $
+# $NetBSD: Makefile,v 1.30 2006/11/24 18:26:06 drochner Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
-PKGNAME=	privoxy-3.0.3
-PKGREVISION=	5
+PKGNAME=	privoxy-3.0.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
diff --git a/www/privoxy/PLIST b/www/privoxy/PLIST
index 85aef89191f..8b03370aaaf 100644
--- a/www/privoxy/PLIST
+++ b/www/privoxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/02 20:34:07 reed Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/11/24 18:26:06 drochner Exp $
 man/man1/privoxy.1
 sbin/privoxy
 share/doc/privoxy/AUTHORS
@@ -25,8 +25,6 @@ share/doc/privoxy/faq/index.html
 share/doc/privoxy/faq/installation.html
 share/doc/privoxy/faq/misc.html
 share/doc/privoxy/faq/trouble.html
-share/doc/privoxy/images/files-in-use.jpg
-share/doc/privoxy/images/proxy_setup.jpg
 share/doc/privoxy/index.html
 share/doc/privoxy/man-page/privoxy-man-page.html
 share/doc/privoxy/p_doc.css
@@ -36,15 +34,20 @@ share/doc/privoxy/user-manual/config.html
 share/doc/privoxy/user-manual/configuration.html
 share/doc/privoxy/user-manual/contact.html
 share/doc/privoxy/user-manual/copyright.html
+share/doc/privoxy/user-manual/files-in-use.jpg
 share/doc/privoxy/user-manual/filter-file.html
 share/doc/privoxy/user-manual/index.html
 share/doc/privoxy/user-manual/installation.html
 share/doc/privoxy/user-manual/introduction.html
+share/doc/privoxy/user-manual/p_doc.css
+share/doc/privoxy/user-manual/proxy2.jpg
+share/doc/privoxy/user-manual/proxy_setup.jpg
 share/doc/privoxy/user-manual/quickstart.html
 share/doc/privoxy/user-manual/seealso.html
 share/doc/privoxy/user-manual/startup.html
 share/doc/privoxy/user-manual/templates.html
 share/doc/privoxy/user-manual/upgradersnote.html
+share/doc/privoxy/user-manual/whatsnew.html
 share/examples/privoxy/config
 share/examples/privoxy/default.action
 share/examples/privoxy/default.filter
@@ -84,6 +87,7 @@ share/examples/privoxy/templates/toggle-mini
 share/examples/privoxy/templates/untrusted
 share/examples/privoxy/trust
 share/examples/privoxy/user.action
+share/examples/privoxy/user.filter
 share/examples/rc.d/privoxy
 @dirrm share/examples/privoxy/templates
 @dirrm share/examples/privoxy
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index e6536b262bc..02495b1049e 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2006/04/25 07:42:06 kim Exp $
+$NetBSD: distinfo,v 1.6 2006/11/24 18:26:06 drochner Exp $
 
-SHA1 (privoxy-3.0.3-stable-src.tar.gz) = 8aa5ad21a819c0cd5e5f3aadf24e9fb0d813bdaa
-RMD160 (privoxy-3.0.3-stable-src.tar.gz) = ae77a87c51ec8685f9352c99a8db820fc95b9202
-Size (privoxy-3.0.3-stable-src.tar.gz) = 1561072 bytes
-SHA1 (patch-aa) = 2bdc980df283f14ac8694f04b07e6d499d46c5c1
-SHA1 (patch-ab) = 9c5ac1a916913119345daf8b261229c84d2979a1
+SHA1 (privoxy-3.0.6-stable-src.tar.gz) = 6369c02ef6e044d23fd1d90f6523b489abe58c0c
+RMD160 (privoxy-3.0.6-stable-src.tar.gz) = 96483460ce56e6abc062278882997c548bb2e119
+Size (privoxy-3.0.6-stable-src.tar.gz) = 1755661 bytes
+SHA1 (patch-aa) = 72b2d9195d1e5b16b7eb844f539310eeb99247b9
+SHA1 (patch-ab) = 44c42035867b82f0e04d185c700d2176b7892297
 SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
diff --git a/www/privoxy/patches/patch-aa b/www/privoxy/patches/patch-aa
index 38779048a64..15719567766 100644
--- a/www/privoxy/patches/patch-aa
+++ b/www/privoxy/patches/patch-aa
@@ -1,22 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/06/16 03:02:04 kim Exp $
+$NetBSD: patch-aa,v 1.2 2006/11/24 18:26:06 drochner Exp $
 
---- config.orig	2003-03-05 11:34:15.000000000 -0500
-+++ config	2003-06-15 19:35:33.000000000 -0400
-@@ -104,7 +104,7 @@
+--- config.orig	2006-11-14 02:54:36.000000000 +0100
++++ config
+@@ -266,7 +266,7 @@ trust-info-url  http://www.example.com/w
  #      flat, except for confdir/templates, where the HTML templates
  #      for CGI output reside (e.g. Privoxy's 404 error page).
- #  
+ #
 -confdir .
 +confdir @PKG_SYSCONFDIR@
  
- #  
- #  1.2. logdir
-@@ -131,7 +131,7 @@
- #  
+ #
+ #  2.2. logdir
+@@ -293,7 +293,7 @@ confdir .
+ #
  #      No trailing "/", please
- #  
+ #
 -logdir .
 +logdir /var/log/privoxy
  
- #  
- #  1.3. actionsfile
+ #
+ #  2.3. actionsfile
diff --git a/www/privoxy/patches/patch-ab b/www/privoxy/patches/patch-ab
index da6d3849798..8c017b6d732 100644
--- a/www/privoxy/patches/patch-ab
+++ b/www/privoxy/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $
+$NetBSD: patch-ab,v 1.3 2006/11/24 18:26:06 drochner Exp $
 
---- GNUmakefile.in.orig	2004-01-31 03:15:33.000000000 +0200
-+++ GNUmakefile.in	2006-04-25 10:39:31.000000000 +0300
-@@ -246,7 +246,7 @@
+--- GNUmakefile.in.orig	2006-10-25 13:55:45.000000000 +0200
++++ GNUmakefile.in
+@@ -246,7 +246,7 @@ OTHER_CFLAGS =   
  CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \
           @STATIC_PCRE_ONLY@ -Ipcre 
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $
  
  
  #############################################################################
-@@ -1122,17 +1122,6 @@
+@@ -1126,22 +1126,6 @@ install: CONF_DEST LOG_DEST PID_DEST che
  	@$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
  	-$(INSTALL) $(INSTALL_T) privoxy.1  $(MAN_DEST)/privoxy.1
  
@@ -21,8 +21,13 @@ $NetBSD: patch-ab,v 1.2 2006/04/25 07:42:06 kim Exp $
 -		$(CAT) config >config~ ;\
 -		$(MV) config.base config ;\
 -	fi
--	$(SED) 's+confdir .+confdir $(CONF_DEST)+' config | \
--	$(SED) 's+logdir .+logdir $(LOG_DEST)+' >config.updated
+-	$(SED) 's+^confdir \.+confdir $(CONF_DEST)+' config | \
+-	$(SED) 's+^logdir \.+logdir $(LOG_DEST)+' >config.tmp
+-	-@if [ $(check_doc) = 0 ]; then \
+-      $(SED) 's+^#\?user-manual .*+user-manual $(DOC_DEST)/user-manual/+' config.tmp >config.updated ;\
+-	else \
+-      $(SED) 's+^#\?user-manual .*+user-manual $(prefix)/doc/privoxy/user-manual/+' config.tmp >config.updated ;\
+-	fi;\
 -	$(MV) config config.base
 -	$(MV) config.updated config 
 -