<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0a07d63d7dad516f60c133f84c4b468248388667">https://github.com/macports/macports-ports/commit/0a07d63d7dad516f60c133f84c4b468248388667</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 0a07d63 jython: update to 2.7.2
</span>0a07d63 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0a07d63d7dad516f60c133f84c4b468248388667
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Mon Mar 23 21:58:33 2020 +0900
<span style='display:block; white-space:pre;color:#404040;'> jython: update to 2.7.2
</span>---
lang/jython/Portfile | 57 +++++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/jython/Portfile b/lang/jython/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74e6c28..1321b6b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/jython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/jython/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,10 @@
</span>
PortSystem 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup python 1.0
</span>
name jython
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.7.2
</span> categories lang python java
platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,29 +29,34 @@ java.fallback openjdk8
</span>
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Launch scripts use Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jython_home ${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant installer description {Use installer, rather than building from source} {
master_sites http://search.maven.org/remotecontent?filepath=org/python/jython-installer/${version}
distfiles ${name}-installer-${version}.jar
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 10741971d109bb7c941c98e2b099f366cb8b34b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6e58dad0b8565b95c6fb14b4bfbf570523d1c5290244cfb33822789fa53b1d25 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 103824756
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 91074db0983f75498070d4c1e25306a892646246 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 36e40609567ce020a1de0aaffe45e0b68571c278c14116f52e58cc652fb71552 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 80153928
</span>
extract.only
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${destroot}${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build.cmd java
build.target -jar ${distpath}/${distfiles}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args -s -d ${destroot}${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args -s -d ${destroot}${jython_home}
</span>
global jython_bin_name
set jython_bin_name jython
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach binfile [glob ${destroot}${jython_home}/bin/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#!/usr/bin/env .*|#!${prefix}/bin/${name}|" ${binfile}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
default_variants +installer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +67,9 @@ if {![variant_isset installer]} {
</span> PortGroup github 1.0
github.setup jythontools jython ${version} v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 62fea5972f1c93847753b43dcfb5c6004a49ba90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bca5de8d48437f8b6244883f4c781037cfd85a8bf195e41c06cfcda282e240c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 43404763
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 34c48eae181694b590ce500175e452b83fdab2b8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 82a05fd72d8f681e99effa5dbfd148740ace444f226a3e479a5f3646f72af645 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 46102901
</span>
# Use Ant 1.10.x for Java 8 compatibility
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,28 +82,25 @@ if {![variant_isset installer]} {
</span> set jython_bin_name jython.py
destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#!/usr/bin/env python.*|#!${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/dist/bin/${jython_bin_name}
</span> xinstall -m 0755 -d ${destroot}${prefix}/share/java/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/dist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/java/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/dist ${destroot}${jython_home}
</span> }
}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Jython caches information in the installation dir by default, but for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # permissions reasons this cache needs to be maintained at the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # level. Wrap the executable with a launch script that places the cache in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the user's home.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fp [open ${destroot}${prefix}/bin/${name} w]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} "#!/bin/sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} "exec ${prefix}/share/java/${name}/bin/${jython_bin_name} \\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${fp} " -Dpython.cachedir=\"\$HOME/.jython_cachedir\" \"\$@\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${fp}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${destroot}${prefix}/bin/${name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround for https://github.com/jythontools/jython/issues/173
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod -R a+r ${destroot}${prefix}/share/java/${name}/Lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${jython_home}/bin/${jython_bin_name} ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob -directory ${destroot}${jython_home}/bin *.bat *.exe]
</span> }
pre-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Old versions of this port did not put the Jython cache in the user's home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (see the post-destroot block above). We clean up the old cache here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Old versions of this port left the Jython cache in the system-wide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # jython_home. We clean up the old cache here.
</span> file delete -force -- ${prefix}/share/java/${name}/cachedir
}
</pre><pre style='margin:0'>
</pre>