[34033] trunk/dports/www/privoxy
ryandesign at macports.org
ryandesign at macports.org
Sun Feb 10 14:23:30 PST 2008
Revision: 34033
http://trac.macosforge.org/projects/macports/changeset/34033
Author: ryandesign at macports.org
Date: 2008-02-10 14:23:30 -0800 (Sun, 10 Feb 2008)
Log Message:
-----------
privoxy: fix names of patchfiles to match policy
Modified Paths:
--------------
trunk/dports/www/privoxy/Portfile
Added Paths:
-----------
trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff
trunk/dports/www/privoxy/files/patch-privoxy.sh.diff
Removed Paths:
-------------
trunk/dports/www/privoxy/files/patch-GNUmakefile.in
trunk/dports/www/privoxy/files/patch-privoxy.sh
Modified: trunk/dports/www/privoxy/Portfile
===================================================================
--- trunk/dports/www/privoxy/Portfile 2008-02-10 22:16:10 UTC (rev 34032)
+++ trunk/dports/www/privoxy/Portfile 2008-02-10 22:23:30 UTC (rev 34033)
@@ -31,7 +31,7 @@
set privoxyGroup privoxy
set privoxyUser privoxy
-patchfiles patch-GNUmakefile.in
+patchfiles patch-GNUmakefile.in.diff
variant socks5 description {Support for SOCKS5 (experimental)} {
patchfiles-append patch-socks5.diff
@@ -61,7 +61,7 @@
xinstall -m 755 -W ${worksrcpath} privoxy-generic.init \
${destroot}${prefix}/etc/rc.d/privoxy.sh
- system "cd ${destroot}${prefix}/etc/rc.d && patch -p0 < ${filespath}/patch-privoxy.sh"
+ system "cd ${destroot}${prefix}/etc/rc.d && patch -p0 < ${filespath}/patch-privoxy.sh.diff"
reinplace "s|@@PREFIX@@|${prefix}|g" \
${destroot}${prefix}/etc/rc.d/privoxy.sh
reinplace "s|@@PRIVOXY_USER@@|${privoxyUser}|g" \
Deleted: trunk/dports/www/privoxy/files/patch-GNUmakefile.in
===================================================================
--- trunk/dports/www/privoxy/files/patch-GNUmakefile.in 2008-02-10 22:16:10 UTC (rev 34032)
+++ trunk/dports/www/privoxy/files/patch-GNUmakefile.in 2008-02-10 22:23:30 UTC (rev 34033)
@@ -1,125 +0,0 @@
---- GNUmakefile.in.orig 2007-12-11 15:29:25.000000000 -0600
-+++ GNUmakefile.in 2008-02-10 16:05:25.000000000 -0600
-@@ -67,6 +67,8 @@
- LOGS_DEST = $(VAR_DEST)/log/privoxy
- PIDS_DEST = $(VAR_DEST)/run
-
-+DESTDIR=
-+
- # if $prefix = /usr/local then the default CONFDEST change from
- # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy
- # by the target rule CONF_DEST
-@@ -1095,23 +1097,23 @@
-
- @$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
- $(CHMOD) $(DIR_MODE) $(MKDIR)
-- @$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \
-- $(LOG_DEST) $(PID_DEST)
-+ @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
-+ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
- @# Install the executable binary, strip if invoked as install-strip
- @test -n "$(STRIP)" &&\
-- $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
-- $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
-- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
-+ $(ECHO) Installing $(PROGRAM) stripped executable to $(DESTDIR)$(SBIN_DEST) ||\
-+ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
-+ $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
-
- @# Install the DOCS and man page. install-sh only does one file at a time.
- @# FIXME: only handles jpegs.
- - at if [ $(check_doc) = 0 ]; then \
-- DOC=$(DOC_DEST) ;\
-+ DOC=$(DESTDIR)$(DOC_DEST) ;\
- else \
-- DOC=$(prefix)/doc/privoxy ;\
-+ DOC=$(DESTDIR)$(prefix)/doc/privoxy ;\
- fi;\
- $(MKDIR) $$DOC $$DOC/user-manual $$DOC/faq $$DOC/developer-manual \
-- $$DOC/man-page $$DOC/images $(MAN_DEST) ;\
-+ $$DOC/man-page $$DOC/images $(DESTDIR)$(MAN_DEST) ;\
- if [ -d "$(DOK_WEB)" ]; then \
- $(ECHO) Installing FAQ, Manual, and other docs to $$DOC;\
- for i in user-manual developer-manual faq; do \
-@@ -1132,8 +1134,8 @@
- $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
- fi
- @# Not all platforms support gzipped man pages.
-- @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
-- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1
-+ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1
-+ -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1
-
- @# Change the config file default directories according to the configured ones
- @$(ECHO) Rewriting config for this installation
-@@ -1154,9 +1156,9 @@
- @# Install the config support files. Test for root install, and abort
- @# if there is no privoxy user, and no other user was enabled during
- @# configure. Later, install init script if appropriate.
-- @$(ECHO) Installing templates to $(CONF_DEST)/templates
-+ @$(ECHO) Installing templates to $(DESTDIR)$(CONF_DEST)/templates
- @for i in `find templates -type f`; do \
-- $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\
-+ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
- done
-
- @# FIXME: group/user validation is overly convoluted.
-@@ -1194,36 +1196,36 @@
- fi ;\
- INSTALL_CONF="$(INSTALL_R)" ;\
- fi ;\
-- $(ECHO) Installing configuration files to $(CONF_DEST);\
-+ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
- for i in $(CONFIGS); do \
- if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
-- $(RM) $(CONF_DEST)/$$i ;\
-+ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
- $(ECHO) Installing fresh $$i;\
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
-- elif [ -s "$(CONF_DEST)/$$i" ]; then \
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
-+ elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
- $(ECHO) Installing $$i as $$i.new ;\
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
- NEW=1;\
- else \
-- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
-+ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
- fi ;\
- done ;\
- if [ -n "$$NEW" ]; then \
-- $(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\
-+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
- $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
- fi ;\
-- [ ! -f $(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(LOG_DEST) || \
-- $(ECHO) Checking logfiles in $(LOG_DEST) ;\
-- $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
-+ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
-+ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
-+ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
- if [ x$$USER != x ]; then \
-- $(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
-+ $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
- if [ x$$GROUP_T != x ]; then \
-- $(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
-+ $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
- $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
- fi ;\
-- $(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
-+ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
- if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
- if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
- $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
-@@ -1254,7 +1256,7 @@
- $(RM) config.base config.tmp
- @# mmmmm, good.
- @$(ECHO) "$(PROGRAM_V) installation succeeded!"
-- @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
-+ @$(ECHO) "The Privoxy configuration files have been installed in $(DESTDIR)$(CONF_DEST)"
-
- # rmdir is used as a precaution since it will not remove non-empty
- # directories. RH init script creates lock file and pid file.
Copied: trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff (from rev 34032, trunk/dports/www/privoxy/files/patch-GNUmakefile.in)
===================================================================
--- trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff (rev 0)
+++ trunk/dports/www/privoxy/files/patch-GNUmakefile.in.diff 2008-02-10 22:23:30 UTC (rev 34033)
@@ -0,0 +1,125 @@
+--- GNUmakefile.in.orig 2007-12-11 15:29:25.000000000 -0600
++++ GNUmakefile.in 2008-02-10 16:05:25.000000000 -0600
+@@ -67,6 +67,8 @@
+ LOGS_DEST = $(VAR_DEST)/log/privoxy
+ PIDS_DEST = $(VAR_DEST)/run
+
++DESTDIR=
++
+ # if $prefix = /usr/local then the default CONFDEST change from
+ # CONF_DEST = $(CONF_BASE) to CONF_DEST = $(CONF_BASE)/privoxy
+ # by the target rule CONF_DEST
+@@ -1095,23 +1097,23 @@
+
+ @$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation"
+ $(CHMOD) $(DIR_MODE) $(MKDIR)
+- @$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \
+- $(LOG_DEST) $(PID_DEST)
++ @$(MKDIR) $(DESTDIR)$(SBIN_DEST) $(DESTDIR)$(prefix) $(DESTDIR)$(CONF_DEST) $(DESTDIR)$(CONF_DEST)/templates $(DESTDIR)$(SHARE_DEST) \
++ $(DESTDIR)$(LOG_DEST) $(DESTDIR)$(PID_DEST)
+ @# Install the executable binary, strip if invoked as install-strip
+ @test -n "$(STRIP)" &&\
+- $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\
+- $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST)
+- $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST)
++ $(ECHO) Installing $(PROGRAM) stripped executable to $(DESTDIR)$(SBIN_DEST) ||\
++ $(ECHO) Installing $(PROGRAM) executable to $(DESTDIR)$(SBIN_DEST)
++ $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(DESTDIR)$(SBIN_DEST)
+
+ @# Install the DOCS and man page. install-sh only does one file at a time.
+ @# FIXME: only handles jpegs.
+ - at if [ $(check_doc) = 0 ]; then \
+- DOC=$(DOC_DEST) ;\
++ DOC=$(DESTDIR)$(DOC_DEST) ;\
+ else \
+- DOC=$(prefix)/doc/privoxy ;\
++ DOC=$(DESTDIR)$(prefix)/doc/privoxy ;\
+ fi;\
+ $(MKDIR) $$DOC $$DOC/user-manual $$DOC/faq $$DOC/developer-manual \
+- $$DOC/man-page $$DOC/images $(MAN_DEST) ;\
++ $$DOC/man-page $$DOC/images $(DESTDIR)$(MAN_DEST) ;\
+ if [ -d "$(DOK_WEB)" ]; then \
+ $(ECHO) Installing FAQ, Manual, and other docs to $$DOC;\
+ for i in user-manual developer-manual faq; do \
+@@ -1132,8 +1134,8 @@
+ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC/user-manual;\
+ fi
+ @# Not all platforms support gzipped man pages.
+- @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1
+- -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1
++ @$(ECHO) Installing man page to $(DESTDIR)$(MAN_DEST)/privoxy.1
++ -$(INSTALL) $(INSTALL_T) privoxy.1 $(DESTDIR)$(MAN_DEST)/privoxy.1
+
+ @# Change the config file default directories according to the configured ones
+ @$(ECHO) Rewriting config for this installation
+@@ -1154,9 +1156,9 @@
+ @# Install the config support files. Test for root install, and abort
+ @# if there is no privoxy user, and no other user was enabled during
+ @# configure. Later, install init script if appropriate.
+- @$(ECHO) Installing templates to $(CONF_DEST)/templates
++ @$(ECHO) Installing templates to $(DESTDIR)$(CONF_DEST)/templates
+ @for i in `find templates -type f`; do \
+- $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\
++ $(INSTALL) $(INSTALL_T) $$i $(DESTDIR)$(CONF_DEST)/templates ;\
+ done
+
+ @# FIXME: group/user validation is overly convoluted.
+@@ -1194,36 +1196,36 @@
+ fi ;\
+ INSTALL_CONF="$(INSTALL_R)" ;\
+ fi ;\
+- $(ECHO) Installing configuration files to $(CONF_DEST);\
++ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\
+ for i in $(CONFIGS); do \
+ if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] || [ "$$i" = "standard.action" ]; then \
+- $(RM) $(CONF_DEST)/$$i ;\
++ $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\
+ $(ECHO) Installing fresh $$i;\
+- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
+- elif [ -s "$(CONF_DEST)/$$i" ]; then \
++ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
++ elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \
+ $(ECHO) Installing $$i as $$i.new ;\
+- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST)/$$i.new || exit 1;\
++ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\
+ NEW=1;\
+ else \
+- $(INSTALL) $$INSTALL_CONF $$i $(CONF_DEST) || exit 1;\
++ $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\
+ fi ;\
+ done ;\
+ if [ -n "$$NEW" ]; then \
+- $(CHMOD) $(RWD_MODE) $(CONF_DEST)/*.new || exit 1 ;\
++ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(CONF_DEST)/*.new || exit 1 ;\
+ $(ECHO) "Warning: Older config files are preserved. Check new versions for changes!" ;\
+ fi ;\
+- [ ! -f $(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(LOG_DEST) || \
+- $(ECHO) Checking logfiles in $(LOG_DEST) ;\
+- $(TOUCH) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
++ [ ! -f $(DESTDIR)$(LOG_DEST)/logfile ] && $(ECHO) Creating logfiles in $(DESTDIR)$(LOG_DEST) || \
++ $(ECHO) Checking logfiles in $(DESTDIR)$(LOG_DEST) ;\
++ $(TOUCH) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
+ if [ x$$USER != x ]; then \
+- $(CHOWN) $$USER $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
++ $(CHOWN) $$USER $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
+ $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+ fi ;\
+ if [ x$$GROUP_T != x ]; then \
+- $(CHGRP) $$GROUP_T $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || \
++ $(CHGRP) $$GROUP_T $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || \
+ $(ECHO) "** WARNING ** current install user different from configured user. Logging may fail!!" ;\
+ fi ;\
+- $(CHMOD) $(RWD_MODE) $(LOG_DEST)/logfile $(LOG_DEST)/jarfile || exit 1 ;\
++ $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile $(DESTDIR)$(LOG_DEST)/jarfile || exit 1 ;\
+ if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \
+ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \
+ $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \
+@@ -1254,7 +1256,7 @@
+ $(RM) config.base config.tmp
+ @# mmmmm, good.
+ @$(ECHO) "$(PROGRAM_V) installation succeeded!"
+- @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)"
++ @$(ECHO) "The Privoxy configuration files have been installed in $(DESTDIR)$(CONF_DEST)"
+
+ # rmdir is used as a precaution since it will not remove non-empty
+ # directories. RH init script creates lock file and pid file.
Deleted: trunk/dports/www/privoxy/files/patch-privoxy.sh
===================================================================
--- trunk/dports/www/privoxy/files/patch-privoxy.sh 2008-02-10 22:16:10 UTC (rev 34032)
+++ trunk/dports/www/privoxy/files/patch-privoxy.sh 2008-02-10 22:23:30 UTC (rev 34033)
@@ -1,34 +0,0 @@
---- privoxy.sh.orig Thu Oct 17 11:04:22 2002
-+++ privoxy.sh Fri Oct 29 20:07:36 2004
-@@ -75,27 +75,17 @@
- # logfile is writable by $P_USER (logfile is defined in config), and that
- # there is suitable write access for $P_PIDFILE.
-
--PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin/:/usr/bin:/sbin:/bin
-+PATH=@@PREFIX@@/sbin:@@PREFIX@@/bin:/usr/sbin/:/usr/bin:/sbin:/bin
- P_NAME=Privoxy
- # Path to executable.
- P_DAEMON=privoxy
- # Full path to location of Privoxy config file.
--P_CONF_FILE=/usr/local/etc/privoxy/config
-+P_CONF_FILE=@@PREFIX@@/etc/privoxy/config
- # Full path to PID file location. Location must be writable by
- # whoever runs this script.
--P_PIDFILE=/var/run/privoxy.pid
--# If uncommented, this script will try to run as USER=privoxy, which
--# may require special handling of config, *.action, trust, logfile,
--# jarfile, and pidfile.
--P_USER=privoxy
-+P_PIDFILE=@@PREFIX@@/var/run/privoxy.pid
-
--# If a privoxy user is specified, lets try that. /bin/sh does not seem to
--# know about $UID.
--if [ "$USER" = "root" ] && [ -n "$P_USER" ] && id $P_USER >/dev/null; then
-- P_OWNER=$P_USER
--else
-- P_OWNER=$USER
--fi
-+P_OWNER=@@PRIVOXY_USER@@
-
- if [ ! -f $P_CONF_FILE ]; then
- echo "Can't find $P_CONF_FILE, exiting."
Copied: trunk/dports/www/privoxy/files/patch-privoxy.sh.diff (from rev 34017, trunk/dports/www/privoxy/files/patch-privoxy.sh)
===================================================================
--- trunk/dports/www/privoxy/files/patch-privoxy.sh.diff (rev 0)
+++ trunk/dports/www/privoxy/files/patch-privoxy.sh.diff 2008-02-10 22:23:30 UTC (rev 34033)
@@ -0,0 +1,34 @@
+--- privoxy.sh.orig Thu Oct 17 11:04:22 2002
++++ privoxy.sh Fri Oct 29 20:07:36 2004
+@@ -75,27 +75,17 @@
+ # logfile is writable by $P_USER (logfile is defined in config), and that
+ # there is suitable write access for $P_PIDFILE.
+
+-PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin/:/usr/bin:/sbin:/bin
++PATH=@@PREFIX@@/sbin:@@PREFIX@@/bin:/usr/sbin/:/usr/bin:/sbin:/bin
+ P_NAME=Privoxy
+ # Path to executable.
+ P_DAEMON=privoxy
+ # Full path to location of Privoxy config file.
+-P_CONF_FILE=/usr/local/etc/privoxy/config
++P_CONF_FILE=@@PREFIX@@/etc/privoxy/config
+ # Full path to PID file location. Location must be writable by
+ # whoever runs this script.
+-P_PIDFILE=/var/run/privoxy.pid
+-# If uncommented, this script will try to run as USER=privoxy, which
+-# may require special handling of config, *.action, trust, logfile,
+-# jarfile, and pidfile.
+-P_USER=privoxy
++P_PIDFILE=@@PREFIX@@/var/run/privoxy.pid
+
+-# If a privoxy user is specified, lets try that. /bin/sh does not seem to
+-# know about $UID.
+-if [ "$USER" = "root" ] && [ -n "$P_USER" ] && id $P_USER >/dev/null; then
+- P_OWNER=$P_USER
+-else
+- P_OWNER=$USER
+-fi
++P_OWNER=@@PRIVOXY_USER@@
+
+ if [ ! -f $P_CONF_FILE ]; then
+ echo "Can't find $P_CONF_FILE, exiting."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080210/193318f0/attachment-0001.html
More information about the macports-changes
mailing list