From nobody Tue Feb 14 16:40:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PGRl46Yvyz3ph8c; Tue, 14 Feb 2023 16:40:00 +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 4PGRl45tRcz3DHk; Tue, 14 Feb 2023 16:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676392800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJdll934zXSRGaEXZFijLn0WYC3GlrH5uI9HVZxNuiY=; b=qpdVV8oCJ0z42n+OjfzLPDM3ZRh9wT46FlKH85Tz7FbTrVpYmu/6Ze5M+nA3matoyYJAMt DHXbkoPFmeG838FB7UQUEUHh6iH06hbTdYncDJpJqB+0WH4PM82fopsXAHCbHFNq8xZCtt 4zErpPKdYnCjzwOu9hwSQ/+bUYkCJpFjgIrybVknf99IS1yyQ1Q594mwWzOv8Gir+bAfgw /1OlcBx/qsGpC7NfiNffhM+6O06In+Rl2xag9R5JaYkTUsCmoZ+H3ujeK2V77P4WoAiluL CFTOc7V377+/KsG04Wo9mLLWQCSfONktS5O6Ieo/oV0juISNnQpg9Y1NKTPYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676392800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aJdll934zXSRGaEXZFijLn0WYC3GlrH5uI9HVZxNuiY=; b=ry0GGv7APpPn8yFt8UM4DK/3FACREc52CvDFXCfq4Ye4v9AHZrVSjsfCejoOqAer2tR7tN 78S8V3r20Rd+OF8gMmlGiMuAYLduRIJepvPpj6gl1iH0XnGAFuBpReHyqOE+erT/F31y2P /rUTRLs+emfxc9VIFZBxUdfVIGhrwhADqh2ZgJx02RRqskTXqfaOE+p8HM7wMQLO9qImRN /1TOJVdPxpwzXu5wFZhSK+an+L0atx7wTEFj8Acr3YtC2pXYryLQQU20VulLAYx2PMZpCB 18dZ3Lv1yRqOodAr3rn8RMSPIMKAAg8SZeTlEE/Idmd3F9p1l7LJxYxG1F2Jow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676392800; a=rsa-sha256; cv=none; b=uV7DD+ttt3KniYf+iC1IFy2Uf0Xd2vKxIfDcNw/yAOS3es6k6xtz0gnvGgE46TcMbqiE+t ILkxkcTjyzXoj8tdlKrPNnPJghpDizynnbJEEYh0lDcM3tkGv/HBOQXOI4A23T8Vg0woHt aGbQcanJ940wHP0PDbkC4oNB9RPFyjIpUOG6maHvjq5h521bFKNWQHjiRn7UB7/A6XCPt7 erikcI0kZJIx24Cx/4pl/cINNfwuPU9IzjYOhoYQ/LocAdfBoIYsZYWwYI8OjW7hT0eRSM oRWD5xrNjWBMokjbHzg7l7WxBQgE75JVIs9EvVObmfky1VGd9LF7noNaB2D2fA== 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 4PGRl44qtkz156q; Tue, 14 Feb 2023 16:40:00 +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 31EGe0KX030649; Tue, 14 Feb 2023 16:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EGe0us030626; Tue, 14 Feb 2023 16:40:00 GMT (envelope-from git) Date: Tue, 14 Feb 2023 16:40:00 GMT Message-Id: <202302141640.31EGe0us030626@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikhail Teterin Subject: git: a6e390ca4ae2 - main - textproc/fop: upgrade from 2.6 to 2.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6e390ca4ae25acfddf33e7c812ca87feee35f69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mi: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6e390ca4ae25acfddf33e7c812ca87feee35f69 commit a6e390ca4ae25acfddf33e7c812ca87feee35f69 Author: Mikhail Teterin AuthorDate: 2023-02-14 16:39:07 +0000 Commit: Mikhail Teterin 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. @@ -80,7 +80,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. -@@ -623,28 +676,60 @@ list of possible build targets. +@@ -623,30 +676,60 @@ list of possible build targets. @@ -92,6 +92,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. - - - +- - - - @@ -108,6 +109,7 @@ This patch reverts FOP-2895 to avoid dependency on maven. - - - +- - - - 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