<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a436a78e26425df71bf0f7f1a9d5f18586e1b18">https://github.com/macports/macports-ports/commit/9a436a78e26425df71bf0f7f1a9d5f18586e1b18</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9a436a78e26425df71bf0f7f1a9d5f18586e1b18
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Dec 23 15:25:56 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> adblock2privoxy: Bugfix version number in binary
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix version number in Paths_adblock2privoxy.hs
</span><span style='display:block; white-space:pre;color:#404040;'> * Minor Portfile fixes
</span>---
www/adblock2privoxy/Portfile | 53 ++++++++++++----------
.../{Paths_adblock2privoxy.hs => Paths_NAME.hs} | 22 ++++-----
2 files changed, 41 insertions(+), 34 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 dfa57ef..b27eab1 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;'>@@ -13,22 +13,25 @@ platforms macosx
</span> homepage https://github.com/essandess/adblock2privoxy
description Convert adblock config files to privoxy format
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AdBlock Plus browser plugin has great block list files\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- provided by big community, but it is client software and\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cannot work on a server as proxy. Privoxy proxy has good\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- potential to block ads at server side, but it experiences\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- acute shortage of updated block lists. This software\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- converts adblock lists to privoxy config files format.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Almost all adblock features are supported including\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- block/unblock requests (on privoxy) all syntax features\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- are supported except for regex templates matching host\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name hide/unhide page elements (via CSS) all syntax\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- features are supported all block request options except\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for outdated ones: Supported: script, image, stylesheet,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- object, xmlhttprequest, object-subrequest, subdocument,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- document, elemhide, other, popup, third-party, domain=...,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- match-case, donottrack.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description}.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AdBlock Plus browser plugin has great block list\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ files provided by big community, but it is client\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ software and cannot work on a server as proxy.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Privoxy proxy has good potential to block ads at\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ server side, but it experiences acute shortage of\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ updated block lists. This software converts\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ adblock lists to privoxy config files format.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Almost all adblock features are supported\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ including block/unblock requests (on privoxy) all\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syntax features are supported except for regex\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ templates matching host name hide/unhide page\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elements (via CSS) all syntax features are\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported all block request options except for\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outdated ones: Supported: script, image,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stylesheet, object, xmlhttprequest,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ object-subrequest, subdocument, document,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elemhide, other, popup, third-party, domain=...,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ match-case, donottrack.
</span>
master_sites https://hackage.haskell.org/package/${name}-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,18 +60,22 @@ variant initialize_always \
</span> # relative paths to ${prefix}
set ab2p_datadir share/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix for cabal data-files hardcoded path in binary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/commercialhaskell/stack/issues/848
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/commercialhaskell/stack/issues/4857
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/haskell/cabal/issues/462
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/haskell/cabal/issues/3586
</span> post-extract {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix for cabal data-files hardcoded path in binary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/commercialhaskell/stack/issues/848
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/commercialhaskell/stack/issues/4857
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/haskell/cabal/issues/462
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/haskell/cabal/issues/3586
</span> xinstall -m 0644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/Paths_${name}.hs ./src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/Paths_NAME.hs ./src/Paths_${name}.hs
</span>
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/src/Paths_${name}.hs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@NAME@|${name}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "s|(Version\[\[:space:\]\]+)\\\[\[\[:digit:\]\]+(,\[\[:digit:\]\]+){1,4}\\\]|\\1\[[join [split ${version} .] ,]\]|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/Paths_${name}.hs
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/adblock2privoxy/files/Paths_adblock2privoxy.hs b/www/adblock2privoxy/files/Paths_NAME.hs
</span>similarity index 66%
rename from www/adblock2privoxy/files/Paths_adblock2privoxy.hs
rename to www/adblock2privoxy/files/Paths_NAME.hs
<span style='display:block; white-space:pre;color:#808080;'>index aa53c80..4df9e53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/adblock2privoxy/files/Paths_adblock2privoxy.hs
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/adblock2privoxy/files/Paths_NAME.hs
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ See:
</span> {-# LANGUAGE CPP #-}
{-# LANGUAGE NoRebindableSyntax #-}
{-# OPTIONS_GHC -fno-warn-missing-import-lists #-}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-module Paths_adblock2privoxy (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+module Paths_@NAME@ (
</span> version,
getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir,
getDataFileName, getSysconfDir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,19 +42,19 @@ version = Version [2,0,1] []
</span> bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath
bindir = "@PREFIX@/bin"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-libdir = "@PREFIX@/lib/adblock2privoxy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dynlibdir = "@PREFIX@/lib/adblock2privoxy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-datadir = "@PREFIX@/share/adblock2privoxy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-libexecdir = "@PREFIX@/lib/adblock2privoxy"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libdir = "@PREFIX@/lib/@NAME@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dynlibdir = "@PREFIX@/lib/@NAME@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+datadir = "@PREFIX@/share/@NAME@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libexecdir = "@PREFIX@/lib/@NAME@"
</span> sysconfdir = "@PREFIX@/etc"
getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath
<span style='display:block; white-space:pre;background:#ffe0e0;'>-getBinDir = catchIO (getEnv "adblock2privoxy_bindir") (\_ -> return bindir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-getLibDir = catchIO (getEnv "adblock2privoxy_libdir") (\_ -> return libdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-getDynLibDir = catchIO (getEnv "adblock2privoxy_dynlibdir") (\_ -> return dynlibdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-getDataDir = catchIO (getEnv "adblock2privoxy_datadir") (\_ -> return datadir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-getLibexecDir = catchIO (getEnv "adblock2privoxy_libexecdir") (\_ -> return libexecdir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-getSysconfDir = catchIO (getEnv "adblock2privoxy_sysconfdir") (\_ -> return sysconfdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getBinDir = catchIO (getEnv "@NAME@_bindir") (\_ -> return bindir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getLibDir = catchIO (getEnv "@NAME@_libdir") (\_ -> return libdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getDynLibDir = catchIO (getEnv "@NAME@_dynlibdir") (\_ -> return dynlibdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getDataDir = catchIO (getEnv "@NAME@_datadir") (\_ -> return datadir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getLibexecDir = catchIO (getEnv "@NAME@_libexecdir") (\_ -> return libexecdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+getSysconfDir = catchIO (getEnv "@NAME@_sysconfdir") (\_ -> return sysconfdir)
</span>
getDataFileName :: FilePath -> IO FilePath
getDataFileName name = do
</pre><pre style='margin:0'>
</pre>