<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/0af52bd7194e04b2ef2ebb11400d85a05baa79c7">https://github.com/macports/macports-ports/commit/0af52bd7194e04b2ef2ebb11400d85a05baa79c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0af52bd7194e04b2ef2ebb11400d85a05baa79c7
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Mon Dec 23 15:15:36 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> ihaskell: Update and Bugfix
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Update to latest commits
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix version number in Paths_ihaskell.hs
</span><span style='display:block; white-space:pre;color:#404040;'> * Minor Portfile fixes
</span>---
devel/ihaskell/Portfile | 53 ++++++++++++++++++++++++++-----------------------
1 file changed, 28 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ihaskell/Portfile b/devel/ihaskell/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78242fe..dcdbb85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ihaskell/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/ihaskell/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup haskell_stack 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup gibiansky IHaskell ac0882d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name ihaskell
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2019.08.30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup gibiansky IHaskell 2318ee2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name [string tolower ${github.project}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2019.12.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories devel haskell
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,19 +15,20 @@ license MIT
</span> maintainers nomaintainer
description A Haskell kernel for IPython.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IHaskell is a kernel for the Jupyter project, which allows you to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use Haskell inside Jupyter frontends (including the console and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notebook). For a tour of some IHaskell features, check out the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- demo Notebook at \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://nbviewer.ipython.org/github/gibiansky/IHaskell/blob/master/notebooks/IHaskell.ipynb. More \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- example notebooks are available on the wiki at \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://github.com/gibiansky/IHaskell/wiki. The wiki also has more \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extensive documentation of IHaskell features.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 47cf8fed7674b0e2421019ff4c813ee4eea93882 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c6e6c9a7d71ba6349027f1fb818608f8355acafe6fa7cbe57265ec9951a5ddb4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 753553
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description IHaskell is a kernel for the Jupyter project,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ which allows you to use Haskell inside Jupyter\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ frontends (including the console and\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notebook). For a tour of some IHaskell features,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check out the demo Notebook at\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://nbviewer.ipython.org/github/gibiansky/IHaskell/blob/master/notebooks/IHaskell.ipynb. More\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ example notebooks are available on the wiki at\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://github.com/gibiansky/IHaskell/wiki. The\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wiki also has more extensive documentation of\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IHaskell features.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2764a538d21901b55aa31d3b3234fc1cdaa576ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 feb4aceba2d38cb91d2c82255067fb6e716d28d34e7f5a48d70cbe55dd1cd173 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 774326
</span>
# use these to specify python versions, python3 required
set python3_version 3.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +40,7 @@ set python3_version_nickname \
</span> depends_lib-append \
path:lib/pkgconfig/pango.pc:pango \
port:ghc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libmagic \
</span> port:python${python3_version_nickname} \
port:py${python3_version_nickname}-cairo \
port:py${python3_version_nickname}-ipykernel \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,6 +77,9 @@ post-extract {
</span> # See https://github.com/commercialhaskell/stack/issues/825\\
extra-lib-dirs:\\
\\ \\ - /usr/lib\\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ \\ - ${prefix}/lib\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extra-include-dirs:\\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\\ \\ - ${prefix}/include\\
</span> " \
stack.yaml
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +96,8 @@ extra-lib-dirs:\\
</span> ${worksrcpath}/src/Paths_${name}.hs
reinplace "s|@NAME@|${name}|g" \
${worksrcpath}/src/Paths_${name}.hs
<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> }
# no jupyter_select yet, so hack PATH to find `which jupyter`:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +105,7 @@ extra-lib-dirs:\\
</span> # note: this command does not change the destroot PATH environment, so export
# PATH explicitly in the necessary system command below
destroot.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${frameworks_dir}/Python.framework/Versions/${python3_version}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "PATH=$env(PATH):${frameworks_dir}/Python.framework/Versions/${python3_version}/bin" \
</span> ${name}_datadir=${destroot}${prefix}/${ihaskell_datadir}
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,14 +125,10 @@ post-destroot {
</span> }
# run ihaskell to install the IPython files into destroot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH=$env(PATH):${frameworks_dir}/Python.framework/Versions/${python3_version}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${name}_datadir=${destroot}${prefix}/${ihaskell_datadir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "export ${destroot.env} ; \
</span> ${destroot}${prefix}/bin/ihaskell install \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=${destroot}${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --prefix=${destroot}${prefix}"
</span>
# delete any destroot path appearing in text files
fs-traverse f ${destroot}${prefix} {
</pre><pre style='margin:0'>
</pre>