<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/34787f1333274973d5e6a55806ad1a5a11c8e5a8">https://github.com/macports/macports-ports/commit/34787f1333274973d5e6a55806ad1a5a11c8e5a8</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 34787f13332 plantuml: update to 1.2022.8 and add pdf variant
</span>34787f13332 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34787f1333274973d5e6a55806ad1a5a11c8e5a8
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Sun Sep 25 20:02:24 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> plantuml: update to 1.2022.8 and add pdf variant
</span>---
java/plantuml/Portfile | 44 ++++++++++++++++----------
java/plantuml/files/patch-jlatexmath-name.diff | 21 ++++++------
2 files changed, 37 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/plantuml/Portfile b/java/plantuml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28f5df082b5..a77e9dfaf23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/plantuml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/plantuml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup plantuml plantuml 1.2022.7 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup plantuml plantuml 1.2022.8 v
</span> github.tarball_from archive
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,24 +17,13 @@ description PlantUML is a tool for generating UML diagrams from \
</span> long_description ${description}
homepage https://plantuml.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a53f367d03e5aeb0948c223762f3a7192bba099a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8e76c339080678db1b784d54498a4893e1142b93aca6fa978d8188fbb5b724a6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5645734
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9837b6c9e18b58ad51f52664e9060276840da7fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3f5e7fd0e0f1b7915e785d0a7faacfdb79f6542d624f12598e3147d85027cc44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5652273
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build bin:ant:apache-ant \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:gradle \
</span> port:jlatexmath
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version 1.7+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback openjdk18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd ant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target dist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set javadir ${destroot}${prefix}/share/java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set jarname ${name}.jar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-extract {
copy ${filespath}/${name}.in ${worksrcpath}/${name}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +33,33 @@ patchfiles patch-jlatexmath-name.diff
</span> post-patch {
reinplace "s|__PLANTUML_LAUNCHER_PATH__|${prefix}/share/java/${jarname}|g" \
${worksrcpath}/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # don't add version in *.jar filenames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|M.YYYY.m-SNAPSHOT||g" ${worksrcpath}/gradle.properties
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version 1.7+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback openjdk19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append GRADLE_USER_HOME=${worksrcpath}/.gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/gradle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set javadir ${destroot}${prefix}/share/java
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set jarname ${name}.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
xinstall -d -m 0755 ${javadir}
xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/${jarname} ${javadir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/build/libs/${jarname} ${javadir}
</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;'>+variant pdf description {Include PDF Support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target-append build pdfJar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/build/libs/${name}-pdf.jar ${javadir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
notes "
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/plantuml/files/patch-jlatexmath-name.diff b/java/plantuml/files/patch-jlatexmath-name.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d62804790e..fa03a8a6a9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/plantuml/files/patch-jlatexmath-name.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/plantuml/files/patch-jlatexmath-name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build.xml.orig 2021-05-20 23:50:10.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build.xml 2021-05-20 23:51:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,7 +96,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <manifest>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <attribute name="Automatic-Module-Name" value="net.sourceforge.plantuml" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <attribute name="Main-Class" value="net.sourceforge.plantuml.Run" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <attribute name="Class-Path" value="elk-full.jar avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath-minimal-1.0.3.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <attribute name="Class-Path" value="elk-full.jar avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar" />
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </manifest>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </jar>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <delete dir="build" />
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- manifest.txt.orig 2022-09-25 20:32:17.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ manifest.txt 2022-09-25 20:33:26.021999852 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Manifest-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Class-Path: elk-full.jar avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath-minimal-1.0.3.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Class-Path: elk-full.jar avalon-framework-4.2.0.jar batik-all-1.7.jar commons-io-1.3.1.jar commons-logging-1.0.4.jar fop.jar xml-apis-ext-1.3.04.jar xmlgraphics-commons-1.4.jar jlatexmath.jar jlm_cyrillic.jar jlm_greek.jar vizjs.jar j2v8_win32_x86_64-3.1.6.jar j2v8_linux_x86_64-3.1.6.jar j2v8_macosx_x86_64-3.1.6.jar ditaa0_9.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Main-Class: net.sourceforge.plantuml.Run
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-Automatic-Module-Name: net.sourceforge.plantuml
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++Automatic-Module-Name: net.sourceforge.plantuml
</span></pre><pre style='margin:0'>
</pre>