fop2: update to 2.6

textproc/fop/Portfile

@@ -5,10 +5,12 @@ PortSystem 1.0
 name                fop
 version             1.1
 revision            1
+
 categories          textproc java
 license             Apache-2
 maintainers         {@mascguy} \
                     openmaintainer
+
 platforms           darwin
 supported_archs     noarch
 
@@ -21,6 +23,7 @@ long_description    Apache FOP is the world's first print formatter driven by \
                     to preview it directly on screen. Some parts of the XSL \
                     1.1 specification (work in progress!) have also been \
                     implemented.
+
 homepage            https://xmlgraphics.apache.org/fop/
 
 # Apache recommends at present that FOP be linked to FOP-specific versions of
@@ -43,11 +46,11 @@ if {${name} eq ${subport}} {
 }
 
 subport ${name}2 {
-    version         2.1
+    version         2.6
 
-    checksums       rmd160  0b261f214c2d841147f84a76ce14c78d473d1b59 \
-                    sha256  a93b59aa4d0b6d573c9090d8f21dee6c7d0c449a4bd2d48a1723e233dfb423ea \
-                    size    18424515
+    checksums       rmd160  3dbea5c5ae5de5d81f47e5fb8474c5f33475ef30 \
+                    sha256  ccfd7a1d4e5a04e76723946efa1147ffa9a8715ce2b58d2a27085a8e744520f8 \
+                    size    21291845
 
     livecheck.type  regex
     livecheck.url   https://www.apache.org/dist/xmlgraphics/fop/binaries/
@@ -64,12 +67,15 @@ master_sites        apache:xmlgraphics/fop/binaries/
 worksrcdir          ${name}-${version}
 
 use_configure       no
-build   {}
+
+build {}
+
 pre-destroot {
     delete ${worksrcpath}/fop.bat
     delete ${worksrcpath}/fop.cmd
     delete ${worksrcpath}/fop.js
 }
+
 destroot    {
     xinstall -m 755 -d ${destroot}${prefix}/share/java/fop/${version}
 
@@ -79,7 +85,14 @@ destroot    {
     }
 
     # Ensure soft link name corresponds to port, to avoid conflicts
-    ln -fs ${prefix}/share/java/fop/${version}/fop \
+    set launcher_path ${prefix}/share/java/fop/${version}/fop
+    if {${subport} ne ${name}} {
+        # For fop2 releases after 2.1, launcher script is pushed down
+        # another level, into 'fop' subdir.
+        set launcher_path ${launcher_path}/fop
+    }
+
+    ln -fs ${launcher_path} \
         ${destroot}${prefix}/bin/${subport}
 
     xinstall -m 755 -d ${destroot}${prefix}/share/doc/fop/${version}