diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 57cd829125f..20c5ce29f4c 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2004/10/19 14:17:44 xsa Exp $
+# $OpenBSD: Makefile,v 1.10 2004/11/25 21:07:50 alek Exp $
 
 COMMENT=	"web proxy with advanced filtering capabilities"
 
 DISTNAME=	privoxy-3.0.3-2-stable
-PKGNAME=	${DISTNAME:S/-2-stable//}
+PKGNAME=	${DISTNAME:S/-2-stable//}p0
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.privoxy.org/
diff --git a/www/privoxy/pkg/DEINSTALL b/www/privoxy/pkg/DEINSTALL
deleted file mode 100644
index 3a218216931..00000000000
--- a/www/privoxy/pkg/DEINSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2003/10/08 23:47:18 naddy Exp $
-#
-# privoxy de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/privoxy
-LOG_DIR=/var/log/privoxy
-
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| these steps as root:"
-echo "|"
-if [ "$PKG_DELETE_EXTRA" != Yes -a -d $CONFIG_DIR ]; then
-    echo "|           rm -rf $CONFIG_DIR"
-fi
-if [ "$PKG_DELETE_EXTRA" != Yes -a -d $LOG_DIR ]; then
-    echo "|           rm -rf $LOG_DIR"
-fi
-echo "|           rmuser _privoxy"
-echo "|"
-echo "| Do not do this if you plan on re-installing $1"
-echo "| at some future time."
-echo "+---------------"
-echo
-
-exit 0
diff --git a/www/privoxy/pkg/INSTALL b/www/privoxy/pkg/INSTALL
deleted file mode 100644
index 6e8dab477c4..00000000000
--- a/www/privoxy/pkg/INSTALL
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.4 2004/06/24 03:16:55 brad Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/privoxy
-SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/privoxy
-LOG_DIR=/var/log/privoxy
-PRIVOXYUSER=_privoxy
-PRIVOXYGROUP=_privoxy
-ID=516
-
-do_install_usergroup()
-{
-  # create privoxy user and group
-  groupinfo -e $PRIVOXYGROUP
-  if [ $? -eq 0 ]; then
-    echo "===> Using $PRIVOXYGROUP group for Privoxy"
-  else
-    echo "===> Creating $PRIVOXYGROUP group for Privoxy"
-    groupadd -g $ID $PRIVOXYGROUP
-  fi
-  userinfo -e $PRIVOXYUSER
-  if [ $? -eq 0 ]; then
-    echo "===> Using $PRIVOXYUSER user for Privoxy"
-  else
-    echo "===> Creating $PRIVOXYUSER user for Privoxy"
-    useradd -g $PRIVOXYGROUP -d /nonexistent -L daemon -c 'Privoxy Account' -s /sbin/nologin -u $ID $PRIVOXYUSER
-  fi
-}
-
-do_message_top()
-{
-    echo
-    echo "+---------------"
-}
-
-do_notice_conf()
-{
-    echo "| The existing $1 configuration files in $CONFIG_DIR have NOT"
-    echo "| been changed.  You may want to compare them to the current samples in"
-    echo "| $SAMPLE_CONFIG_DIR and update your configuration"
-    echo "| files as needed."
-    echo "|"
-}
-
-do_install_conf()
-{
-    install -d -o root -g $PRIVOXYGROUP -m 755 $CONFIG_DIR
-    install -d -o root -g $PRIVOXYGROUP -m 755 $CONFIG_DIR/templates
-    install -o $PRIVOXYUSER -g $PRIVOXYGROUP -m 644 $SAMPLE_CONFIG_DIR/config $CONFIG_DIR
-    install -o $PRIVOXYUSER -g $PRIVOXYGROUP -m 644 $SAMPLE_CONFIG_DIR/*.action $CONFIG_DIR
-    install -o $PRIVOXYUSER -g $PRIVOXYGROUP -m 644 $SAMPLE_CONFIG_DIR/default.filter $CONFIG_DIR
-    install -o $PRIVOXYUSER -g $PRIVOXYGROUP -m 644 $SAMPLE_CONFIG_DIR/templates/* $CONFIG_DIR/templates
-    echo "| The $1 configuration files have been installed"
-    echo "| in $CONFIG_DIR."
-    echo "|"
-    echo "| Please view these files and change the configuration to meet your needs."
-    echo "|"
-}
-
-do_install_log()
-{
-    install -d -o root -g $PRIVOXYGROUP -m 775 $LOG_DIR
-    echo "| The $1 log directory has been installed"
-    echo "| in $LOG_DIR."
-    echo "|"
-}
-
-do_message_bottom()
-{
-    echo "| You will need to edit /etc/rc.local as appropriate and add a"
-    echo "| section similar to the following:"
-    echo "|"
-    echo "|     if [ -x ${PREFIX}/sbin/privoxy ]; then"
-    echo "|             echo -n ' privoxy';"
-    echo "|             ${PREFIX}/sbin/privoxy --user $PRIVOXYUSER.$PRIVOXYGROUP ${SYSCONFDIR}/privoxy/config"
-    echo "|     fi"
-    echo "+---------------"
-    echo
-}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	do_install_usergroup
-	;;
-    POST-INSTALL)
-	do_message_top
-	if [ ! -d $CONFIG_DIR ]; then
-	   do_install_conf $1
-	else
-	   do_notice_conf $1
-	fi
-	if [ ! -d $LOG_DIR ]; then
-	   do_install_log $1
-	fi
-	do_message_bottom
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/www/privoxy/pkg/MESSAGE b/www/privoxy/pkg/MESSAGE
new file mode 100644
index 00000000000..cc4d8fe2603
--- /dev/null
+++ b/www/privoxy/pkg/MESSAGE
@@ -0,0 +1,9 @@
+You will need to edit /etc/rc.local as appropriate and add a
+section similar to the following so that privoxy is started
+automatically:
+
+    if [ -x ${PREFIX}/sbin/privoxy ]; then
+            echo -n ' privoxy';
+            ${PREFIX}/sbin/privoxy --user _privoxy._privoxy \
+                    ${SYSCONFDIR}/privoxy/config
+    fi
diff --git a/www/privoxy/pkg/PLIST b/www/privoxy/pkg/PLIST
index 8eb103f4499..f3e00aa4331 100644
--- a/www/privoxy/pkg/PLIST
+++ b/www/privoxy/pkg/PLIST
@@ -1,87 +1,245 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:49:52 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/11/25 21:07:50 alek Exp $
+@newgroup _privoxy:516
+@newuser _privoxy:516:_privoxy:daemon:Privoxy Account:/nonexistent:/sbin/nologin
 @man man/man1/privoxy.1
 sbin/privoxy
 share/doc/privoxy/
 share/doc/privoxy/README
 share/examples/privoxy/
+@sample ${SYSCONFDIR}/privoxy/
 share/examples/privoxy/config
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/config
+@owner
+@group
 share/examples/privoxy/default.action
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/default.action
+@owner
+@group
 share/examples/privoxy/default.filter
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/default.filter
+@owner
+@group
 share/examples/privoxy/standard.action
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/standard.action
+@owner
+@group
 share/examples/privoxy/templates/
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/
+@owner
+@group
 share/examples/privoxy/templates/blocked
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/blocked
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-404
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-404
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-bad-param
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-bad-param
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-disabled
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-disabled
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-file
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-file
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-file-read-only
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-file-read-only
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-modified
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-modified
+@owner
+@group
 share/examples/privoxy/templates/cgi-error-parse
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-error-parse
+@owner
+@group
 share/examples/privoxy/templates/cgi-style.css
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/cgi-style.css
+@owner
+@group
 share/examples/privoxy/templates/connect-failed
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/connect-failed
+@owner
+@group
 share/examples/privoxy/templates/default
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/default
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-add-url-form
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-add-url-form
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-for-url
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-for-url
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-for-url-filter
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-for-url-filter
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-list
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-list
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-list-button
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-list-button
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-list-section
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-list-section
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-list-url
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-list-url
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-remove-url-form
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-remove-url-form
+@owner
+@group
 share/examples/privoxy/templates/edit-actions-url-form
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/edit-actions-url-form
+@owner
+@group
 share/examples/privoxy/templates/mod-local-help
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/mod-local-help
+@owner
+@group
 share/examples/privoxy/templates/mod-support-and-service
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/mod-support-and-service
+@owner
+@group
 share/examples/privoxy/templates/mod-title
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/mod-title
+@owner
+@group
 share/examples/privoxy/templates/mod-unstable-warning
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/mod-unstable-warning
+@owner
+@group
 share/examples/privoxy/templates/no-such-domain
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/no-such-domain
+@owner
+@group
 share/examples/privoxy/templates/show-request
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/show-request
+@owner
+@group
 share/examples/privoxy/templates/show-status
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/show-status
+@owner
+@group
 share/examples/privoxy/templates/show-status-file
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/show-status-file
+@owner
+@group
 share/examples/privoxy/templates/show-url-info
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/show-url-info
+@owner
+@group
 share/examples/privoxy/templates/show-version
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/show-version
+@owner
+@group
 share/examples/privoxy/templates/toggle
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/toggle
+@owner
+@group
 share/examples/privoxy/templates/toggle-mini
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/toggle-mini
+@owner
+@group
 share/examples/privoxy/templates/untrusted
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/templates/untrusted
+@owner
+@group
 share/examples/privoxy/user.action
-@cwd ${SYSCONFDIR}
-@extra privoxy/templates/blocked
-@extra privoxy/templates/cgi-error-404
-@extra privoxy/templates/cgi-error-bad-param
-@extra privoxy/templates/cgi-error-disabled
-@extra privoxy/templates/cgi-error-file
-@extra privoxy/templates/cgi-error-file-read-only
-@extra privoxy/templates/cgi-error-modified
-@extra privoxy/templates/cgi-error-parse
-@extra privoxy/templates/cgi-style.css
-@extra privoxy/templates/connect-failed
-@extra privoxy/templates/default
-@extra privoxy/templates/edit-actions-add-url-form
-@extra privoxy/templates/edit-actions-for-url
-@extra privoxy/templates/edit-actions-for-url-filter
-@extra privoxy/templates/edit-actions-list
-@extra privoxy/templates/edit-actions-list-button
-@extra privoxy/templates/edit-actions-list-section
-@extra privoxy/templates/edit-actions-list-url
-@extra privoxy/templates/edit-actions-remove-url-form
-@extra privoxy/templates/edit-actions-url-form
-@extra privoxy/templates/mod-local-help
-@extra privoxy/templates/mod-support-and-service
-@extra privoxy/templates/mod-title
-@extra privoxy/templates/mod-unstable-warning
-@extra privoxy/templates/no-such-domain
-@extra privoxy/templates/show-request
-@extra privoxy/templates/show-status
-@extra privoxy/templates/show-status-file
-@extra privoxy/templates/show-url-info
-@extra privoxy/templates/show-version
-@extra privoxy/templates/toggle
-@extra privoxy/templates/toggle-mini
-@extra privoxy/templates/untrusted
-@extra privoxy/templates/
-@extra privoxy/config
-@extra privoxy/default.action
-@extra privoxy/standard.action
-@extra privoxy/user.action
-@extra privoxy/default.filter
-@extra privoxy/
-@extraunexec rm -rf /var/log/privoxy
+@owner _privoxy
+@group _privoxy
+@sample ${SYSCONFDIR}/privoxy/user.action
+@mode 775
+@owner
+@sample /var/log/privoxy/
+@extraunexec rm -rf /var/log/privoxy/*