diff -ruN privoxy/Makefile privoxy-3.0.6/Makefile
--- privoxy/Makefile	Sat Oct  7 18:47:14 2006
+++ privoxy-3.0.6/Makefile	Mon Nov 20 15:03:51 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	privoxy
-PORTVERSION=	3.0.3
-PORTREVISION=	5
+PORTVERSION=	3.0.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ijbswa
@@ -26,14 +25,47 @@
 
 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
 
+OPTIONS=	FORCE "Allows to optionally bypass blocks" On \
+		TOGGLE "Support for remote toggling" On \
+		EDITOR "Enable webbased action editor" On \
+		DEBUG "Build with debugging symbols" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_FORCE)
+CONFIGURE_ARGS+=        --disable-force
+.endif
+
+.if defined(WITHOUT_TOGGLE)
+CONFIGURE_ARGS+=        --disable-toggle
+.endif
+
+.if defined(WITHOUT_EDITOR)
+CONFIGURE_ARGS+=        --disable-editor
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=        --with-debug
+.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 ${PREFIX}/share/doc/privoxy-manual,' \
+	${WRKSRC}/config
+
+.endif
 
 pre-configure:
 	@cd ${WRKSRC}; ${AUTOHEADER}
@@ -50,11 +82,12 @@
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/privoxy
 .endfor
 	@${INSTALL_MAN}  ${WRKSRC}/privoxy.1 ${MANPREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/share/examples/privoxy
+	@${INSTALL_DATA} ${WRKSRC}/user.action ${PREFIX}/share/examples/privoxy
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/privoxy-manual
-	@if [ -d ${WRKSRC}/doc/webserver/user-manual ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${PREFIX}/share/doc/privoxy-manual; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/doc/webserver/user-manual/[a-z]* ${PREFIX}/share/doc/privoxy-manual
+	${INSTALL_DATA} ${WRKSRC}/doc/webserver/p_doc.css ${PREFIX}/share/doc/privoxy-manual
 .endif
 
 post-install:
@@ -66,4 +99,4 @@
 	${CHMOD} 0750 /var/run/privoxy
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN privoxy/distinfo privoxy-3.0.6/distinfo
--- privoxy/distinfo	Mon Nov 14 09:37:29 2005
+++ privoxy-3.0.6/distinfo	Sun Nov 19 16:07:14 2006
@@ -1,3 +1,3 @@
-MD5 (privoxy-3.0.3-stable-src.tar.gz) = b0710be8af09409bfb03f52523a17010
-SHA256 (privoxy-3.0.3-stable-src.tar.gz) = 4dab0049049c1ae6cfb00faea606d981535d0f0a65aab17e3179cc3d75de9f84
-SIZE (privoxy-3.0.3-stable-src.tar.gz) = 1561072
+MD5 (privoxy-3.0.6-stable-src.tar.gz) = c3b34c620e1174f0c0b91aa2a04ceae4
+SHA256 (privoxy-3.0.6-stable-src.tar.gz) = 49e49d92d3b22c0fe730fef0f067668a51bb8a7aae53277ba709f301066e5dc0
+SIZE (privoxy-3.0.6-stable-src.tar.gz) = 1755661
diff -ruN privoxy/pkg-plist privoxy-3.0.6/pkg-plist
--- privoxy/pkg-plist	Sat Oct  7 18:47:14 2006
+++ privoxy-3.0.6/pkg-plist	Mon Nov 20 13:15:43 2006
@@ -38,20 +38,25 @@
 etc/privoxy/templates/toggle-mini
 etc/privoxy/templates/untrusted
 %%PORTDOCS%%share/doc/privoxy-manual/actions-file.html
-%%PORTDOCS%%share/doc/privoxy-manual/configuration.html
-%%PORTDOCS%%share/doc/privoxy-manual/filter-file.html
-%%PORTDOCS%%share/doc/privoxy-manual/introduction.html
-%%PORTDOCS%%share/doc/privoxy-manual/startup.html
 %%PORTDOCS%%share/doc/privoxy-manual/appendix.html
-%%PORTDOCS%%share/doc/privoxy-manual/contact.html
-%%PORTDOCS%%share/doc/privoxy-manual/index.html
-%%PORTDOCS%%share/doc/privoxy-manual/quickstart.html
-%%PORTDOCS%%share/doc/privoxy-manual/templates.html
 %%PORTDOCS%%share/doc/privoxy-manual/config.html
+%%PORTDOCS%%share/doc/privoxy-manual/configuration.html
+%%PORTDOCS%%share/doc/privoxy-manual/contact.html
 %%PORTDOCS%%share/doc/privoxy-manual/copyright.html
+%%PORTDOCS%%share/doc/privoxy-manual/files-in-use.jpg
+%%PORTDOCS%%share/doc/privoxy-manual/filter-file.html
+%%PORTDOCS%%share/doc/privoxy-manual/index.html
 %%PORTDOCS%%share/doc/privoxy-manual/installation.html
+%%PORTDOCS%%share/doc/privoxy-manual/introduction.html
+%%PORTDOCS%%share/doc/privoxy-manual/p_doc.css
+%%PORTDOCS%%share/doc/privoxy-manual/proxy2.jpg
+%%PORTDOCS%%share/doc/privoxy-manual/proxy_setup.jpg
+%%PORTDOCS%%share/doc/privoxy-manual/quickstart.html
 %%PORTDOCS%%share/doc/privoxy-manual/seealso.html
+%%PORTDOCS%%share/doc/privoxy-manual/startup.html
+%%PORTDOCS%%share/doc/privoxy-manual/templates.html
 %%PORTDOCS%%share/doc/privoxy-manual/upgradersnote.html
+%%PORTDOCS%%share/doc/privoxy-manual/whatsnew.html
 %%PORTDOCS%%@dirrm share/doc/privoxy-manual
 @dirrm etc/privoxy/templates
 @dirrm etc/privoxy