From owner-dev-commits-ports-main@freebsd.org Fri Jul 23 16:00:26 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E7E1674B72; Fri, 23 Jul 2021 16:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GWYty3CYWz3DHY; Fri, 23 Jul 2021 16:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 550CD27E01; Fri, 23 Jul 2021 16:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16NG0QbQ019357; Fri, 23 Jul 2021 16:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16NG0QZF019356; Fri, 23 Jul 2021 16:00:26 GMT (envelope-from git) Date: Fri, 23 Jul 2021 16:00:26 GMT Message-Id: <202107231600.16NG0QZF019356@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: c8237f49a738 - main - textproc/fop: Update to 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8237f49a7385cbb9e1e9a8578d174c9d5890668 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2021 16:00:26 -0000 The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=c8237f49a7385cbb9e1e9a8578d174c9d5890668 commit c8237f49a7385cbb9e1e9a8578d174c9d5890668 Author: Max Brazhnikov AuthorDate: 2021-07-23 15:30:12 +0000 Commit: Max Brazhnikov CommitDate: 2021-07-23 15:58:45 +0000 textproc/fop: Update to 2.6 --- textproc/fop/Makefile | 2 +- textproc/fop/distinfo | 6 +++--- textproc/fop/files/patch-build.xml | 32 ++++++++++++++++++++++---------- textproc/fop/pkg-plist | 6 +++--- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile index 234699b9d045..249970cfab93 100644 --- a/textproc/fop/Makefile +++ b/textproc/fop/Makefile @@ -1,7 +1,7 @@ # Created by: KIRIYAMA Kazuhiko PORTNAME= fop -DISTVERSION= 2.5 +DISTVERSION= 2.6 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 ef59d14f491c..da742ea304f3 100644 --- a/textproc/fop/distinfo +++ b/textproc/fop/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1609697810 -SHA256 (fop-2.5-src.tar.gz) = 783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005 -SIZE (fop-2.5-src.tar.gz) = 27447223 +TIMESTAMP = 1627051195 +SHA256 (fop-2.6-src.tar.gz) = 084fa6c9d0a3cc7b76502f69579ba52495a7390cb86341c6aa8b54c006bcb890 +SIZE (fop-2.6-src.tar.gz) = 27478217 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 0b9c20f20c58..f5714e0a2e2b 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 2020-05-05 09:42:05 UTC +--- fop/build.xml.orig 2021-01-12 12:15:02 UTC +++ fop/build.xml @@ -207,7 +207,7 @@ list of possible build targets. @@ -80,17 +80,19 @@ This patch reverts FOP-2895 to avoid dependency on maven. -@@ -614,15 +667,60 @@ list of possible build targets. - - - -- -- +@@ -623,28 +676,60 @@ list of possible build targets. + + + +- +- - +- +- - - - -- +- - - + @@ -98,7 +100,17 @@ This patch reverts FOP-2895 to avoid dependency on maven. + + + -+ + +- +- +- +- +- +- +- +- +- +- + + + @@ -148,5 +160,5 @@ This patch reverts FOP-2895 to avoid dependency on maven. + + + - diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist index 81c914f11b59..1ce9cd68f076 100644 --- a/textproc/fop/pkg-plist +++ b/textproc/fop/pkg-plist @@ -81,14 +81,14 @@ bin/fop %%DATADIR%%/hyph/uk.xml %%DATADIR%%/hyph/zh_Latn.xml %%DATADIR%%/lib/README.txt -%%DATADIR%%/lib/batik-all-1.13.jar +%%DATADIR%%/lib/batik-all-1.14.jar %%DATADIR%%/lib/commons-io-1.3.1.jar %%DATADIR%%/lib/commons-logging-1.0.4.jar -%%DATADIR%%/lib/fontbox-2.0.16.jar +%%DATADIR%%/lib/fontbox-2.0.19.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.4.jar +%%DATADIR%%/lib/xmlgraphics-commons-2.6.jar