<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/50a91d48d415267c8f91e8f2915abb5d0b306226">https://github.com/macports/macports-ports/commit/50a91d48d415267c8f91e8f2915abb5d0b306226</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 50a91d48d41 pure-gen: Update to version 0.25, use PG haskell_cabal, Bugfix * Fixes: https://github.com/agraef/pure-lang/issues/37
</span>50a91d48d41 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50a91d48d415267c8f91e8f2915abb5d0b306226
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Sun Sep 18 15:40:41 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> pure-gen: Update to version 0.25, use PG haskell_cabal, Bugfix
</span><span style='display:block; white-space:pre;color:#404040;'> * Fixes: https://github.com/agraef/pure-lang/issues/37
</span>---
pure/pure-gen/Portfile | 95 ++++++++++++++++++++++-----------
pure/pure-gen/files/patch-Makefile.diff | 20 +++++++
2 files changed, 83 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pure/pure-gen/Portfile b/pure/pure-gen/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 09dc7403d5d..a8dcf8d3cce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pure/pure-gen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pure/pure-gen/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,85 +1,116 @@
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup pure 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup haskell_cabal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup pure 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pure.setup pure-gen 0.21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories-append devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {ryandesign @ryandesign} {gmail.com:aggraef @agraef}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pure.setup pure-gen 0.25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories-append devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} {gmail.com:aggraef @agraef}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description a Pure C bindings generator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description a Pure C bindings generator
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${name} is ${description}.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${name} is ${description}.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9d8a102b502a307f7286d14e2251cec1588583b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a81ab15ae01396f5554b09257d887c761471389734388ef06802b621521526db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 186315
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5174e441cf4db163b5456d9b1c100c7a13065ab3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0322dba7389e4f8be333bd364ddf47f6fc808d584ebe87107b9f14b24a2d6091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:alex \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:happy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append path:bin/ghc:ghc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hs-cabal-install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hs-alex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hs-happy \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PG haskell_cabal sets these; also dependencies of pure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-delete port:gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-delete port:libiconv
</span>
# pure-gen uses gcc at runtime to parse C headers but the
# -fdirectives-only option it needs is only available in gcc 4.3 and up.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 description {Use gcc43 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 gcc12 description {Use gcc43 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.3:gcc43
global gcc_version
set gcc_version 4.3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 description {Use gcc44 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 gcc12 description {Use gcc44 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.4:gcc44
global gcc_version
set gcc_version 4.4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 gcc49 gcc6 description {Use gcc45 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 gcc49 gcc6 gcc12 description {Use gcc45 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.5:gcc45
global gcc_version
set gcc_version 4.5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 gcc49 gcc6 description {Use gcc46 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 gcc49 gcc6 gcc12 description {Use gcc46 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.6:gcc46
global gcc_version
set gcc_version 4.6
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 gcc49 gcc6 description {Use gcc47 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 gcc49 gcc6 gcc12 description {Use gcc47 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.7:gcc47
global gcc_version
set gcc_version 4.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc49 gcc6 description {Use gcc48 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc49 gcc6 gcc12 description {Use gcc48 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.8:gcc48
global gcc_version
set gcc_version 4.8
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc49 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc6 description {Use gcc49 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc49 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc6 gcc12 description {Use gcc49 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-4.9:gcc49
global gcc_version
set gcc_version 4.9
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant gcc6 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 description {Use gcc6 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc6 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 gcc12 description {Use gcc6 for runtime C header parsing} {
</span> depends_run-append path:bin/gcc-mp-6:gcc6
global gcc_version
set gcc_version 6
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gcc12 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 gcc48 gcc49 gcc6 description {Use gcc12 for runtime C header parsing} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append path:bin/gcc-mp-12:gcc12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global gcc_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_version 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc48] && ![variant_isset gcc49]} {
if {${os.platform} eq "darwin" && ${os.major} < 9} {
# gcc44 doesn't build for me on Tiger
default_variants +gcc43
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcc6 should work fine on all recent macOS versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +gcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcc12 should work fine on all recent macOS versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +gcc12
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@gcc@|${prefix}/bin/gcc-mp-${gcc_version}|g" ${worksrcpath}/pure-gen.pure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@gcc@|${prefix}/bin/gcc-mp-${gcc_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/pure-gen.pure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # cabal version 3.8.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CABAL_UPDATE_CMD@|${haskell_cabal.bin} ${haskell_cabal.global_flags} update|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CABAL_BUILD_CMD@|${haskell_cabal.bin} ${haskell_cabal.global_flags} v1-build [haskell_cabal.build_getjobsarg]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CABAL_INSTALL_CMD@|${haskell_cabal.bin} ${haskell_cabal.global_flags} v1-install [haskell_cabal.build_getjobsarg]|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target maintainer-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is HOME in ./Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+haskell_cabal.cabal_root \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cabal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# undo PG haskell_cabal/pure conflicts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.type "default"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd [portbuild::build_getmaketype]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target maintainer-build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.pre_args [portbuild::build_getargs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.post_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd ${build.cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.pre_args [portdestroot::destroot_getargs]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.post_args ${destroot.destdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append LIBRARY_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/pure/pure-gen/files/patch-Makefile.diff b/pure/pure-gen/files/patch-Makefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..eb068a4ec82
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pure/pure-gen/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./Makefile 2022-09-18 08:53:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./Makefile 2022-09-18 08:59:27.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -80,7 +80,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If a suitable language-c version is not readily available, you can run this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to install the included language-c 0.5.0 locally using cabal.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cabal-install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd language-c && cabal v1-update && cabal v1-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd language-c && @CABAL_UPDATE_CMD@ && @CABAL_BUILD_CMD@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # These options work around quirks with various ghc versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GHCXFLAGS += -XTypeSynonymInstances -XFlexibleInstances
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainer-build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Install locally into the build directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cd language-c && HOME=$(shell pwd)/cabal cabal v1-update && HOME=$(shell pwd)/cabal cabal v1-install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd language-c && HOME=$(shell pwd)/cabal @CABAL_UPDATE_CMD@ && HOME=$(shell pwd)/cabal @CABAL_INSTALL_CMD@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Make sure to do a static build here, since the cabal-installed language-c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # will be gone once we're finished.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) all GHCFLAGS=-static HOME=$(shell pwd)/cabal
</span></pre><pre style='margin:0'>
</pre>