<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/679fb0c236773a61034314ab7c2aaa2663711fc4">https://github.com/macports/macports-ports/commit/679fb0c236773a61034314ab7c2aaa2663711fc4</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 679fb0c2367 adblock2privoxy: Use cabal-based native builds
</span>679fb0c2367 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 679fb0c236773a61034314ab7c2aaa2663711fc4
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sat Sep 10 19:15:50 2022 -0400

<span style='display:block; white-space:pre;color:#404040;'>    adblock2privoxy: Use cabal-based native builds
</span>---
 www/adblock2privoxy/Portfile | 77 ++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 28 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 783306a287a..6cbee0c7e48 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;'>@@ -1,11 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           haskell_stack 1.0
</span> 
 name                adblock2privoxy
 version             2.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          www haskell
 maintainers         {ieee.org:s.t.smith @essandess} openmaintainer
 license             GPL-3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,42 +64,64 @@ variant initialize_always \
</span> set adblock2privoxy_css_server \
                     127.0.0.1:8119
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# relative paths to ${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set ab2p_datadir    share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant stack \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    description {Use stack to build.} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset "stack"] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       haskell_stack 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # relative paths to ${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set ab2p_datadir    share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-extract {
</span><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><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ${filespath}/Paths_NAME.hs ./src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@PREFIX@|${prefix}|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 "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><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><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><span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 0644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${filespath}/Paths_NAME.hs ./src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${prefix}/share/${name}/templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # cabal's data-files datadir: ${name}_datadir from Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        fs-traverse f ${worksrcpath}/.stack-work {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            if { [string match "ab2p.system.*" [file tail ${f}]] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                xinstall -m 0644 ${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${destroot}${prefix}/share/${name}/templates
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    PortGroup       haskell_cabal 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace "s|@NAME@|${name}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    reinplace -E "s|(Version\[\[:space:\]\]+)\\\[\[\[:digit:\]\]+(,\[\[:digit:\]\]+){1,4}\\\]|\\1\[[join [split ${version} .] ,]\]|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${worksrcpath}/src/Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    build.target-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    --allow-newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        xinstall -d ${destroot}${prefix}/share/${name}/templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach f [glob ${worksrcpath}/templates/ab2p.system.*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            xinstall -m 0644 ${f} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    ${destroot}${prefix}/share/${name}/templates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> }
 
 post-destroot {
     xinstall -d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/share/${name}/templates \
</span>         ${destroot}${prefix}/etc/${name} \
         ${destroot}${prefix}/etc/${name}/privoxy \
         ${destroot}${prefix}/etc/${name}/css
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # cabal's data-files datadir: ${name}_datadir from Paths_${name}.hs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    fs-traverse f ${worksrcpath}/.stack-work {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        if { [string match "ab2p.system.*" [file tail ${f}]] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            xinstall -m 0644 ${f} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                ${destroot}${prefix}/share/${name}/templates
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     xinstall -m 0644 -W ${filespath} \
         adblock2privoxy_blocklist.txt \
         ${destroot}${prefix}/etc/${name}/adblock2privoxy_blocklist.txt.macports
</pre><pre style='margin:0'>

</pre>