Index: head/textproc/fop/Makefile =================================================================== --- head/textproc/fop/Makefile (revision 390701) +++ head/textproc/fop/Makefile (revision 390702) @@ -1,51 +1,52 @@ # Created by: KIRIYAMA Kazuhiko # $FreeBSD$ PORTNAME= fop PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= textproc java MASTER_SITES= APACHE/xmlgraphics/fop/source/:fop \ SF/offo/offo-hyphenation/2.1: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 EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip OPTIONS_DEFINE= DOCS WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} DATADIR= ${JAVASHAREDIR}/${PORTNAME} PORTDOCS= * USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= 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} 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 && \ ${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} .include Index: head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java =================================================================== --- head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java (nonexistent) +++ head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java (revision 390702) @@ -0,0 +1,20 @@ +--- 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()); Property changes on: head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java ___________________________________________________________________ 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