<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f2bace85cef65f1aad4c67565c1d188d92fdc80a">https://github.com/macports/macports-ports/commit/f2bace85cef65f1aad4c67565c1d188d92fdc80a</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 f2bace8 pdftk-java: Update to 3.1.1 and fix class path
</span>f2bace8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f2bace85cef65f1aad4c67565c1d188d92fdc80a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon May 11 23:48:40 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> pdftk-java: Update to 3.1.1 and fix class path
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58905
</span>---
textproc/pdftk-java/Portfile | 41 ++++++++++-------------
textproc/pdftk-java/files/commons-text.patch | 50 ++++++++++++++++++++++++++++
textproc/pdftk-java/files/pdftk-java | 4 ---
textproc/pdftk-java/files/pdftk-java.in | 4 +++
4 files changed, 72 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdftk-java/Portfile b/textproc/pdftk-java/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d21cc6..fbeaa50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/pdftk-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdftk-java/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,15 +2,16 @@
</span> # vim: set fileencoding=utf-8 tabstop=8 shiftwidth=4 softtabstop=4 noexpandtab filetype=tcl :
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span> PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name pdftk-java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_project pdftk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 1aab675 is single commit following 3.0.6 release containing minor bugfix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 1aab675b178baf38601f8898ca3530dc222bed97
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20190702
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup pdftk-java pdftk 3.1.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ce4f3851b0d3dd46997bb719bdb7019e4a9f7ed8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7da20b5172fcbcda8c14e312cd6d40efa3abd4909d62de52403e1d2b418712fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1172831
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name pdftk-java
</span> categories textproc graphics pdf java
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,13 +20,6 @@ description A port of pdftk into java
</span> long_description ${description}
supported_archs noarch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://gitlab.com/pdftk-java/${git_project}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://gitlab.com/pdftk-java/${git_project}/-/archive/${git_commit}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 02546b6b1553348f4b5b74fd421a8ed2a84bd282 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 306c73693bc24fa7b6ea32967a7028cb027b4658f4eae96cb3a046c413da07d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1360035
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> java.version 1.7+
java.fallback openjdk11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,16 +27,18 @@ depends_build-append \
</span> bin:ant:apache-ant
depends_lib-append port:bcprov \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:commons-lang3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:commons-lang3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:commons-text
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${git_project}-${git_commit}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles commons-text.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-configure {
</span> file mkdir ${worksrcpath}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/lib "ln -s ${prefix}/share/java/bcprov/bcprov.jar"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/lib "ln -s ${prefix}/share/java/commons-lang3.jar"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/java/bcprov/bcprov.jar ${worksrcpath}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/java/commons-lang3.jar ${worksrcpath}/lib/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/java/commons-text.jar ${worksrcpath}/lib/
</span> }
build.cmd ant
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,10 +46,9 @@ build.target jar
</span>
destroot {
set javadir ${destroot}${prefix}/share/java
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 -d ${javadir}/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/build/jar/${git_project}.jar ${javadir}/${name}/${git_project}.jar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 -d ${javadir}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/build/jar/pdftk.jar ${javadir}/${name}/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install the wrapper script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/pdftk-java ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|_PREFIX_|${prefix}|g" ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${filespath}/pdftk-java.in ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${destroot}${prefix}/bin/${name}
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdftk-java/files/commons-text.patch b/textproc/pdftk-java/files/commons-text.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6f7f12e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdftk-java/files/commons-text.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+As of commons-lang 3.6 StringEscapeUtils, CharSequenceTranslator and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+NumericEntityEscaper have moved to commons-text.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/pdftk-java/pdftk/-/issues/51
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- java/com/gitlab/pdftk_java/data_import.java.orig 2020-05-01 05:05:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ java/com/gitlab/pdftk_java/data_import.java 2020-05-11 23:14:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25,7 +25,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.io.InputStream;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.util.ArrayList;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.util.Scanner;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import org.apache.commons.lang3.StringEscapeUtils;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import org.apache.commons.text.StringEscapeUtils;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.Rectangle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.pdf.PRIndirectReference;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.pdf.PdfArray;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- java/com/gitlab/pdftk_java/pdftk.java.orig 2020-05-01 05:05:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ java/com/gitlab/pdftk_java/pdftk.java 2020-05-11 23:15:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -776,7 +776,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void describe_missing_library(Throwable error) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ System.err.println("Error: could not load a required library for this operation.");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ System.err.println(error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- System.err.println("Make sure that bcprov and commons-lang3 are installed and included in the");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ System.err.println("Make sure that bcprov, commons-lang3 and commons-text are installed and included in the");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ System.err.println("classpath. See also https://gitlab.com/pdftk-java/pdftk/issues/2.");
</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;'>+--- java/com/gitlab/pdftk_java/report.java.orig 2020-05-01 05:05:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ java/com/gitlab/pdftk_java/report.java 2020-05-11 23:15:09.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,9 +31,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.util.Iterator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.util.List;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import java.util.Set;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import org.apache.commons.lang3.StringEscapeUtils;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-import org.apache.commons.lang3.text.translate.NumericEntityEscaper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import org.apache.commons.text.StringEscapeUtils;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import org.apache.commons.text.translate.CharSequenceTranslator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import org.apache.commons.text.translate.NumericEntityEscaper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.Rectangle;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.pdf.PRStream;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pdftk.com.lowagie.text.pdf.PdfArray;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Escape both Xml and Unicode entities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // see
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // https://commons.apache.org/proper/commons-lang/javadocs/api-3.6/org/apache/commons/lang3/StringEscapeUtils.html#escapeXml-java.lang.String-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/StringEscapeUtils.html#escapeXml10-java.lang.String-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private static CharSequenceTranslator XmlUnicodeEscaper = null;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static String OutputXmlString(String jss_p) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdftk-java/files/pdftk-java b/textproc/pdftk-java/files/pdftk-java
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20d1e5b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/pdftk-java/files/pdftk-java
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PREFIX=_PREFIX_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-java -jar ${PREFIX}/share/java/pdftk-java/pdftk.jar "$@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdftk-java/files/pdftk-java.in b/textproc/pdftk-java/files/pdftk-java.in
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6d8d16a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdftk-java/files/pdftk-java.in
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec java \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -cp @PREFIX@/share/java/pdftk-java/pdftk.jar:@PREFIX@/share/java/bcprov/bcprov.jar:@PREFIX@/share/java/commons-lang3.jar:@PREFIX@/share/java/commons-text.jar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ com.gitlab.pdftk_java.pdftk "$@"
</span></pre><pre style='margin:0'>
</pre>