svn commit: r560334 - in head/textproc/fop: . files
Max Brazhnikov
makc at FreeBSD.org
Mon Jan 4 19:35:01 UTC 2021
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 at 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 <bsd.port.mk>
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.
<property name="lib.dir" value="${basedir}/lib"/>
<property name="user.hyph.dir" value="${basedir}/hyph"/>
<property name="unidata.dir" value="${basedir}/UNIDATA"/>
@@ -9,7 +11,7 @@
<property name="test.dir" value="${basedir}/test"/>
<property name="test.java.dir" value="${src.dir}/test/java"/>
<property name="test.resources.dir" value="${src.dir}/test/resources"/>
-@@ -348,7 +348,7 @@ list of possible build targets.
+@@ -347,7 +347,7 @@ list of possible build targets.
<target name="compile-java" depends="init, codegen">
<!-- create directories -->
<mkdir dir="${build.classes.dir}"/>
@@ -18,3 +20,133 @@
<src path="${build.gensrc.dir}"/>
<src path="${core.src.java.dir}"/>
<src path="${events.src.java.dir}"/>
+@@ -606,6 +606,59 @@ list of possible build targets.
+ </lib>
+ </war>
+ </target>
++ <patternset id="transcoder-classes">
++<!-- General classes -->
++ <patternset>
++ <include name="org/apache/fop/Version.class"/>
++ <include name="org/apache/fop/accessibility/StructureTreeElement.class"/>
++ <include name="org/apache/fop/apps/Fop.class"/>
++ <include name="org/apache/fop/apps/FOPException.class"/>
++ <include name="org/apache/fop/apps/io/**"/>
++ <include name="org/apache/fop/area/AreaTreeControl*"/>
++ <include name="org/apache/fop/complexscripts/bidi/BidiClass.class"/>
++ <include name="org/apache/fop/complexscripts/bidi/BidiConstants.class"/>
++ <include name="org/apache/fop/complexscripts/bidi/UnicodeBidiAlgorithm.class"/>
++ <include name="org/apache/fop/complexscripts/fonts/*.class"/>
++ <include name="org/apache/fop/complexscripts/util/GlyphTester.class"/>
++ <include name="org/apache/fop/events/EventProducer.class"/>
++ <include name="org/apache/fop/fo/Constants.class"/>
++ <include name="org/apache/fop/fo/FOTreeBuilder.class"/>
++ <include name="org/apache/fop/image/loader/batik/BatikImageFlavors*.class"/>
++ <include name="org/apache/fop/svg/**"/>
++ <include name="org/apache/fop/fonts/**"/>
++ <include name="org/apache/fop/render/gradient/**"/>
++ <include name="org/apache/fop/traits/Direction.class"/>
++ <include name="org/apache/fop/traits/MinOptMax.class"/>
++ <include name="org/apache/fop/traits/TraitEnum.class"/>
++ <include name="org/apache/fop/util/CMYKColorSpace*.class"/>
++ <include name="org/apache/fop/util/Color*.class"/>
++ <include name="org/apache/fop/util/ASCII*.class"/>
++ <include name="org/apache/fop/util/*OutputStream.class"/>
++ <include name="org/apache/fop/util/SubInputStream.class"/>
++ <include name="org/apache/fop/util/Finalizable.class"/>
++ <include name="org/apache/fop/util/CharUtilities*.class"/>
++ <include name="org/apache/fop/util/DecimalFormatCache*.class"/>
++ <include name="org/apache/fop/util/ImageObject.class"/>
++ <include name="org/apache/fop/util/HexEncoder.class"/>
++ <include name="org/apache/fop/configuration/**"/>
++ </patternset>
++<!-- PDF transcoder -->
++ <patternset>
++ <include name="org/apache/fop/render/pdf/**"/>
++ <exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
++ <exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
++ <include name="org/apache/fop/render/intermediate/IFDocumentHandlerConfigurator.class"/>
++ <include name="org/apache/fop/render/**Config**"/>
++ <include name="org/apache/fop/util/AbstractPaintingState**"/>
++ <include name="org/apache/fop/pdf/**"/>
++ </patternset>
++<!-- PS transcoder -->
++ <patternset>
++ <include name="org/apache/fop/render/ps/**"/>
++ <exclude name="org/apache/fop/render/pdf/PSRenderer.class"/>
++ <exclude name="org/apache/fop/render/pdf/PSXMLHandler*"/>
++ </patternset>
++ </patternset>
+ <fileset dir="${build.classes.dir}" id="transcoder-classes-files">
+ <patternset refid="transcoder-classes"/>
+ </fileset>
+@@ -614,15 +667,60 @@ list of possible build targets.
+ <include name="commons-logging*.jar"/>
+ <include name="xmlgraphics-commons*.jar"/>
+ </fileset>
+- <target name="transcoder-pkg" depends="remove-cache" description="Generates the jar for the transcoder package for Batik">
+- <exec executable="mvn" dir="${basedir}/.." failonerror="true">
+- <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/>
+- <arg value="clean"/>
+- <arg value="install"/>
+- <arg value="-DskipTests"/>
+- </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"/>
++ <target name="uptodate-transcoder-pkg" depends="compile">
++ <uptodate property="transcoder.pkg.uptodate" targetfile="${build.dir}/fop-transcoder.jar">
++ <srcfiles refid="transcoder-classes-files"/>
++ <srcfiles refid="transcoder-lib-files"/>
++ </uptodate>
++ </target>
++ <target name="transcoder-pkg" depends="remove-cache, uptodate-transcoder-pkg, compile" description="Generates the jar for the transcoder package for Batik" unless="transcoder.pkg.uptodate">
++ <echo message="Creating the jar file ${build.dir}/fop-transcoder.jar"/>
++ <property name="fop-transcoder.name" value="FOP Transcoder Package"/>
++ <property name="fop-transcoder.version" value="${version}"/>
++ <tstamp>
++ <format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
++ </tstamp>
++<!-- lean transcoder jar -->
++ <jar jarfile="${build.dir}/fop-transcoder.jar">
++ <fileset refid="transcoder-classes-files"/>
++ <manifest>
++ <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
++ <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
++ <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
++ <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ </manifest>
++ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
++ </jar>
++<!-- all-in-one transcoder jar -->
++ <property name="transcoder-deps" value="${build.dir}/transcoder-dependencies"/>
++ <mkdir dir="${transcoder-deps}"/>
++ <unjar dest="${transcoder-deps}">
++ <patternset>
++ <include name="org/apache/commons/logging/**"/>
++ <include name="org/apache/commons/io/*.class"/>
++ <include name="org/apache/commons/io/filefilter/*.class"/>
++ <include name="org/apache/commons/io/output/*.class"/>
++ </patternset>
++ <fileset refid="transcoder-lib-files"/>
++ </unjar>
++ <mkdir dir="${transcoder-deps}/legal"/>
++ <copy todir="${transcoder-deps}/legal">
++ <fileset dir="${lib.dir}">
++ <include name="commons-io.LICENSE.txt"/>
++ <include name="commons-logging.LICENSE.txt"/>
++ </fileset>
++ </copy>
++ <jar jarfile="${build.dir}/fop-transcoder-allinone.jar">
++ <fileset refid="transcoder-classes-files"/>
++ <fileset dir="${transcoder-deps}"/>
++ <manifest>
++ <attribute name="Implementation-Title" value="${fop-transcoder.name}"/>
++ <attribute name="Implementation-Version" value="${fop-transcoder.version}"/>
++ <attribute name="Implementation-Vendor" value="The Apache Software Foundation (http://xmlgraphics.apache.org/fop/)"/>
++ <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
++ </manifest>
++ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
++ </jar>
+ </target>
+ <target name="all" depends="package, servlet, transcoder-pkg, junit"/>
+ <!-- "all" target for us Makefile converts ;-) -->
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
More information about the svn-ports-head
mailing list