<pre style='margin:0'>
Aljaž Srebrnič (g5pw) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/87dee5220206f07ff497506a6b576744bd4a879d">https://github.com/macports/macports-ports/commit/87dee5220206f07ff497506a6b576744bd4a879d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 87dee5220206f07ff497506a6b576744bd4a879d
</span>Author: Masc Guy <mascguy@github.com>
AuthorDate: Sun Dec 13 16:07:20 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    fop: fix broken symbolic links for subport fop2; eliminate conflict between fop and fop2
</span>---
 textproc/fop/Portfile                              | 55 +++++++++++++++-------
 .../{java_home.patch => patch-fop-java_home.diff}  |  0
 2 files changed, 39 insertions(+), 16 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 5d3ddab388b..dbc7fdb79f8 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;'>@@ -1,12 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
 
 name                fop
 version             1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          textproc java
 license             Apache-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers         nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers         {@mascguy} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    openmaintainer
</span> platforms           darwin
 supported_archs     noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description         Apache FOP Java XSL-FO Print Formatter
 long_description    Apache FOP is the world's first print formatter driven by \
                     XSL formatting objects. It is a Java application that \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,25 +33,21 @@ homepage            https://xmlgraphics.apache.org/fop/
</span> # libraries from conflicts with other versions.
 
 if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       ${name}2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160  fdeee43b73f0b005738661bb9b86d9f9a4434f63 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  0697a90c2f0b0602bf707070267caecc59638a8bf7a719d5950acff764f57b8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    22490250
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       md5     8b6f4747482d77449fd4c30df129a507 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha1    6b96c3f3fd5efe9f2b6b54bfa96161ec3f6a1dbc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    rmd160  fdeee43b73f0b005738661bb9b86d9f9a4434f63
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles      java_home.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles      patch-fop-java_home.diff
</span> 
     livecheck.type  none
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# It may be possible to install both versions just by changing subport fop2's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# bin/fop to bin/fop2
</span> subport ${name}2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    conflicts       ${name}
</span>     version         2.1
 
     checksums       rmd160  0b261f214c2d841147f84a76ce14c78d473d1b59 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  a93b59aa4d0b6d573c9090d8f21dee6c7d0c449a4bd2d48a1723e233dfb423ea
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a93b59aa4d0b6d573c9090d8f21dee6c7d0c449a4bd2d48a1723e233dfb423ea \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    18424515
</span> 
     livecheck.type  regex
     livecheck.url   https://www.apache.org/dist/xmlgraphics/fop/binaries/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,20 +68,42 @@ pre-destroot {
</span> }
 destroot    {
     xinstall -m 755 -d ${destroot}${prefix}/share/java/fop/${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     set foppaths [glob ${worksrcpath}/*]
     foreach foppath ${foppaths} {
         copy $foppath ${destroot}${prefix}/share/java/fop/${version}
     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Ensure soft link name corresponds to port, to avoid conflicts
</span>     ln -fs ${prefix}/share/java/fop/${version}/fop \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ${destroot}${prefix}/bin/fop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${destroot}${prefix}/bin/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     xinstall -m 755 -d ${destroot}${prefix}/share/doc/fop/${version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     foreach fopdoc {KEYS LICENSE README NOTICE status.xml} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -fs ${prefix}/share/java/fop/${version}/${fopdoc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/share/doc/fop/${version}/${fopdoc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Ensure soft links are only created for files that exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Necessary, as not all are provided with both versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set src ${destroot}${prefix}/share/java/fop/${version}/${fopdoc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[file exists ${src}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_debug "destroot: fopdoc: linking to file: ${fopdoc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ln -fs ${prefix}/share/java/fop/${version}/${fopdoc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/doc/fop/${version}/${fopdoc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_debug "destroot: fopdoc: file doesn't exist, ignoring: ${fopdoc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     foreach docdir {docs javadocs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -fs ${prefix}/share/java/fop/${version}/${docdir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${destroot}${prefix}/share/doc/fop/${version}/${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Ensure soft links are only created for directories that exist.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # Necessary, as not all are provided with both versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set src ${destroot}${prefix}/share/java/fop/${version}/${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[file exists ${src}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_debug "destroot: docdir: linking to directory: ${docdir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ln -fs ${prefix}/share/java/fop/${version}/${docdir} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ${destroot}${prefix}/share/doc/fop/${version}/${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            ui_debug "destroot: docdir: directory doesn't exist, ignorning: ${docdir}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/fop/files/java_home.patch b/textproc/fop/files/patch-fop-java_home.diff
</span>similarity index 100%
rename from textproc/fop/files/java_home.patch
rename to textproc/fop/files/patch-fop-java_home.diff
</pre><pre style='margin:0'>

</pre>