From owner-svn-ports-all@freebsd.org Mon Jan 4 19:35:01 2021 Return-Path: Delivered-To: svn-ports-all@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 66DBA4C7A6C; Mon, 4 Jan 2021 19:35:01 +0000 (UTC) (envelope-from makc@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8m6s2WMQz3s3P; Mon, 4 Jan 2021 19:35:01 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 488541F710; Mon, 4 Jan 2021 19:35:01 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 104JZ1CG091847; Mon, 4 Jan 2021 19:35:01 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 104JZ0gP091844; Mon, 4 Jan 2021 19:35:00 GMT (envelope-from makc@FreeBSD.org) Message-Id: <202101041935.104JZ0gP091844@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Mon, 4 Jan 2021 19:35:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560334 - in head/textproc/fop: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/textproc/fop: . files X-SVN-Commit-Revision: 560334 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 19:35:01 -0000 Author: makc Date: Mon Jan 4 19:35:00 2021 New Revision: 560334 URL: https://svnweb.freebsd.org/changeset/ports/560334 Log: textproc/fop: - Update to 2.5 - Add patch to revert upstream svn commit r1873636, which demands maven for build - Use BUILD_WRKSRC instead of redefining WRKSRC - Remove stale comments PR: 250621 Modified: head/textproc/fop/Makefile head/textproc/fop/distinfo head/textproc/fop/files/patch-build.xml head/textproc/fop/pkg-plist Modified: head/textproc/fop/Makefile ============================================================================== --- head/textproc/fop/Makefile Mon Jan 4 19:28:00 2021 (r560333) +++ head/textproc/fop/Makefile Mon Jan 4 19:35:00 2021 (r560334) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= fop -DISTVERSION= 2.3 +DISTVERSION= 2.5 CATEGORIES= textproc java MASTER_SITES= APACHE/xmlgraphics/fop/source/:fop \ - SF/offo/offo-hyphenation/2.2:hyph # offo-hyphenation doesn't provide the corresponding version 2.3, 2.2 should be good for fop-2.3 + SF/offo/offo-hyphenation/2.2:hyph DISTNAME= ${PORTNAME}-${PORTVERSION}-src DISTFILES= ${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph EXTRACT_ONLY= ${DISTNAME}.tar.gz @@ -14,43 +14,40 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Print formatter driven by XSL formatting LICENSE= APACHE20 -LICENSE_FILE= ${LEGALDIR}/LICENSE +LICENSE_FILE= ${WRKSRC}/LICENSE EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip -OPTIONS_DEFINE= DOCS - -WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/fop -LEGALDIR= ${WRKDIR}/${DISTNAME:S/-src//} -DATADIR= ${JAVASHAREDIR}/${PORTNAME} -PORTDOCS= * - USE_JAVA= yes USE_ANT= yes +DATADIR= ${JAVASHAREDIR}/${PORTNAME} +PORTDOCS= * NO_ARCH= yes -# Prevent out of memory error during build -MAKE_ENV+= "ANT_OPTS=-Xmx512m" +BUILD_WRKSRC= ${WRKSRC}/fop +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} +OPTIONS_DEFINE= DOCS + post-extract: @cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation.zip - @${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph + @${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${BUILD_WRKSRC}/hyph do-install: .for d in build conf lib @${MKDIR} ${STAGEDIR}${DATADIR}/${d} .endfor - @cd ${WRKSRC} && \ + @cd ${BUILD_WRKSRC} && \ ${INSTALL_DATA} build/*.[jw]ar ${STAGEDIR}${DATADIR}/build && \ ${INSTALL_DATA} lib/*.jar lib/README.txt ${STAGEDIR}${DATADIR}/lib && \ ${INSTALL_DATA} conf/fop.xconf ${STAGEDIR}${DATADIR}/conf && \ ${COPYTREE_SHARE} hyph ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} ${LN} -s ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${LEGALDIR} && ${INSTALL_DATA} README NOTICE KEYS ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} README NOTICE KEYS ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/fop/distinfo ============================================================================== --- head/textproc/fop/distinfo Mon Jan 4 19:28:00 2021 (r560333) +++ head/textproc/fop/distinfo Mon Jan 4 19:35:00 2021 (r560334) @@ -1,5 +1,5 @@ -TIMESTAMP = 1550346622 -SHA256 (fop-2.3-src.tar.gz) = e8cdb9a8db4afe05f6a82dc791a13e0f93ada8105a99a88a1b5040641b5fe4a5 -SIZE (fop-2.3-src.tar.gz) = 27209908 +TIMESTAMP = 1609697810 +SHA256 (fop-2.5-src.tar.gz) = 783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005 +SIZE (fop-2.5-src.tar.gz) = 27447223 SHA256 (offo-hyphenation.zip) = df0b863a2ef269ac7defd497f74da54480cd2c03ad665304e7c05334ab3f289f SIZE (offo-hyphenation.zip) = 883080 Modified: head/textproc/fop/files/patch-build.xml ============================================================================== --- head/textproc/fop/files/patch-build.xml Mon Jan 4 19:28:00 2021 (r560333) +++ head/textproc/fop/files/patch-build.xml Mon Jan 4 19:35:00 2021 (r560334) @@ -1,6 +1,8 @@ ---- build.xml.orig 2017-04-03 11:23:57 UTC -+++ build.xml -@@ -208,7 +208,7 @@ list of possible build targets. +This patch reverts FOP-2895 to avoid dependency on maven. + +--- fop/build.xml.orig 2020-05-05 09:42:05 UTC ++++ fop/build.xml +@@ -207,7 +207,7 @@ list of possible build targets. @@ -9,7 +11,7 @@ -@@ -348,7 +348,7 @@ list of possible build targets. +@@ -347,7 +347,7 @@ list of possible build targets. @@ -18,3 +20,133 @@ +@@ -606,6 +606,59 @@ list of possible build targets. + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -614,15 +667,60 @@ list of possible build targets. + + + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + Modified: head/textproc/fop/pkg-plist ============================================================================== --- head/textproc/fop/pkg-plist Mon Jan 4 19:28:00 2021 (r560333) +++ head/textproc/fop/pkg-plist Mon Jan 4 19:35:00 2021 (r560334) @@ -81,16 +81,14 @@ bin/fop %%DATADIR%%/hyph/uk.xml %%DATADIR%%/hyph/zh_Latn.xml %%DATADIR%%/lib/README.txt -%%DATADIR%%/lib/avalon-framework-api-4.3.1.jar -%%DATADIR%%/lib/avalon-framework-impl-4.3.1.jar -%%DATADIR%%/lib/batik-all-1.10.jar +%%DATADIR%%/lib/batik-all-1.13.jar %%DATADIR%%/lib/commons-io-1.3.1.jar %%DATADIR%%/lib/commons-logging-1.0.4.jar -%%DATADIR%%/lib/fontbox-2.0.7.jar +%%DATADIR%%/lib/fontbox-2.0.16.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.9.1.jar -%%DATADIR%%/lib/xml-apis-1.3.04.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.3.jar +%%DATADIR%%/lib/xmlgraphics-commons-2.4.jar