3 files changed, 19 insertions, 13 deletions

diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index edef6dadb027..cd1856895ec6 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	fop
-PORTVERSION=	1.1
+PORTVERSION=	2.0
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/xmlgraphics/fop/source/:fop \
-		SF/offo/offo-hyphenation/2.0:hyph
+		SF/offo/offo-hyphenation/2.1:hyph
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation_v2.0.zip:hyph
+DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	geoff@sea-incorporated.com
@@ -29,7 +29,7 @@ USE_ANT=	yes
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
 post-extract:
-	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation_v2.0.zip
+	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation.zip
 	@${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph
 
 do-install:
diff --git a/textproc/fop/distinfo b/textproc/fop/distinfo
index 6d96be52e237..9898e3f6167f 100644
--- a/textproc/fop/distinfo
+++ b/textproc/fop/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fop-1.1-src.tar.gz) = 58164cb3298d130522ecd445b8082c71c36242ea6464c8f02ab4157e4a332522
-SIZE (fop-1.1-src.tar.gz) = 24513986
-SHA256 (offo-hyphenation_v2.0.zip) = 79d341820583aa5b77ee00dc7da59bfafb92adceb88c7a1922fe300a90a22c4e
-SIZE (offo-hyphenation_v2.0.zip) = 858046
+SHA256 (fop-2.0-src.tar.gz) = 1d37f2d1cfb8dd29df6765a5875042fc89c085dd7329504afd8ecce4096d0882
+SIZE (fop-2.0-src.tar.gz) = 23178600
+SHA256 (offo-hyphenation.zip) = a9dd01154c89ed7acf7016a8ac9a1df42a356b4cdcb0f8d5ec36728c5f85127c
+SIZE (offo-hyphenation.zip) = 899466
diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist
index 971f1d8c5a81..e16a03a16dad 100644
--- a/textproc/fop/pkg-plist
+++ b/textproc/fop/pkg-plist
@@ -1,6 +1,4 @@
 bin/fop
-%%DATADIR%%/fop
-%%DATADIR%%/status.xml
 %%DATADIR%%/build/fop-hyph.jar
 %%DATADIR%%/build/fop-sandbox.jar
 %%DATADIR%%/build/fop-transcoder-allinone.jar
@@ -8,6 +6,7 @@ bin/fop
 %%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
@@ -30,6 +29,7 @@ bin/fop
 %%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
@@ -43,23 +43,26 @@ bin/fop
 %%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/lo.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/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
@@ -70,19 +73,22 @@ bin/fop
 %%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-4.2.0.jar
-%%DATADIR%%/lib/batik-all-1.7.jar
+%%DATADIR%%/lib/batik-all-1.8.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/servlet-2.2.jar
 %%DATADIR%%/lib/xalan-2.7.0.jar
 %%DATADIR%%/lib/xercesImpl-2.7.1.jar
 %%DATADIR%%/lib/xml-apis-1.3.04.jar
 %%DATADIR%%/lib/xml-apis-ext-1.3.04.jar
-%%DATADIR%%/lib/xmlgraphics-commons-1.5.jar
+%%DATADIR%%/lib/xmlgraphics-commons-2.0.1.jar
+%%DATADIR%%/status.xml