3 files changed, 26 insertions, 72 deletions

diff --git a/www/privoxy/files/patch-cgi.c b/www/privoxy/files/patch-cgi.c
deleted file mode 100644
index fdb6a1d31d4c..000000000000
--- a/www/privoxy/files/patch-cgi.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- cgi.c      Mon Nov 13 20:05:50 2006
-+++ cgi.c      Sat Dec  9 14:49:16 2006
-@@ -571,10 +579,12 @@
-          "Look up which actions apply to a URL and why",
-          TRUE },
- #ifdef FEATURE_CGI_EDIT_ACTIONS
-+#ifdef FEATURE_TOGGLE
-    { "toggle",
-          cgi_toggle, 
-          "Toggle Privoxy on or off",
-          FALSE },
-+#endif /* def FEATURE_TOGGLE */
-    { "edit-actions", /* Edit the actions list */
-          cgi_edit_actions, 
-          NULL, FALSE },
diff --git a/www/privoxy/files/patch-cgiedit.c b/www/privoxy/files/patch-cgiedit.c
deleted file mode 100644
index 0d83b7b96ca3..000000000000
--- a/www/privoxy/files/patch-cgiedit.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- cgiedit.c  Tue Jul 18 16:48:45 2006
-+++ cgiedit.c  Sat Dec  9 14:49:16 2006
-@@ -333,8 +337,10 @@
- #include "miscutil.h"
- #include "errlog.h"
- #include "loaders.h"
--#include "loadcfg.h"
-+#ifdef FEATURE_TOGGLE
- /* loadcfg.h is for global_toggle_state only */
-+#include "loadcfg.h"
-+#endif /* def FEATURE_TOGGLE */
- #include "urlmatch.h"
- 
- const char cgiedit_h_rcs[] = CGIEDIT_H_VERSION;
-@@ -4232,7 +4238,7 @@
-    return cgi_redirect(rsp, target);
- }
- 
--
-+#ifdef FEATURE_TOGGLE
- /*********************************************************************
-  *
-  * Function    :  cgi_toggle
-@@ -4300,7 +4306,7 @@
- 
-    return template_fill_for_cgi(csp, template_name, exports, rsp);
- }
--
-+#endif /* def FEATURE_TOGGLE */
- 
- /*********************************************************************
-  *
diff --git a/www/privoxy/files/pkg-message.in b/www/privoxy/files/pkg-message.in
index be30cf9ec574..2887e1a2ebd7 100644
--- a/www/privoxy/files/pkg-message.in
+++ b/www/privoxy/files/pkg-message.in
@@ -1,27 +1,28 @@
 ***********************************************************
-** To start Privoxy on boot, add: privoxy_enable="YES"   **
-** to /etc/rc.conf.                                      **
-**                                                       **
-** To start Privoxy manually, run:                       **
-** %%PREFIX%%/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 example files were copied to:                 **
-** %%PREFIX%%/share/examples/privoxy                     **
-**                                                       **
-** For documentation see:                                **
-** %%PREFIX%%/share/doc/privoxy-manual or 'man privoxy'  **
-**                                                       **
-** Note that default.filter, standard.action 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.               **
+  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, standard.action 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.
+
 ***********************************************************