<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/825dcb75a2f7b4a42729faf8958e36d0322d16b6">https://github.com/macports/macports-ports/commit/825dcb75a2f7b4a42729faf8958e36d0322d16b6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 825dcb75a2f7b4a42729faf8958e36d0322d16b6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Aug 15 14:25:20 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> mosml*: refine deps; reinplace cleanup
</span>---
lang/mosml/Portfile | 67 +++++++++++++++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mosml/Portfile b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06a53a848ba..a986c7b5e48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mosml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,38 +10,37 @@ revision 0
</span> categories lang devel ml
license GPL-2+
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Moscow ML is an implementation of Standard ML (SML)
long_description Moscow ML is a light-weight implementation of Standard ML \
(SML), a strict functional language widely used in teaching \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- and research. Version 2.10.1 of Moscow ML implements \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and research. The latest release of Moscow ML implements \
</span> the full Standard ML language, as revised 1997, including Modules \
and some extensions, yet is backwards compatible with versions \
prior to 2.00, and implements large parts of the new SML Basis Library.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://mosml.org
checksums rmd160 a684b544fdd204a7408930c7b77611fcbf28dc44 \
sha256 9c18aaac26f6cf8b8394ea7ef3d2fc1e57de34715feea5860b4ea139757e4b95 \
size 2577422
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> extract.rename yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gd2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-mosml.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-mosml.patch
</span>
post-patch {
<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/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/launch/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile.inc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/launch/Makefile \
</span> src/dynlibs/intinf/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CC@|${configure.cc}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@CC@|${configure.cc}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile.inc
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gmp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.dir ${worksrcpath}/src
build.target world
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,8 +54,12 @@ subport ${name}-dynlibs {
</span> set pgs_v 14
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span> port:mosml \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgresql${pgs_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgresql${pgs_v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
# https://github.com/kfl/mosml/issues/71
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,32 +69,46 @@ subport ${name}-dynlibs {
</span> 0005-Placeholders-for-disabling-werrors.patch
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@DESTDIR@|${destroot}|" ${worksrcpath}/src/Makefile.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@DESTDIR@|${destroot}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/Makefile.inc
</span> foreach d {mgd mpq mregex} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/dynlibs/${d}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/${d}/Makefile
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PGSQL@|postgresql${pgs_v}|g" ${worksrcpath}/src/dynlibs/mpq/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PGSQL@|postgresql${pgs_v}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mpq/Makefile
</span>
if {[string match *clang* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-error=incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-error=implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@WERROR@|-Wno-error=incompatible-pointer-types|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@WERROR@|-Wno-error=implicit-function-declaration|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mpq/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mregex/Makefile
</span> } elseif {[string match macports-gcc* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-incompatible-pointer-types|" ${worksrcpath}/src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@|-Wno-implicit-function-declaration|" ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@WERROR@|-Wno-incompatible-pointer-types|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mgdbm/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@WERROR@|-Wno-implicit-function-declaration|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mpq/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mregex/Makefile
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@WERROR@||" ${worksrcpath}/src/dynlibs/mgdbm/Makefile ${worksrcpath}/src/dynlibs/mpq/Makefile ${worksrcpath}/src/dynlibs/mregex/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@WERROR@||" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mgdbm/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mpq/Makefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/dynlibs/mregex/Makefile
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set port_libdir ${prefix}/lib/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.dir ${worksrcpath}/src/dynlibs
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ROOTDIR="${prefix}/lib/mosml" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CAMLRT="${prefix}/lib/mosml"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ROOTDIR="${port_libdir}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAMLRT="${port_libdir}"
</span>
build.target all
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/lib/mosml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${port_libdir}
</span> }
}
</pre><pre style='margin:0'>
</pre>