[147955] trunk/dports/textproc/fop/Portfile

[khindenburg at macports.org]

Revision: 147955
          https://trac.macports.org/changeset/147955
Author:   khindenburg at macports.org
Date:     2016-04-20 20:46:30 -0700 (Wed, 20 Apr 2016)
Log Message:
-----------
fop: add subport fop2 (2.1) since there are so many ports that depend on
    port:fop and there are a number of significant changes in 2.x  #47977

Modified Paths:
--------------
    trunk/dports/textproc/fop/Portfile

Modified: trunk/dports/textproc/fop/Portfile
===================================================================
--- trunk/dports/textproc/fop/Portfile	2016-04-21 01:56:55 UTC (rev 147954)
+++ trunk/dports/textproc/fop/Portfile	2016-04-21 03:46:30 UTC (rev 147955)
@@ -28,17 +28,38 @@
 # with a compelling reason to change this.  For the same reason, we also stick
 # to the directory structure within the archive, since it isolates FOP and its
 # libraries from conflicts with other versions.
-distname            ${name}-${version}-bin
-master_sites        apache:xmlgraphics/fop/binaries/
-checksums           md5     8b6f4747482d77449fd4c30df129a507 \
+
+if {${name} eq ${subport}} {
+    conflicts       ${name}2
+
+    checksums       md5     8b6f4747482d77449fd4c30df129a507 \
                     sha1    6b96c3f3fd5efe9f2b6b54bfa96161ec3f6a1dbc \
                     rmd160  fdeee43b73f0b005738661bb9b86d9f9a4434f63
-worksrcdir          ${name}-${version}
 
-livecheck.regex     {(?i)<title>Apache FOP (.*)</title>}
+    patchfiles      java_home.patch
 
-patchfiles          java_home.patch
+    livecheck.type  none
+}
 
+# It may be possible to install both versions just by changing subport fop2's
+# bin/fop to bin/fop2
+subport ${name}2 {
+    conflicts       ${name}
+    version         2.1
+
+    checksums       rmd160  0b261f214c2d841147f84a76ce14c78d473d1b59 \
+                    sha256  a93b59aa4d0b6d573c9090d8f21dee6c7d0c449a4bd2d48a1723e233dfb423ea
+
+    livecheck.type  regex
+    livecheck.url   http://www.apache.org/dist/xmlgraphics/fop/binaries/
+    livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)-bin${extract.suffix}"
+}
+
+distname            ${name}-${version}-bin
+master_sites        apache:xmlgraphics/fop/binaries/
+
+worksrcdir          ${name}-${version}
+
 use_configure       no
 build   {}
 pre-destroot {
@@ -83,7 +104,3 @@
 #    #build.target       all docs javadocs
 #    build.target        all javadocs
 #}
-
-livecheck.type  regex
-livecheck.url   http://www.apache.org/dist/xmlgraphics/fop/binaries/
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)-bin${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160420/17a7d705/attachment-0001.html>