Index: head/www/privoxy/Makefile
===================================================================
--- head/www/privoxy/Makefile	(revision 250247)
+++ head/www/privoxy/Makefile	(revision 250248)
@@ -1,112 +1,132 @@
 # New ports collection makefile for:	privoxy
 # Date created:				21 November 2002
 # Whom:					John von Essen
 #
 # $FreeBSD$
 #
 
 PORTNAME=	privoxy
-PORTVERSION=	3.0.12
-CATEGORIES=	www
+PORTVERSION=	3.0.16
+CATEGORIES=	www ipv6
 MASTER_SITES=	SF/ijbswa/Sources/${PORTVERSION}%20%28stable%29
 DISTNAME=	privoxy-${PORTVERSION}-stable-src
 
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 WRKSRC=		${WRKDIR}/privoxy-${PORTVERSION}-stable
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262
 
 USE_RC_SUBR=	privoxy
 SUB_FILES=	pkg-message
 
 MAKEFILE=	GNUmakefile
 
 # privoxy-devel is the development release available at the Privoxy website.
 # It's not (yet) part of the FreeBSD ports collection.
 CONFLICTS=	privoxy-devel-[0-9]*
 
 MAN1=		privoxy.1
 
 CONFIGURE_ENV=	LDFLAGS=-L${LOCALBASE}/lib \
 		CPPFLAGS=-I${LOCALBASE}/include/
 
-OPTIONS=	FORCE "Allows to optionally bypass blocks" On \
-		TOGGLE "Support for remote toggling" On \
+OPTIONS=	ACCEPT_FILTER "Enable support for accf_http(9)" Off \
+		DEBUG "Build with debugging symbols" Off \
 		EDITOR "Allow to enable the webbased action editor" On \
-		DEBUG "Build with debugging symbols" Off
+		FORCE "Allows to optionally bypass blocks" On \
+		PRIVOXY_TOOLS "Install Privoxy-Log-Parser, uagen etc." Off \
+		TOGGLE "Support for remote toggling" On
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_FORCE)
-CONFIGURE_ARGS+=	--disable-force
+.if defined(WITH_ACCEPT_FILTER)
+CONFIGURE_ARGS+=	 --enable-accept-filter
 .endif
 
-.if defined(WITHOUT_TOGGLE)
-CONFIGURE_ARGS+=	--disable-toggle
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--with-debug
 .endif
 
 .if defined(WITHOUT_EDITOR)
 CONFIGURE_ARGS+=	--disable-editor
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--with-debug
+.if defined(WITHOUT_FORCE)
+CONFIGURE_ARGS+=	--disable-force
 .endif
 
+.if defined(WITHOUT_TOGGLE)
+CONFIGURE_ARGS+=	--disable-toggle
+.endif
+
+.if defined(WITH_PRIVOXY_TOOLS)
+USE_PERL5_RUN=	yes
+RUN_DEPENDS+=	curl.5:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	PRIVOXY_TOOLS=""
+.else
+PLIST_SUB+=	PRIVOXY_TOOLS="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's,^\(confdir\) \.,\1 ${PREFIX}/etc/privoxy,' \
 		-e 's,^\(logdir\) \.,\1 /var/log/privoxy,' \
 		-e 's,^\(actionsfile user\),#\1,' \
 	${WRKSRC}/config
 .if !defined(NOPORTDOCS)
 	${REINPLACE_CMD} \
 		-e 's,^#\(user-manual\) http://www.privoxy.org/user-manual/,\1 ${DOCSDIR}/user-manual,' \
 	${WRKSRC}/config
-
 .endif
