<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/7a3bd3dcdfec2044429c86958ae5bad1dd306539">https://github.com/macports/macports-ports/commit/7a3bd3dcdfec2044429c86958ae5bad1dd306539</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7a3bd3dcdfec2044429c86958ae5bad1dd306539
</span>Author: Sergey Fedorov <svacchanda@macmini.private>
AuthorDate: Fri May 6 09:31:48 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> ghc-ppc-bootstrap: fix directory paths, fix framework variant
</span>---
lang/ghc-ppc-bootstrap/Portfile | 91 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 88 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc-ppc-bootstrap/Portfile b/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bf91707281..3889c34af4d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc-ppc-bootstrap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ set canonicalname ghc
</span> version 7.0.4
revision 0
categories lang haskell
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers @barracuda156
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers Sergey Fedorov @barracuda156
</span> license BSD
platforms darwin
supported_archs ppc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ if {![variant_isset framework]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
build {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ if {![variant_isset framework]} {
</span> destroot {
copy ${worksrcpath}/${name} ${destroot}${path}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Delete dylibs; they arenʼt used by the bootstrap ghc and are incorrectly linked against /usr/local, causing rev-upgrade to complain.
fs-traverse f ${destroot}${path}/${name}/lib {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +63,44 @@ if {![variant_isset framework]} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix directory refs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/Library/Frameworks/GHC.framework/Versions/7.0.4-powerpc/usr|/opt/local/share/ghc-ppc-bootstrap|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/hsc2hs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/runghc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/ghc-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/ghci-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/ghc-pkg-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/bin/haddock-ghc-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/array-0.3.0.2-f538acad67d0b6696484da310d5949cf.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/base-4.3.1.0-027b77b12e52d1549077882b70695ddf.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/bin-package-db-0.0.0.0-ebccf3a563d9cc82a12563267e3b3973.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/bytestring-0.9.1.10-518da2c2e8177a761e7c3f8131b096f3.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/Cabal-1.10.2.0-5e1f7ddd36b188ae16e45b3a77b9c766.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/containers-0.4.0.0-f1307d32d8f4b51a1487c01f0997b6d9.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/directory-1.1.0.0-c0b12e512fadecf7242b2ec3cd952b2e.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/extensible-exceptions-0.1.1.2-d8c5b906654260efd7249f497d17a831.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/filepath-1.2.0.0-956a4b0c127b8c317f6cac3946b0b803.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/ghc-7.0.4-75a79ada61f7974961ef6e048ae39af8.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/ghc-binary-0.5.0.2-a36b46d7bbe800f04bce8a86565c2e8f.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/ghc-prim-0.2.0.0-6bf7b03ebc9c668817e4379b6796c0c2.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/haskell98-1.1.0.1-6f6b89a32eb0b5c7df8a4aba3d9884d3.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/haskell2010-1.0.0.0-98ed3d653ac78fc3526ee288bfd554ae.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/hpc-0.5.0.6-86b8caed77dec5a6adf56b6a203114d8.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/integer-gmp-0.2.0.3-4c5ab8b517f0b5d4ecf2153d5dfb7f41.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/old-locale-1.0.0.2-25ff1e5e0486bb3cf2cb85cb7daf8f22.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/old-time-1.0.0.6-249d424df19da9487f0cb7da3ccb0868.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/pretty-1.0.1.2-f2c716197e95f5c78869e6b87f2330d9.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/process-1.0.1.5-7c01e525f8af6ff6ee54718777c83b45.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/random-1.0.0.3-186815de972cb506efde02a72b0d8f8b.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/template-haskell-2.5.0.0-5eb8b3886e957b3c9cb455b68e59f600.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/time-1.2.0.3-ad46a3ade48e0011608895f44cc02a52.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/unix-2.4.2.0-766adf3eeb77190cf0dabf1daf400c65.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/builtin_ffi.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${path}/${name}/lib/ghc-7.0.4/package.conf.d/builtin_rts.conf
</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;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch {system "${prefix}/share/ghc-ppc-bootstrap/bin/ghc-pkg -v recache"}
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +109,53 @@ variant framework description {Install as a Framework} {
</span> destroot {
copy ${worksrcpath}/files/ghc.pkg/GHC.framework ${destroot}${frameworks_dir}
}
<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;'>+ fs-traverse f ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile ${f}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${f}] == ".dylib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${f}
</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;'>+ reinplace "s|/Library|/opt/local/Library|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/hsc2hs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/runghc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/ghc-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/ghci-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/ghc-pkg-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/haddock-ghc-7.0.4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/array-0.3.0.2-f538acad67d0b6696484da310d5949cf.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/base-4.3.1.0-027b77b12e52d1549077882b70695ddf.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/bin-package-db-0.0.0.0-ebccf3a563d9cc82a12563267e3b3973.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/bytestring-0.9.1.10-518da2c2e8177a761e7c3f8131b096f3.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/Cabal-1.10.2.0-5e1f7ddd36b188ae16e45b3a77b9c766.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/containers-0.4.0.0-f1307d32d8f4b51a1487c01f0997b6d9.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/directory-1.1.0.0-c0b12e512fadecf7242b2ec3cd952b2e.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/extensible-exceptions-0.1.1.2-d8c5b906654260efd7249f497d17a831.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/filepath-1.2.0.0-956a4b0c127b8c317f6cac3946b0b803.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/ghc-7.0.4-75a79ada61f7974961ef6e048ae39af8.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/ghc-binary-0.5.0.2-a36b46d7bbe800f04bce8a86565c2e8f.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/ghc-prim-0.2.0.0-6bf7b03ebc9c668817e4379b6796c0c2.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/haskell98-1.1.0.1-6f6b89a32eb0b5c7df8a4aba3d9884d3.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/haskell2010-1.0.0.0-98ed3d653ac78fc3526ee288bfd554ae.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/hpc-0.5.0.6-86b8caed77dec5a6adf56b6a203114d8.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/integer-gmp-0.2.0.3-4c5ab8b517f0b5d4ecf2153d5dfb7f41.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/old-locale-1.0.0.2-25ff1e5e0486bb3cf2cb85cb7daf8f22.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/old-time-1.0.0.6-249d424df19da9487f0cb7da3ccb0868.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/pretty-1.0.1.2-f2c716197e95f5c78869e6b87f2330d9.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/process-1.0.1.5-7c01e525f8af6ff6ee54718777c83b45.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/random-1.0.0.3-186815de972cb506efde02a72b0d8f8b.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/template-haskell-2.5.0.0-5eb8b3886e957b3c9cb455b68e59f600.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/time-1.2.0.3-ad46a3ade48e0011608895f44cc02a52.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/unix-2.4.2.0-766adf3eeb77190cf0dabf1daf400c65.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/builtin_ffi.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/lib/ghc-7.0.4/package.conf.d/builtin_rts.conf
</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;'>+ post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch {system "${prefix}${frameworks_dir}/GHC.framework/Versions/7.0.4-powerpc/usr/bin/ghc-pkg -v recache"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
livecheck.type none
</pre><pre style='margin:0'>
</pre>