[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [macports-ports] branch master updated: adblock2privoxy: Fix startupitems for MacPorts 2.6.3
From: Ryan Schmidt <ryandesign () macports ! org>
Date: 2020-08-03 6:01:51
Message-ID: 159643452295.19007.10473769887209561718 () braeburn ! macports ! org
[Download RAW message or body]
<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ec40d66dc4f4223f29efd6e \
6e268649965aaf81">https://github.com/macports/macports-ports/commit/6ec40d66dc4f4223f29efd6e6e268649965aaf81</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were \
added to refs/heads/master by this push: <span style='display:block; \
white-space:pre;color:#404040;'> new 6ec40d66dc4 adblock2privoxy: Fix \
startupitems for MacPorts 2.6.3 </span>6ec40d66dc4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit \
6ec40d66dc4f4223f29efd6e6e268649965aaf81 </span>Author: Ryan Schmidt \
<ryandesign@macports.org>
AuthorDate: Thu Jul 30 07:17:34 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> adblock2privoxy: Fix \
startupitems for MacPorts 2.6.3 </span>---
www/adblock2privoxy/Portfile | 60 ++++++++++++++++++++++++++------------------
1 file changed, 35 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git \
a/www/adblock2privoxy/Portfile b/www/adblock2privoxy/Portfile </span><span \
style='display:block; white-space:pre;color:#808080;'>index b27eab12164..ab048e23887 \
100644 </span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- \
a/www/adblock2privoxy/Portfile </span><span style='display:block; \
white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/Portfile </span><span \
style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup \
haskell_stack 1.0 </span>
name adblock2privoxy
version 2.0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision \
1 </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision \
2 </span> categories www haskell
maintainers @essandess
license GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,16 @@ \
variant initialize_always \ </span> # relative paths to ${prefix}
set ab2p_datadir share/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The \
way that startupitems values are quoted was changed in 2.6.3. </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ # This port now \
relies on those changes. See: </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ # \
https://github.com/macports/macports-base/pull/191 </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ if {[vercmp [macports_version] 2.6.3] < \
0} { </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
ui_error "${name} @${version} requires MacPorts 2.6.3 or later" </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code \
error "incompatible MacPorts version" </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ } </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+} </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+ </span> post-extract {
# Fix for cabal data-files hardcoded path in binary
# See:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,37 +116,37 \
@@ post-destroot { </span> startupitem.create yes
startupitems \
name ${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- start \
"( /bin/test -f \"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\" \\ </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>-\t&& \
\"\${prefix}/bin/adblock2privoxy\" -t \
\"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\" \\ </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>-\t|| \
\"\${prefix}/bin/adblock2privoxy\" -p \"\${prefix}/etc/adblock2privoxy/privoxy\" \\ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\t\t-w \
\"\${prefix}/etc/adblock2privoxy/css\" \\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\t-d 127.0.0.1:8119 \\ </span><span \
style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist.to/easylist/easyprivacy.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist.to/easylist/easylist.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist.to/easylist/fanboy-annoyance.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist.to/easylist/fanboy-social.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist-downloads.adblockplus.org/antiadblockfilters.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://easylist-downloads.adblockplus.org/malwaredomains_full.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-antifacebook.txt \
\\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\thttps://raw.githubusercontent.com/Dawsey21/Lists/master/adblock-list.txt \
\\ </span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\t) \
&& \"\${prefix}/bin/port\" reload privoxy" \ </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>- stop \
"/usr/bin/kill -SIGUSR1 `/usr/bin/pgrep -u root ${name}` 2>/dev/null" \ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start \
"\"( /bin/test -f \\\"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\\\" \\\\ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t&& \
\\\"\${prefix}/bin/adblock2privoxy\\\" -t \
\\\"\${prefix}/etc/adblock2privoxy/privoxy/ab2p.task\\\" \\\\ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+\t|| \
\\\"\${prefix}/bin/adblock2privoxy\\\" -p \
\\\"\${prefix}/etc/adblock2privoxy/privoxy\\\" \\\\ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+\t\t-w \
\\\"\${prefix}/etc/adblock2privoxy/css\\\" \\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\t-d 127.0.0.1:8119 \\\\ </span><span \
style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist.to/easylist/easyprivacy.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist.to/easylist/easylist.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist.to/easylist/fanboy-annoyance.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist.to/easylist/fanboy-social.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist-downloads.adblockplus.org/antiadblockfilters.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://easylist-downloads.adblockplus.org/malwaredomains_full.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://raw.githubusercontent.com/ryanbr/fanboy-adblock/master/fanboy-antifacebook.txt \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\thttps://raw.githubusercontent.com/Dawsey21/Lists/master/adblock-list.txt \
\\\\ </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t) \
&& \\\"\${prefix}/bin/port\\\" reload privoxy\"" \ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ stop \
"\"/usr/bin/kill -SIGUSR1 `/usr/bin/pgrep -u root ${name}` 2>/dev/null\"" \ \
</span> pidfile none
startupitems-append \
name ${name}-nginx \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- init \
"pidfile=\"\${prefix}/var/run/nginx/nginx-adblock2privoxy.pid\"" \ </span><span \
style='display:block; white-space:pre;background:#ffe0e0;'>- start \
"\"\${prefix}/sbin/nginx\" \\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\t-c \\ </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\t\"\${prefix}/etc/${name}/nginx.conf\" \\ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\t\t-g \\ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\t\t\"daemon \
off;\"" \ </span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
stop "if \[ -f \${pidfile} \]; then </span><span style='display:block; \
white-space:pre;background:#ffe0e0;'>-\t\t/usr/bin/kill `cat \${pidfile}` \\ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ init \
"\"pidfile=\\\"\${prefix}/var/run/nginx/nginx-adblock2privoxy.pid\\\"\"" \ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ start \
"\"\\\"\${prefix}/sbin/nginx\\\" \\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\t-c \\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\t\\\"\${prefix}/etc/${name}/nginx.conf\\\" \
\\\\ </span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\t\t-g \
\\\\ </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\t\\\"daemon off;\\\"\"" \ </span><span \
style='display:block; white-space:pre;background:#e0ffe0;'>+ stop "\"if \
\[ -f \${pidfile} \]; then </span><span style='display:block; \
white-space:pre;background:#e0ffe0;'>+\t\t/usr/bin/kill `cat \${pidfile}` \\\\ \
</span> \t\t\t&& /bin/rm -f \${pidfile} ; \telse
\t\t/usr/bin/kill -SIGUSR1 `/usr/bin/pgrep -u root nginx` 2>/dev/null ;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-\tfi"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\tfi\""
</span>
post-activate {
# org.macports.adblock2privoxy
</pre><pre style='margin:0'>
</pre>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic