<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/7b5203be5eb84e7b04a45488e2b2a8ed4c0d2197">https://github.com/macports/macports-ports/commit/7b5203be5eb84e7b04a45488e2b2a8ed4c0d2197</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 7b5203be5eb fop2: update to 2.6
</span>7b5203be5eb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b5203be5eb84e7b04a45488e2b2a8ed4c0d2197
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Jul 20 15:56:44 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> fop2: update to 2.6
</span>---
textproc/fop/Portfile | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/fop/Portfile b/textproc/fop/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1929087e512..55df04c6af3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/fop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/fop/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,12 @@ PortSystem 1.0
</span> name fop
version 1.1
revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories textproc java
license Apache-2
maintainers {@mascguy} \
openmaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platforms darwin
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +23,7 @@ long_description Apache FOP is the world's first print formatter driven by \
</span> to preview it directly on screen. Some parts of the XSL \
1.1 specification (work in progress!) have also been \
implemented.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> homepage https://xmlgraphics.apache.org/fop/
# Apache recommends at present that FOP be linked to FOP-specific versions of
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +46,11 @@ if {${name} eq ${subport}} {
</span> }
subport ${name}2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.6
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0b261f214c2d841147f84a76ce14c78d473d1b59 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a93b59aa4d0b6d573c9090d8f21dee6c7d0c449a4bd2d48a1723e233dfb423ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18424515
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3dbea5c5ae5de5d81f47e5fb8474c5f33475ef30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ccfd7a1d4e5a04e76723946efa1147ffa9a8715ce2b58d2a27085a8e744520f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21291845
</span>
livecheck.type regex
livecheck.url https://www.apache.org/dist/xmlgraphics/fop/binaries/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,12 +67,15 @@ master_sites apache:xmlgraphics/fop/binaries/
</span> worksrcdir ${name}-${version}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-destroot {
delete ${worksrcpath}/fop.bat
delete ${worksrcpath}/fop.cmd
delete ${worksrcpath}/fop.js
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/java/fop/${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +85,14 @@ destroot {
</span> }
# Ensure soft link name corresponds to port, to avoid conflicts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -fs ${prefix}/share/java/fop/${version}/fop \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set launcher_path ${prefix}/share/java/fop/${version}/fop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # For fop2 releases after 2.1, launcher script is pushed down
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # another level, into 'fop' subdir.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set launcher_path ${launcher_path}/fop
</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;'>+ ln -fs ${launcher_path} \
</span> ${destroot}${prefix}/bin/${subport}
xinstall -m 755 -d ${destroot}${prefix}/share/doc/fop/${version}
</pre><pre style='margin:0'>
</pre>