diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 234699b9d045..249970cfab93 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,52 +1,52 @@
 # Created by: KIRIYAMA Kazuhiko <kiri@FreeBSD.org>
 
 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
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Print formatter driven by XSL formatting
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
 USE_JAVA=	yes
 USE_ANT=	yes
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
 NO_ARCH=	yes
 
 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 ${BUILD_WRKSRC}/hyph
 
 do-install:
 .for d in build conf lib
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
 .endfor
 	@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} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR}
 	${LN} -s ../${DATADIR_REL}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} README NOTICE KEYS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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,152 +1,164 @@
 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.
    <property name="lib.dir" value="${basedir}/lib"/>
    <property name="user.hyph.dir" value="${basedir}/hyph"/>
    <property name="unidata.dir" value="${basedir}/UNIDATA"/>
 -  <property name="hyph.stacksize" value="512k"/>
 +  <property name="hyph.stacksize" value="1024k"/>
    <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"/>
 @@ -347,7 +347,7 @@ list of possible build targets.
    <target name="compile-java" depends="init, codegen">
  <!-- create directories -->
      <mkdir dir="${build.classes.dir}"/>
 -    <javac destdir="${build.classes.dir}" includeAntRuntime="true">
 +    <javac destdir="${build.classes.dir}" includeAntRuntime="true" encoding="utf-8">
        <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">
+@@ -623,28 +676,60 @@ list of possible build targets.
+     <os family="unix" />
+   </condition>
+   
+-  <target name="transcoder-pkg" depends="remove-cache,transcoder-pkg-unix" description="Generates the jar for the transcoder package for Batik" if="isWindows">
+-    <exec executable="cmd" dir="${basedir}/.." failonerror="true">
 -      <env key="MAVEN_OPTS" value="-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2"/>
+-	  <arg value="/c"/>
+-	  <arg value="mvn"/>
 -      <arg value="clean"/>
 -      <arg value="install"/>
 -      <arg value="-DskipTests"/>
--    </exec>
+-    </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>
+-  
+-  <target name="transcoder-pkg-unix" if="isUnix">
+-    <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="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 ;-) -->
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
@@ -1,94 +1,94 @@
 bin/fop
 %%DATADIR%%/build/fop-hyph.jar
 %%DATADIR%%/build/fop-sandbox.jar
 %%DATADIR%%/build/fop-transcoder-allinone.jar
 %%DATADIR%%/build/fop-transcoder.jar
 %%DATADIR%%/build/fop.jar
 %%DATADIR%%/build/fop.war
 %%DATADIR%%/conf/fop.xconf
 %%DATADIR%%/fop
 %%DATADIR%%/hyph/af.xml
 %%DATADIR%%/hyph/as.xml
 %%DATADIR%%/hyph/bg.xml
 %%DATADIR%%/hyph/bn.xml
 %%DATADIR%%/hyph/ca.xml
 %%DATADIR%%/hyph/cop.xml
 %%DATADIR%%/hyph/cs.xml
 %%DATADIR%%/hyph/cy.xml
 %%DATADIR%%/hyph/da.xml
 %%DATADIR%%/hyph/de.xml
 %%DATADIR%%/hyph/de_1901.xml
 %%DATADIR%%/hyph/de_CH.xml
 %%DATADIR%%/hyph/el.xml
 %%DATADIR%%/hyph/el_Polyton.xml
 %%DATADIR%%/hyph/en.xml
 %%DATADIR%%/hyph/en_GB.xml
 %%DATADIR%%/hyph/eo.xml
 %%DATADIR%%/hyph/es.xml
 %%DATADIR%%/hyph/et.xml
 %%DATADIR%%/hyph/eu.xml
 %%DATADIR%%/hyph/fi.xml
 %%DATADIR%%/hyph/fr.xml
 %%DATADIR%%/hyph/fur.xml
 %%DATADIR%%/hyph/ga.xml
 %%DATADIR%%/hyph/gl.xml
 %%DATADIR%%/hyph/grc.xml
 %%DATADIR%%/hyph/gu.xml
 %%DATADIR%%/hyph/hi.xml
 %%DATADIR%%/hyph/hr.xml
 %%DATADIR%%/hyph/hsb.xml
 %%DATADIR%%/hyph/hy.xml
 %%DATADIR%%/hyph/hyphenation.dtd
 %%DATADIR%%/hyph/ia.xml
 %%DATADIR%%/hyph/id.xml
 %%DATADIR%%/hyph/is.xml
 %%DATADIR%%/hyph/it.xml
 %%DATADIR%%/hyph/ka.xml
 %%DATADIR%%/hyph/kmr.xml
 %%DATADIR%%/hyph/kn.xml
 %%DATADIR%%/hyph/la.xml
 %%DATADIR%%/hyph/la_CL.xml
 %%DATADIR%%/hyph/lt.xml
 %%DATADIR%%/hyph/lv.xml
 %%DATADIR%%/hyph/ml.xml
 %%DATADIR%%/hyph/mn.xml
 %%DATADIR%%/hyph/mr.xml
 %%DATADIR%%/hyph/mul_ET.xml
 %%DATADIR%%/hyph/nb.xml
 %%DATADIR%%/hyph/nl.xml
 %%DATADIR%%/hyph/nn.xml
 %%DATADIR%%/hyph/oc.xml
 %%DATADIR%%/hyph/or.xml
 %%DATADIR%%/hyph/pa.xml
 %%DATADIR%%/hyph/pl.xml
 %%DATADIR%%/hyph/pms.xml
 %%DATADIR%%/hyph/pt.xml
 %%DATADIR%%/hyph/readme
 %%DATADIR%%/hyph/rm.xml
 %%DATADIR%%/hyph/ro.xml
 %%DATADIR%%/hyph/ru.xml
 %%DATADIR%%/hyph/sa.xml
 %%DATADIR%%/hyph/sk.xml
 %%DATADIR%%/hyph/sl.xml
 %%DATADIR%%/hyph/sr_Cyrl.xml
 %%DATADIR%%/hyph/sr_Latn.xml
 %%DATADIR%%/hyph/sv.xml
 %%DATADIR%%/hyph/ta.xml
 %%DATADIR%%/hyph/te.xml
 %%DATADIR%%/hyph/th.xml
 %%DATADIR%%/hyph/tk.xml
 %%DATADIR%%/hyph/tr.xml
 %%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