CVS commit: pkgsrc/textproc/fop

["Kevin Bloom" <ktnb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Thu Jun 27 13:44:26 UTC 2024

Modified Files:
        pkgsrc/textproc/fop: Makefile PLIST distinfo
Added Files:
        pkgsrc/textproc/fop/patches: patch-fop_fop
Removed Files:
        pkgsrc/textproc/fop/patches: patch-aa

Log Message:
fop: udpate to 2.9

2.9:
- Add support for font-selection-strategy=character-by-character
- Allow XMP at PDF page level
- Allow use of page position only on redo of layout

Past news:
https://xmlgraphics.apache.org/fop/news.html


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/textproc/fop/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/fop/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/fop/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/textproc/fop/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/fop/patches/patch-fop_fop

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/fop/Makefile
diff -u pkgsrc/textproc/fop/Makefile:1.38 pkgsrc/textproc/fop/Makefile:1.39
--- pkgsrc/textproc/fop/Makefile:1.38   Mon Nov  4 21:43:35 2019
+++ pkgsrc/textproc/fop/Makefile        Thu Jun 27 13:44:26 2024
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.38 2019/11/04 21:43:35 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2024/06/27 13:44:26 ktnb Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 #
 
 DISTNAME=      fop-${VERSION}-bin
 PKGNAME=       fop-${VERSION}
-VERSION=       1.1
+VERSION=       2.9
 CATEGORIES=    textproc www
 MASTER_SITES=  ${MASTER_SITE_APACHE:=xmlgraphics/fop/binaries/}
 
@@ -15,6 +15,7 @@ COMMENT=      Print formatter driven by XSL F
 LICENSE=       apache-2.0
 
 USE_JAVA=              run
+USE_JAVA2=             yes
 USE_TOOLS+=            pax
 NO_CONFIGURE=          yes
 NO_BUILD=              yes
@@ -27,7 +28,7 @@ PLIST_SRC=    ${PKGDIR}/PLIST
 SUBST_CLASSES+=                        java_home
 SUBST_STAGE.java_home=         pre-install
 SUBST_MESSAGE.java_home=       Setting JAVA_HOME to a sane value.
-SUBST_FILES.java_home=         fop
+SUBST_FILES.java_home=         fop/fop
 SUBST_FILES.java_home+=                fop-ttfreader.sh
 SUBST_VARS.java_home=          PKG_JAVA_HOME PREFIX SH
 
@@ -38,7 +39,7 @@ fop-ttfreader:
                ${WRKSRC}/fop-ttfreader.sh
 
 do-install:
-       cd ${WRKSRC} && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/java/fop
+       cd ${WRKSRC}/fop && ${PAX} -rw . ${DESTDIR}${PREFIX}/share/java/fop
        ${LN} -sf ../share/java/fop/fop ${DESTDIR}${PREFIX}/bin
        ${RM} -f ${DESTDIR}${PREFIX}/share/java/fop/fop.orig
        ${RM} -f ${DESTDIR}${PREFIX}/share/java/fop/fop-ttfreader.sh

Index: pkgsrc/textproc/fop/PLIST
diff -u pkgsrc/textproc/fop/PLIST:1.6 pkgsrc/textproc/fop/PLIST:1.7
--- pkgsrc/textproc/fop/PLIST:1.6       Wed Jan 22 09:18:40 2014
+++ pkgsrc/textproc/fop/PLIST   Thu Jun 27 13:44:26 2024
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2014/01/22 09:18:40 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.7 2024/06/27 13:44:26 ktnb Exp $
 bin/fop
 bin/fop-ttfreader
-share/java/fop/KEYS
-share/java/fop/LICENSE
-share/java/fop/NOTICE
-share/java/fop/README
-share/java/fop/build/fop.jar
+share/java/fop/build/${PKGNAME}.jar
+share/java/fop/build/fop-core-${PKGVERSION}.jar
+share/java/fop/build/fop-events-${PKGVERSION}.jar
+share/java/fop/build/fop-util-${PKGVERSION}.jar
 share/java/fop/conf/fop.xconf
 share/java/fop/examples/embedding/README
 share/java/fop/examples/embedding/build.xml
@@ -52,6 +51,7 @@ share/java/fop/examples/fo/advanced/blee
 share/java/fop/examples/fo/advanced/cid-fonts.fo
 share/java/fop/examples/fo/advanced/cid-fonts.pdf
 share/java/fop/examples/fo/advanced/giro.fo
+share/java/fop/examples/fo/advanced/rounded-corners.fo
 share/java/fop/examples/fo/basic/alignment.fo
 share/java/fop/examples/fo/basic/blockcontainer.fo
 share/java/fop/examples/fo/basic/border.fo
@@ -110,7 +110,6 @@ share/java/fop/examples/fo/region_body/s
 share/java/fop/examples/fo/region_body/simplecol4.fo
 share/java/fop/examples/fo/svg/boxes.svg
 share/java/fop/examples/fo/svg/embedding.fo
-share/java/fop/examples/fo/svg/external.fo
 share/java/fop/examples/fo/svg/multi.svg
 share/java/fop/examples/fo/svg/ref.svg
 share/java/fop/examples/fo/svg/view.svg
@@ -151,32 +150,35 @@ share/java/fop/fop.bat
 share/java/fop/fop.cmd
 share/java/fop/fop.js
 share/java/fop/lib/README.txt
-share/java/fop/lib/avalon-framework-4.2.0.jar
-share/java/fop/lib/avalon-framework.LICENSE.txt
-share/java/fop/lib/avalon-framework.NOTICE.TXT
-share/java/fop/lib/batik-all-1.7.jar
+share/java/fop/lib/batik-anim-1.17.jar
+share/java/fop/lib/batik-awt-util-1.17.jar
+share/java/fop/lib/batik-bridge-1.17.jar
+share/java/fop/lib/batik-codec-1.17.jar
+share/java/fop/lib/batik-constants-1.17.jar
+share/java/fop/lib/batik-css-1.17.jar
+share/java/fop/lib/batik-dom-1.17.jar
+share/java/fop/lib/batik-ext-1.17.jar
+share/java/fop/lib/batik-extension-1.17.jar
+share/java/fop/lib/batik-gvt-1.17.jar
+share/java/fop/lib/batik-i18n-1.17.jar
+share/java/fop/lib/batik-parser-1.17.jar
+share/java/fop/lib/batik-script-1.17.jar
+share/java/fop/lib/batik-shared-resources-1.17.jar
+share/java/fop/lib/batik-svg-dom-1.17.jar
+share/java/fop/lib/batik-svggen-1.17.jar
+share/java/fop/lib/batik-transcoder-1.17.jar
+share/java/fop/lib/batik-util-1.17.jar
+share/java/fop/lib/batik-xml-1.17.jar
 share/java/fop/lib/batik.LICENSE.txt
 share/java/fop/lib/batik.NOTICE.txt
-share/java/fop/lib/commons-io-1.3.1.jar
+share/java/fop/lib/commons-io-2.11.0.jar
 share/java/fop/lib/commons-io.LICENSE.txt
 share/java/fop/lib/commons-io.NOTICE.txt
 share/java/fop/lib/commons-logging-1.0.4.jar
 share/java/fop/lib/commons-logging.LICENSE.txt
 share/java/fop/lib/commons-logging.NOTICE.txt
-share/java/fop/lib/serializer-2.7.0.jar
-share/java/fop/lib/serializer.LICENSE.txt
-share/java/fop/lib/serializer.NOTICE.txt
-share/java/fop/lib/xalan-2.7.0.jar
-share/java/fop/lib/xalan.BCEL.LICENSE.txt
-share/java/fop/lib/xalan.LICENSE.txt
-share/java/fop/lib/xalan.NOTICE.txt
-share/java/fop/lib/xalan.regexp.LICENSE.txt
-share/java/fop/lib/xalan.runtime.LICENSE.txt
-share/java/fop/lib/xerces.LICENSE.txt
-share/java/fop/lib/xercesImpl-2.7.1.jar
-share/java/fop/lib/xercesImpl.LICENSE.txt
-share/java/fop/lib/xercesImpl.NOTICE.txt
-share/java/fop/lib/xml-apis-1.3.04.jar
+share/java/fop/lib/fontbox-2.0.27.jar
+share/java/fop/lib/xml-apis-1.4.01.jar
 share/java/fop/lib/xml-apis-ext-1.3.04.jar
 share/java/fop/lib/xml-apis-ext.LICENSE.dom-documentation.txt
 share/java/fop/lib/xml-apis-ext.LICENSE.dom-software.txt
@@ -189,7 +191,6 @@ share/java/fop/lib/xml-apis.LICENSE.DOM-
 share/java/fop/lib/xml-apis.LICENSE.DOM-software.html
 share/java/fop/lib/xml-apis.LICENSE.txt
 share/java/fop/lib/xml-apis.NOTICE.txt
-share/java/fop/lib/xmlgraphics-commons-1.5.jar
+share/java/fop/lib/xmlgraphics-commons-${PKGVERSION}.jar
 share/java/fop/lib/xmlgraphics-commons.LICENSE.txt
 share/java/fop/lib/xmlgraphics-commons.NOTICE.txt
-share/java/fop/status.xml

Index: pkgsrc/textproc/fop/distinfo
diff -u pkgsrc/textproc/fop/distinfo:1.9 pkgsrc/textproc/fop/distinfo:1.10
--- pkgsrc/textproc/fop/distinfo:1.9    Tue Oct 26 11:21:54 2021
+++ pkgsrc/textproc/fop/distinfo        Thu Jun 27 13:44:26 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:21:54 nia Exp $
+$NetBSD: distinfo,v 1.10 2024/06/27 13:44:26 ktnb Exp $
 
-BLAKE2s (fop-1.1-bin.tar.gz) = 0cd4324eb857b9c718a34dc75480456b751bcdc3ce7f961204238a8caf049b4d
-SHA512 (fop-1.1-bin.tar.gz) = 2f639ed6af993b4367fca35270559e984f82adb08fd999bcf9ace638d0facc40f0ae40c3041784de512aa450b665d44e8c14801093af4ae64378e6e705d4b44e
-Size (fop-1.1-bin.tar.gz) = 22490250 bytes
-SHA1 (patch-aa) = dfbcc411ae6d5f5e092e09643191fb093ecd4357
+BLAKE2s (fop-2.9-bin.tar.gz) = bda37131d608b8fc07cd7b70b35da4d5c07ebed3116ded7edb8c74243b0389db
+SHA512 (fop-2.9-bin.tar.gz) = 8367663e717d5413dc13271d7f33781574be5869a3552dbfc7cfd7d31953b1b8b9e77a92c56b2d5dbcc7d41225f55959afe6800504b13cab614cb012d91867a7
+Size (fop-2.9-bin.tar.gz) = 16800910 bytes
+SHA1 (patch-fop_fop) = 333db21c9414522aaa0d2ef274ab078220682839

Added files:

Index: pkgsrc/textproc/fop/patches/patch-fop_fop
diff -u /dev/null pkgsrc/textproc/fop/patches/patch-fop_fop:1.1
--- /dev/null   Thu Jun 27 13:44:26 2024
+++ pkgsrc/textproc/fop/patches/patch-fop_fop   Thu Jun 27 13:44:26 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-fop_fop,v 1.1 2024/06/27 13:44:26 ktnb Exp $
+
+The fop script needs JAVA_HOME set, so prepare a variable to sed into.
+
+--- fop/fop.orig       2024-06-13 19:53:39.993261804 +0000
++++ fop/fop
+@@ -89,6 +89,8 @@ case "`uname`" in
+            ;;
+ esac
+ 
++JAVA_HOME=@PKG_JAVA_HOME@
++
+ if [ -z "$FOP_HOME" -o ! -d "$FOP_HOME" ] ; then
+   ## resolve links - $0 may be a link to fop's home
+   PRG="$0"