update to 3.0.10

3.0.10 is a stable release which includes many enhancements but no major
new features. The most prominent improvements are SOCKS5 support and
zlib support for the default Privoxy builds.

5 files changed, 9 insertions, 36 deletions

diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 59c745a931e..7ba0e0327f1 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2009/02/04 21:20:39 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2009/02/04 21:30:53 drochner Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
-PKGNAME=	privoxy-3.0.8
-PKGREVISION=	2
+PKGNAME=	privoxy-3.0.10
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -69,5 +68,6 @@ post-install:
 	${CHMOD} -R a+r ${EGDIR}
 
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/privoxy/PLIST b/www/privoxy/PLIST
index afb00b36eab..3150082b8fc 100644
--- a/www/privoxy/PLIST
+++ b/www/privoxy/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/03/12 21:35:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2009/02/04 21:30:53 drochner Exp $
 man/man1/privoxy.1
 sbin/privoxy
 share/doc/privoxy/AUTHORS
@@ -86,6 +86,7 @@ share/examples/privoxy/templates/show-version
 share/examples/privoxy/templates/toggle
 share/examples/privoxy/templates/toggle-mini
 share/examples/privoxy/templates/untrusted
+share/examples/privoxy/templates/url-info-osd.xml
 share/examples/privoxy/trust
 share/examples/privoxy/user.action
 share/examples/privoxy/user.filter
diff --git a/www/privoxy/distinfo b/www/privoxy/distinfo
index ffea5af4322..cf9bb648c63 100644
--- a/www/privoxy/distinfo
+++ b/www/privoxy/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2009/02/04 21:20:39 drochner Exp $
+$NetBSD: distinfo,v 1.10 2009/02/04 21:30:53 drochner Exp $
 
-SHA1 (privoxy-3.0.8-stable-src.tar.gz) = 7fe2b7afde4066ef1f170f5f11850cf9da428a42
-RMD160 (privoxy-3.0.8-stable-src.tar.gz) = 604dd61a22dc74d06d4adaa4b3c87e4d5da5149b
-Size (privoxy-3.0.8-stable-src.tar.gz) = 2007961 bytes
+SHA1 (privoxy-3.0.10-stable-src.tar.gz) = 0ce51a8dc938fe6412daa7f6edf159b98fd66d54
+RMD160 (privoxy-3.0.10-stable-src.tar.gz) = 91c8d56b71a5c606554bf509827197d689d8fc10
+Size (privoxy-3.0.10-stable-src.tar.gz) = 1957465 bytes
 SHA1 (patch-aa) = c263d2a4b9522a33613f82ab2bc18d5c2b554b21
 SHA1 (patch-ac) = e39ffe694462b952c5ad66ac577a0acbee0a1d9f
-SHA1 (patch-ad) = d5d6fe935ff98a45ebbd209a5c7126cb5e42ae1a
-SHA1 (patch-ae) = 5cd064cd6b35196d32272bbbdc181a1e48d9be8f
 SHA1 (patch-af) = 8d572ece2f2d5cedcc7694ddda0b79e4453671ff
diff --git a/www/privoxy/patches/patch-ad b/www/privoxy/patches/patch-ad
deleted file mode 100644
index 024bab4956e..00000000000
--- a/www/privoxy/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/06/13 13:45:46 drochner Exp $
-
---- filters.h.orig	2007-10-19 18:53:28.000000000 +0200
-+++ filters.h
-@@ -325,7 +325,7 @@ extern char *get_last_url(char *subject,
- 
- extern pcrs_job *compile_dynamic_pcrs_job_list(const struct client_state *csp, const struct re_filterfile_spec *b);
- 
--extern inline int content_filters_enabled(const struct client_state *csp);
-+int content_filters_enabled(const struct client_state *csp);
- 
- /*
-  * Handling Max-Forwards:
diff --git a/www/privoxy/patches/patch-ae b/www/privoxy/patches/patch-ae
deleted file mode 100644
index 2e55a9412a3..00000000000
--- a/www/privoxy/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2008/06/13 13:45:46 drochner Exp $
-
---- filters.c.orig	2008-01-04 18:43:45.000000000 +0100
-+++ filters.c
-@@ -2674,7 +2674,7 @@ struct http_response *direct_response(st
-  * Returns     :  TRUE for yes, FALSE otherwise
-  *
-  *********************************************************************/
--inline int content_filters_enabled(const struct client_state *csp)
-+int content_filters_enabled(const struct client_state *csp)
- {
-    return (((csp->rlist != NULL) &&
-       (!list_is_empty(csp->action->multi[ACTION_MULTI_FILTER]))) ||