textproc/fop: 2.0 -> 2.1

Changes:
- http://xmlgraphics.apache.org/fop/2.1/releaseNotes_2.1.html
  Add PreloaderRawPNG to handle images ImageIO cant
  Support Barcode4J page number
  Support CMYK JPEG in AFP
  Support IPD change on last page
  Support PDF/UA
  Support TrueType fonts in PCL
  Support TrueType fonts in AFP
  Support for PDF/A-3

PR:		209023
Submitted by:	delphij
Approved by:	geoff@sea-incorporated.com (maintainer)

4 files changed, 9 insertions, 30 deletions

diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 7f0acf2e7d44..f04674ca7c2c 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fop
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/xmlgraphics/fop/source/:fop \
 		SF/offo/offo-hyphenation/2.1:hyph
@@ -25,6 +24,7 @@ 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"
@@ -38,7 +38,6 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${d}
 .endfor
 	@cd ${WRKSRC} && \
-	    ${INSTALL_DATA} status.xml ${STAGEDIR}${DATADIR} && \
 	    ${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 && \
diff --git a/textproc/fop/distinfo b/textproc/fop/distinfo
index 9898e3f6167f..b8cf230c390f 100644
--- a/textproc/fop/distinfo
+++ b/textproc/fop/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fop-2.0-src.tar.gz) = 1d37f2d1cfb8dd29df6765a5875042fc89c085dd7329504afd8ecce4096d0882
-SIZE (fop-2.0-src.tar.gz) = 23178600
+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
diff --git a/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java b/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java
deleted file mode 100644
index 519a05d5dd7c..000000000000
--- a/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java.orig	2015-05-26 08:03:48 UTC
-+++ src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
-@@ -393,7 +393,7 @@ public class ListItemLayoutManager exten
-             int breakClass = EN_AUTO;
-             KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0])
-                     : null;
--            Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null;
-+            Position originalLabelPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
-             if (endEl instanceof KnuthPenalty) {
-                 additionalPenaltyHeight = endEl.getWidth();
-                 stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math
-@@ -402,7 +402,7 @@ public class ListItemLayoutManager exten
-                         ((KnuthPenalty) endEl).getBreakClass());
-             }
-             endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null;
--            Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null;
-+            Position originalBodyPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
-             if (endEl instanceof KnuthPenalty) {
-                 additionalPenaltyHeight = Math.max(
-                         additionalPenaltyHeight, endEl.getWidth());
diff --git a/textproc/fop/pkg-plist b/textproc/fop/pkg-plist
index e16a03a16dad..4de540a83ec4 100644
--- a/textproc/fop/pkg-plist
+++ b/textproc/fop/pkg-plist
@@ -79,16 +79,16 @@ bin/fop
 %%DATADIR%%/hyph/uk.xml
 %%DATADIR%%/hyph/zh_Latn.xml
 %%DATADIR%%/lib/README.txt
-%%DATADIR%%/lib/avalon-framework-4.2.0.jar
+%%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/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/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.0.1.jar
-%%DATADIR%%/status.xml
+%%DATADIR%%/lib/xmlgraphics-commons-2.1.jar