Date: Tue, 14 Feb 2023 16:40:00 GMT From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a6e390ca4ae2 - main - textproc/fop: upgrade from 2.6 to 2.8 Message-ID: <202302141640.31EGe0us030626@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6e390ca4ae25acfddf33e7c812ca87feee35f69 commit a6e390ca4ae25acfddf33e7c812ca87feee35f69 Author: Mikhail Teterin <mi@FreeBSD.org> AuthorDate: 2023-02-14 16:39:07 +0000 Commit: Mikhail Teterin <mi@FreeBSD.org> CommitDate: 2023-02-14 16:39:07 +0000 textproc/fop: upgrade from 2.6 to 2.8 PR: 269428 Approved by: makc (maintainer) --- textproc/fop/Makefile | 2 +- textproc/fop/distinfo | 6 +++--- textproc/fop/files/patch-build.xml | 6 ++++-- textproc/fop/pkg-descr | 2 +- textproc/fop/pkg-plist | 10 ++++------ 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 6e21049885e6..f20636ece1f1 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,5 +1,5 @@ PORTNAME= fop -DISTVERSION= 2.6 +DISTVERSION= 2.8 CATEGORIES= textproc java MASTER_SITES= APACHE/xmlgraphics/fop/source/:fop \ SF/offo/offo-hyphenation/2.2:hyph \ diff --git a/textproc/fop/distinfo b/textproc/fop/distinfo index da742ea304f3..612a8672ebf9 100644 --- a/textproc/fop/distinfo +++ b/textproc/fop/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1627051195 -SHA256 (fop-2.6-src.tar.gz) = 084fa6c9d0a3cc7b76502f69579ba52495a7390cb86341c6aa8b54c006bcb890 -SIZE (fop-2.6-src.tar.gz) = 27478217 +TIMESTAMP = 1675879419 +SHA256 (fop-2.8-src.tar.gz) = 6fb02fd7bc2ee80aff9e928e8b062ace5bc115222e5d3a6a4da70cd6cc6d06f7 +SIZE (fop-2.8-src.tar.gz) = 22855369 SHA256 (offo-hyphenation.zip) = df0b863a2ef269ac7defd497f74da54480cd2c03ad665304e7c05334ab3f289f SIZE (offo-hyphenation.zip) = 883080 diff --git a/textproc/fop/files/patch-build.xml b/textproc/fop/files/patch-build.xml index f5714e0a2e2b..ae72a741e206 100644 --- a/textproc/fop/files/patch-build.xml +++ b/textproc/fop/files/patch-build.xml @@ -1,6 +1,6 @@ This patch reverts FOP-2895 to avoid dependency on maven. ---- fop/build.xml.orig 2021-01-12 12:15:02 UTC +--- fop/build.xml 2022-11-02 +++ fop/build.xml @@ -207,7 +207,7 @@ list of possible build targets. <property name="lib.dir" value="${basedir}/lib"/> @@ -80,7 +80,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. <fileset dir="${build.classes.dir}" id="transcoder-classes-files"> <patternset refid="transcoder-classes"/> </fileset> -@@ -623,28 +676,60 @@ list of possible build targets. +@@ -623,30 +676,60 @@ list of possible build targets. <os family="unix" /> </condition> @@ -92,6 +92,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. - <arg value="clean"/> - <arg value="install"/> - <arg value="-DskipTests"/> +- <arg value="-U"/> - </exec> - <copy file="${basedir}/../fop-transcoder/target/fop-transcoder-${version}.jar" tofile="${build.dir}/fop-transcoder.jar"/> - <copy file="${basedir}/../fop-transcoder-allinone/target/fop-transcoder-allinone-${version}.jar" tofile="${build.dir}/fop-transcoder-allinone.jar"/> @@ -108,6 +109,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. - <arg value="clean"/> - <arg value="install"/> - <arg value="-DskipTests"/> +- <arg value="-U"/> - </exec> - <copy file="${basedir}/../fop-transcoder/target/fop-transcoder-${version}.jar" tofile="${build.dir}/fop-transcoder.jar"/> - <copy file="${basedir}/../fop-transcoder-allinone/target/fop-transcoder-allinone-${version}.jar" tofile="${build.dir}/fop-transcoder-allinone.jar"/> diff --git a/textproc/fop/pkg-descr b/textproc/fop/pkg-descr index 85a523f001a3..4e0a2c7cdc8f 100644 --- a/textproc/fop/pkg-descr +++ b/textproc/fop/pkg-descr @@ -4,4 +4,4 @@ tree conforming to the XSL candidate release (21. November 2000) and then turns it into a PDF document or allows you to preview it directly on screen. -FOP is part of Apache's XML project. The homepage of FOP is +FOP is part of Apache's XML project. diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist index 1ce9cd68f076..5fe098e73aa2 100644 --- a/textproc/fop/pkg-plist +++ b/textproc/fop/pkg-plist @@ -81,14 +81,12 @@ bin/fop %%DATADIR%%/hyph/uk.xml %%DATADIR%%/hyph/zh_Latn.xml %%DATADIR%%/lib/README.txt -%%DATADIR%%/lib/batik-all-1.14.jar -%%DATADIR%%/lib/commons-io-1.3.1.jar +%%DATADIR%%/lib/batik-all-1.16.jar +%%DATADIR%%/lib/commons-io-2.11.0.jar %%DATADIR%%/lib/commons-logging-1.0.4.jar -%%DATADIR%%/lib/fontbox-2.0.19.jar +%%DATADIR%%/lib/fontbox-2.0.24.jar %%DATADIR%%/lib/serializer-2.7.2.jar %%DATADIR%%/lib/servlet-2.2.jar -%%DATADIR%%/lib/xalan-2.7.2.jar -%%DATADIR%%/lib/xercesImpl-2.12.0.jar %%DATADIR%%/lib/xml-apis-1.4.01.jar %%DATADIR%%/lib/xml-apis-ext-1.3.04.jar -%%DATADIR%%/lib/xmlgraphics-commons-2.6.jar +%%DATADIR%%/lib/xmlgraphics-commons-2.8.jar
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302141640.31EGe0us030626>