office/fop: Updated for version 2.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 39 insertions, 30 deletions

diff --git a/office/fop/README b/office/fop/README
index 2deacbff89..0edb42deb3 100644
--- a/office/fop/README
+++ b/office/fop/README
@@ -1,8 +1,14 @@
-Apache FOP is a print formatter driven by XSL formatting objects. It
-is a Java application that reads a formatting object tree conforming
-to the XSL 1.1 Recommendation (05 December 2006) and then turns it
-into a PDF document, certain other output formats or allows you to
-preview it directly on screen. 
+Apache? FOP (Formatting Objects Processor) is a print formatter driven
+by XSL formatting objects (XSL-FO) and an output independent formatter.
+It is a Java application that reads a formatting object (FO) tree and
+renders the resulting pages to a specified output.
 
-Note that not all parts of the XSL 1.1 specification have yet been 
-implemented.
+Output formats currently supported include PDF, PS, PCL, AFP, XML
+(area tree representation), Print, AWT and PNG, and to a lesser extent,
+RTF and TXT.  The primary output target is PDF.
+
+The goals of the Apache FOP project are to deliver an XSL-FO to PDF
+formatter that is compliant to at least the Basic conformance level
+described in the W3C Recommendation from 05 December 2006, and that
+complies with the November 2001 Portable Document Format Specification
+(Version 1.4) from Adobe Systems.
diff --git a/office/fop/fop.SlackBuild b/office/fop/fop.SlackBuild
index df361192a0..82871cd44f 100644
--- a/office/fop/fop.SlackBuild
+++ b/office/fop/fop.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fop
-VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -69,23 +69,26 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Fix an Issue with Java 8 thanks LFS =]
+# Fix an Issue with Java 8 (thanks LFS):
 sed -i '\@</javad@i\
 <arg value="-Xdoclint:none"/>\
-<arg value="--allow-script-in-comments"/>' build.xml
+<arg value="--allow-script-in-comments"/>' fop/build.xml
 
-# Compiles with apache-ant:
-ant compile
-ant jar-main
-ant javadocs
+# Increase hyphenation stacksize from 512k to 1M (thanks LFS):
+sed -e '/hyph\.stack/s/512k/1M/' -i fop/build.xml
 
-mv build/javadocs .
+# Compiles with apache-ant:
+ant -f fop/build.xml compile
+ant -f fop/build.xml jar-main
+ant -f fop/build.xml javadocs
 
 mkdir -p $PKG/opt/$PRGNAM-$VERSION
 install -v -d -m755 $PKG/opt/$PRGNAM-$VERSION/
 
-cp -va build conf examples fop* javadocs lib status.xml \
- $PKG/opt/$PRGNAM-$VERSION
+( cd fop
+mv build/javadocs .
+cp -va build conf examples javadocs fop* lib \
+ $PKG/opt/$PRGNAM-$VERSION )
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/office/fop/fop.info b/office/fop/fop.info
index ed30b5d04f..1037a04203 100644
--- a/office/fop/fop.info
+++ b/office/fop/fop.info
@@ -1,10 +1,10 @@
 PRGNAM="fop"
-VERSION="2.0"
-HOMEPAGE="http://www.apache.org"
-DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.0-src.tar.gz"
-MD5SUM="754e5307a73433afb5c4c9b11d45e302"
+VERSION="2.4"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
+DOWNLOAD="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-2.4-src.tar.gz"
+MD5SUM="e379d5916bc705b6fd3808a77f5d8478"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="apache-ant jai"
-MAINTAINER="Thorn Inurcide"
-EMAIL="thorn-inurcide@yandex.com"
+REQUIRES="apache-ant"
+MAINTAINER="Lenard Spencer"
+EMAIL="lenardrspencer@gmail.com"
diff --git a/office/fop/slack-desc b/office/fop/slack-desc
index db6fddeee2..e9326593e5 100644
--- a/office/fop/slack-desc
+++ b/office/fop/slack-desc
@@ -10,10 +10,10 @@ fop: fop (print formatter)
 fop:
 fop: Apache FOP is a print formatter driven by XSL formatting objects. It
 fop: is a Java application that reads a formatting object tree conforming
-fop: to the XSL 1.1 Recommendation (05 December 2006) and then turns it
-fop: into a PDF document, certain other output formats or allows you to
-fop: preview it directly on screen. Note that not all parts of the XSL
-fop: 1.1 specification have yet been implemented.
+fop: to the XSL 1.1 Recommendation (05 December 2006) and renders the
+fop: resulting pages to a specified output.  Current outputs supported
+fop: include PDF, PS, PCL,AFP, XML (area tree representation), Print,
+fop: AWT, and TXT.  The primary output target is PDF.
 fop:
+fop: Home: https://xmlgraphics.apache.org/fop/
 fop:
-fop: Home: apache.org