Index: head/textproc/fop/Makefile
===================================================================
--- head/textproc/fop/Makefile	(revision 442128)
+++ head/textproc/fop/Makefile	(revision 442129)
@@ -1,51 +1,55 @@
 # Created by: KIRIYAMA Kazuhiko <kiri@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	fop
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/xmlgraphics/fop/source/:fop \
-		SF/offo/offo-hyphenation/2.1:hyph
+		SF/offo/offo-hyphenation/${PORTVERSION}:hyph
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	geoff@sea-incorporated.com
 COMMENT=	Print formatter driven by XSL formatting
 
+LICENSE=	APACHE20
+LICENSE_FILE=	${LEGALDIR}/LICENSE
+
 EXTRACT_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 
 OPTIONS_DEFINE=	DOCS
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/fop
+LEGALDIR=	${WRKDIR}/${DISTNAME:S/-src//}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 PORTDOCS=	*
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USE_ANT=	yes
 NO_ARCH=	yes
 
 # Prevent out of memory error during build
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
 post-extract:
 	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation.zip
 	@${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph
 
 do-install:
 .for d in build conf lib
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
 .endfor
 	@cd ${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}
 	${LN} -s ${DATADIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${STAGEDIR}${DOCSDIR}
+	cd ${LEGALDIR} && ${INSTALL_MAN} LICENSE README NOTICE KEYS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/textproc/fop/distinfo
===================================================================
--- head/textproc/fop/distinfo	(revision 442128)
+++ head/textproc/fop/distinfo	(revision 442129)
@@ -1,4 +1,5 @@
-SHA256 (fop-2.1-src.tar.gz) = e5af1d81df8f9fab8aa473e6a1c1407c1bf1c3d327df9b04c3861e8247e8b998
-SIZE (fop-2.1-src.tar.gz) = 23308630
-SHA256 (offo-hyphenation.zip) = a9dd01154c89ed7acf7016a8ac9a1df42a356b4cdcb0f8d5ec36728c5f85127c
-SIZE (offo-hyphenation.zip) = 899466
+TIMESTAMP = 1495846381
+SHA256 (fop-2.2-src.tar.gz) = 5052fef87fc4b888bd49d29bf626255c9d3443b628f21393c11ea121d44a6552
+SIZE (fop-2.2-src.tar.gz) = 25477122
+SHA256 (offo-hyphenation.zip) = df0b863a2ef269ac7defd497f74da54480cd2c03ad665304e7c05334ab3f289f
+SIZE (offo-hyphenation.zip) = 883080
Index: head/textproc/fop/files/patch-build.xml
===================================================================
--- head/textproc/fop/files/patch-build.xml	(nonexistent)
+++ head/textproc/fop/files/patch-build.xml	(revision 442129)
@@ -0,0 +1,20 @@
+--- build.xml.orig	2017-04-03 11:23:57 UTC
++++ build.xml
+@@ -208,7 +208,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"/>
+@@ -348,7 +348,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}"/>

Property changes on: head/textproc/fop/files/patch-build.xml
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/textproc/fop/pkg-plist
===================================================================
--- head/textproc/fop/pkg-plist	(revision 442128)
+++ head/textproc/fop/pkg-plist	(revision 442129)
@@ -1,94 +1,96 @@
 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/avalon-framework-api-4.3.1.jar
 %%DATADIR%%/lib/avalon-framework-impl-4.3.1.jar
-%%DATADIR%%/lib/batik-all-1.8.jar
+%%DATADIR%%/lib/batik-all-1.9.jar
 %%DATADIR%%/lib/commons-io-1.3.1.jar
 %%DATADIR%%/lib/commons-logging-1.0.4.jar
-%%DATADIR%%/lib/fontbox-1.8.5.jar
-%%DATADIR%%/lib/serializer-2.7.0.jar
+%%DATADIR%%/lib/fontbox-2.0.4.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/xml-apis-ext-1.3.04.jar
-%%DATADIR%%/lib/xmlgraphics-commons-2.1.jar
+%%DATADIR%%/lib/xmlgraphics-commons-2.2.jar