3 files changed, 61 insertions, 16 deletions

diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 1b62541601bf..b0d5c85f7da3 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	fop
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	textproc java
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:fop/} \
-		SF/offo/offo-hyphenation/1.0:hyph
+		SF/offo/offo-hyphenation/2.0:hyph
 MASTER_SITE_SUBDIR=	xmlgraphics/fop/source/:fop
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation.zip:hyph
+DISTFILES=	${DISTNAME}.tar.gz:fop offo-hyphenation_v2.0.zip:hyph
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	geoff@sea-incorporated.com
@@ -31,7 +31,7 @@ USE_ANT=	yes
 MAKE_ENV+=	"ANT_OPTS=-Xmx512m"
 
 post-extract:
-	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation.zip
+	@cd ${WRKDIR} && ${UNZIP_CMD} ${DISTDIR}/offo-hyphenation_v2.0.zip
 	@${CP} ${WRKDIR}/offo-hyphenation/hyph/*.xml ${WRKSRC}/hyph
 
 do-install:
diff --git a/textproc/fop/distinfo b/textproc/fop/distinfo
index 913fb504da67..6d96be52e237 100644
--- a/textproc/fop/distinfo
+++ b/textproc/fop/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fop-1.0-src.tar.gz) = 1a7163a1aded5fdfc4a0e46f9c0dbcfed57f0c0affb4500e39ec54fa3c727829
-SIZE (fop-1.0-src.tar.gz) = 16141354
-SHA256 (offo-hyphenation.zip) = f877d0c642bc187918ff66415d4289fa30cf5bdeb8c7ba880dbe378e133ee3d2
-SIZE (offo-hyphenation.zip) = 359817
+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
diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist
index 21760e219198..1ba9d55fac38 100644
--- a/textproc/fop/pkg-plist
+++ b/textproc/fop/pkg-plist
@@ -2,34 +2,79 @@
 bin/fop
 %%DATADIR%%/fop
 %%DATADIR%%/status.xml
-%%DATADIR%%/build/fop.jar
-%%DATADIR%%/build/fop.war
 %%DATADIR%%/build/fop-hyph.jar
 %%DATADIR%%/build/fop-sandbox.jar
-%%DATADIR%%/build/fop-transcoder.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%%/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_DR.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/en_US.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/hu.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/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/nb.xml
 %%DATADIR%%/hyph/nl.xml
-%%DATADIR%%/hyph/no.xml
+%%DATADIR%%/hyph/nn.xml
+%%DATADIR%%/hyph/or.xml
+%%DATADIR%%/hyph/pa.xml
 %%DATADIR%%/hyph/pl.xml
 %%DATADIR%%/hyph/pt.xml
 %%DATADIR%%/hyph/readme
+%%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/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
@@ -41,7 +86,7 @@ bin/fop
 %%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.4.jar
+%%DATADIR%%/lib/xmlgraphics-commons-1.5.jar
 %%PORTDOCS%%%%DOCSDIR%%/KEYS
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NOTICE