+	${REINPLACE_CMD} \
+		-e 's,\(/etc/privoxy\),${PREFIX}\1,' ${WRKSRC}/tools/uagen.pl
+# Effectivly apply revision 1.208 to fix a regression test.
+	${REINPLACE_CMD} \
+		-e 's,\(-fast-redirects -hide-refer\),\1r,' ${WRKSRC}/default.action.master
 
 pre-configure:
 	@cd ${WRKSRC}; ${AUTOHEADER}
 
 pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
 		${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${MKDIR} ${PREFIX}/etc/privoxy/templates
 	@${INSTALL_PROGRAM} ${WRKSRC}/privoxy ${PREFIX}/sbin
 	@${INSTALL_DATA} ${WRKSRC}/templates/[a-z]* ${PREFIX}/etc/privoxy/templates
-.for defaultfile in default.action default.filter
+.if defined(WITH_PRIVOXY_TOOLS)
+.for privoxy_tool in privoxy-log-parser.pl privoxy-regression-test.pl uagen.pl
+	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${privoxy_tool} ${PREFIX}/bin
+.endfor
+.endif
+.for defaultfile in default.action default.filter regression-tests.action
 	@${INSTALL_DATA} ${WRKSRC}/${defaultfile} ${PREFIX}/etc/privoxy
 	@${CHOWN} privoxy:privoxy ${PREFIX}/etc/privoxy/${defaultfile}
 	@${CHMOD} 0444 ${PREFIX}/etc/privoxy/${defaultfile}
 .endfor
 	@${MKDIR} ${EXAMPLESDIR}
 .for examplefile in config match-all.action trust user.action
 	@${INSTALL_DATA} ${WRKSRC}/${examplefile} ${EXAMPLESDIR}/
 	@${CHOWN} privoxy:privoxy ${EXAMPLESDIR}/${examplefile}
 	@${CHMOD} 0640 ${EXAMPLESDIR}/${examplefile}
 .endfor
 	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/user-manual
 	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${DOCSDIR}/user-manual
 	@${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${DOCSDIR}/user-manual
 .endif
 
 post-install:
-	@${MKDIR} /var/log/privoxy
-	@${CHOWN} privoxy:privoxy /var/log/privoxy
-	@${CHMOD} 0750 /var/log/privoxy
 	@${MKDIR} /var/run/privoxy
 	@${CHOWN} privoxy:privoxy /var/run/privoxy
 	@${CHMOD} 0750 /var/run/privoxy
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/www/privoxy/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property
Index: head/www/privoxy/distinfo
===================================================================
--- head/www/privoxy/distinfo	(revision 250247)
+++ head/www/privoxy/distinfo	(revision 250248)
@@ -1,3 +1,3 @@
-MD5 (privoxy-3.0.12-stable-src.tar.gz) = c973e608d27b248ef567b47664308da1
-SHA256 (privoxy-3.0.12-stable-src.tar.gz) = c910da7fdd51dc197b7cd6695555c7dd0124b8fc44cb03d1fc645d72438dcf9a
-SIZE (privoxy-3.0.12-stable-src.tar.gz) = 1811124
+MD5 (privoxy-3.0.16-stable-src.tar.gz) = 64d3ffcdf8307e04a375773bb4eb255e
+SHA256 (privoxy-3.0.16-stable-src.tar.gz) = 7df74e33cf9263cb8153e5746e4ad09bf82d7c43d175511bb79056b8a4fafee6
+SIZE (privoxy-3.0.16-stable-src.tar.gz) = 1656721

Property changes on: head/www/privoxy/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/www/privoxy/files/pkg-message.in
===================================================================
--- head/www/privoxy/files/pkg-message.in	(revision 250247)
+++ head/www/privoxy/files/pkg-message.in	(revision 250248)
@@ -1,27 +1,27 @@
 ***********************************************************
   To start Privoxy on boot, add: privoxy_enable="YES"
   to /etc/rc.conf.
 
   To start Privoxy manually, run:
   /usr/local/etc/rc.d/privoxy forcestart
   The script understands most of the commands listed
   in rc(8), it also contains a list of other rc
   variables you can use.
 
   Privoxy's example files were copied to:
   %%EXAMPLESDIR%%
 
   For documentation see:
   %%DOCSDIR%%/user-manual or 'man privoxy'
 
   Note that default.filter and default.action get
   overwritten with each Privoxy update. Instead of
   changing them you should use your own action and
   filter files as described in Privoxy's manual.
 
-  If you installed Privoxy as package and are using the
-  default configuration, you have to make sure the
-  directories /var/log/privoxy and /var/run/privoxy
-  exist and are owned by privoxy:privoxy.
+  If you installed Privoxy as package and are using
+  the default configuration, you have to make sure
+  the directory /var/run/privoxy exists and is owned
+  by privoxy:privoxy.
 
 ***********************************************************

Property changes on: head/www/privoxy/files/pkg-message.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/www/privoxy/files/privoxy.in
===================================================================
--- head/www/privoxy/files/privoxy.in	(revision 250247)
+++ head/www/privoxy/files/privoxy.in	(revision 250248)
@@ -1,55 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 #
 # PROVIDE: privoxy
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 #
 # This rc script understands the following variables
 # which are read from /etc/rc.conf:
 #
 # privoxy_enable  (bool): Set to "NO" by default.
 #                         Set it to "YES" to enable Privoxy.
 # privoxy_config   (str): Privoxy's configuration file. Default is:
 #                         %%PREFIX%%/etc/privoxy/config.
 # privoxy_flags    (str): List of additional Privoxy options you want
 #                         to use. None set by default.
 # privoxy_pidfile  (str): Default is /var/run/privoxy/privoxy.pid.
 # privoxy_user     (str): Privoxy Daemon user. Default is privoxy.
 #
 # Usage:
 # %%PREFIX%%/etc/rc.d/privoxy [fast|force|one](start|stop|restart|rcvar|status|poll)
 
 . %%RC_SUBR%%
 
 name="privoxy"
 rcvar=${name}_enable
 load_rc_config ${name}
 
 : ${privoxy_enable="NO"}
 : ${privoxy_config="%%PREFIX%%/etc/privoxy/config"}
+: ${privoxy_logdir="/var/log/privoxy"}
 : ${privoxy_user="privoxy"}
 : ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"}
 
 config_file_check () {
     if [ ! -e ${privoxy_config} ]; then
         echo config file not found. Copying the example file to ${privoxy_config}.
         cp %%PREFIX%%/share/examples/privoxy/config ${privoxy_config}
         chown ${privoxy_user}:${privoxy_user} ${privoxy_config};
     fi
     actionfile="%%PREFIX%%/etc/privoxy/match-all.action"
     if [ ! -e ${actionfile} ]; then
         echo ${actionfile} not found. Copying the example file.
         cp %%PREFIX%%/share/examples/privoxy/match-all.action ${actionfile}
         chown ${privoxy_user}:${privoxy_user} ${actionfile}
+    fi
+    if [ ! -e ${privoxy_logdir} ]; then
+        echo ${privoxy_logdir} not found. Creating ...
+        mkdir ${privoxy_logdir}
+        chown ${privoxy_user}:${privoxy_user} ${privoxy_logdir}
+        chmod 0750 ${privoxy_logdir}
     fi
 }
 
 start_precmd="config_file_check"
 
 command="%%PREFIX%%/sbin/privoxy"
 command_args="${privoxy_flags} --pidfile ${privoxy_pidfile} ${privoxy_config}"
 
 run_rc_command "$1"

Property changes on: head/www/privoxy/files/privoxy.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/www/privoxy/pkg-plist
===================================================================
--- head/www/privoxy/pkg-plist	(revision 250247)
+++ head/www/privoxy/pkg-plist	(revision 250248)
@@ -1,67 +1,72 @@
+%%PRIVOXY_TOOLS%%bin/privoxy-log-parser.pl
+%%PRIVOXY_TOOLS%%bin/privoxy-regression-test.pl
+%%PRIVOXY_TOOLS%%bin/uagen.pl
 sbin/privoxy
 etc/privoxy/default.action
 etc/privoxy/default.filter
+etc/privoxy/regression-tests.action
 etc/privoxy/templates/blocked
 etc/privoxy/templates/cgi-error-404
 etc/privoxy/templates/cgi-error-bad-param
 etc/privoxy/templates/cgi-error-disabled
 etc/privoxy/templates/cgi-error-file
 etc/privoxy/templates/cgi-error-file-read-only
 etc/privoxy/templates/cgi-error-modified
 etc/privoxy/templates/cgi-error-parse
 etc/privoxy/templates/cgi-style.css
 etc/privoxy/templates/connect-failed
+etc/privoxy/templates/connection-timeout
 etc/privoxy/templates/default
 etc/privoxy/templates/edit-actions-add-url-form
 etc/privoxy/templates/edit-actions-for-url
 etc/privoxy/templates/edit-actions-for-url-filter
 etc/privoxy/templates/edit-actions-list
 etc/privoxy/templates/edit-actions-list-button
 etc/privoxy/templates/edit-actions-list-section
 etc/privoxy/templates/edit-actions-list-url
 etc/privoxy/templates/edit-actions-remove-url-form
 etc/privoxy/templates/edit-actions-url-form
 etc/privoxy/templates/forwarding-failed
 etc/privoxy/templates/mod-local-help
 etc/privoxy/templates/mod-support-and-service
 etc/privoxy/templates/mod-title
 etc/privoxy/templates/mod-unstable-warning
+etc/privoxy/templates/no-server-data
 etc/privoxy/templates/no-such-domain
 etc/privoxy/templates/show-request
 etc/privoxy/templates/show-status
 etc/privoxy/templates/show-status-file
 etc/privoxy/templates/show-url-info
 etc/privoxy/templates/show-version
 etc/privoxy/templates/toggle
 etc/privoxy/templates/toggle-mini
 etc/privoxy/templates/untrusted
 etc/privoxy/templates/url-info-osd.xml
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/actions-file.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/appendix.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/config.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/contact.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/files-in-use.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/filter-file.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/index.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/p_doc.css
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/proxy_setup.jpg
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/seealso.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/startup.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/templates.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual/upgradersnote.html
 %%PORTDOCS%%%%DOCSDIR%%/user-manual/whatsnew.html
 %%EXAMPLESDIR%%/config
 %%EXAMPLESDIR%%/match-all.action
 %%EXAMPLESDIR%%/trust
 %%EXAMPLESDIR%%/user.action
 @dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/user-manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/
 @dirrm etc/privoxy/templates
 @dirrm etc/privoxy

Property changes on: head/www/privoxy/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property