git: dc024140c017 - main - math/scilab: Update path to xml-apis-ext.jar

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=dc024140c0176afd63a9de25523cb4119e5f7f66

commit dc024140c0176afd63a9de25523cb4119e5f7f66
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-06-01 02:33:53 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-06-01 02:41:41 +0000

    math/scilab: Update path to xml-apis-ext.jar
    
    Also:
    - Replace PORTVERSION with DISTVERSION.
    - Improve search path for jar-files in general.
    - Fix search jrosetta-api.jar.
    - Fix search saxon-he*.jar, but this old version of scilab support
      saxon < 10 and textproc/saxon-he have 12.6 - math/scilab is broken
      and need update.
---
 math/scilab/Makefile | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 95a4faccb394..d3271a6437f8 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	scilab
-PORTVERSION=	6.1.1
-PORTREVISION=	21
+DISTVERSION=	6.1.1
+PORTREVISION=	22
 CATEGORIES=	math cad java
-MASTER_SITES=	https://www.scilab.org/download/${PORTVERSION}/
+MASTER_SITES=	https://www.scilab.org/download/${DISTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -41,7 +41,7 @@ LDFLAGS+=	${ICONV_LIB}
 CONFIGURE_ENV=	BLAS_LIBS="${BLASLIB}" LAPACK_LIBS="${LAPACKLIB}"
 INSTALL_TARGET=	install-strip
 
-PLIST_SUB=	SHLIB_VER=${PORTVERSION}
+PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=	GUI OCAML TK
 OPTIONS_RADIO=	BLAS
@@ -58,6 +58,7 @@ OPENBLAS_USES=	blaslapack:openblas
 GUI_DESC=	Java-based Graphical User Interface
 OCAML_DESC=	Scicos - dynamical system simulator (requires GUI)
 
+_JAVADIR=	${LOCALBASE}/share/java
 # Java dependencies:
 _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		${JAVALIBDIR}/jogl2.jar:graphics/jogamp-jogl \
@@ -70,9 +71,9 @@ _GUI_DEPENDS+=	${JAVALIBDIR}/flexdock.jar:devel/flexdock \
 		${JAVALIBDIR}/ecj-4.4.2.jar:java/eclipse-ecj \
 		${JAVALIBDIR}/lucene-core-5.5.5.jar:textproc/lucene5
 # Documentation, graphic export:
-_GUI_DEPENDS+=	${LOCALBASE}/share/java/fop/build/fop.jar:textproc/fop \
+_GUI_DEPENDS+=	${_JAVADIR}/fop/build/fop.jar:textproc/fop \
 		${JAVALIBDIR}/jlatexmath-fop.jar:math/jlatexmath \
-		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
+		${_JAVADIR}/batik/lib/batik-all.jar:graphics/batik \
 		${JAVALIBDIR}/avalon-framework.jar:devel/avalon-framework \
 		${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
 		${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
@@ -83,8 +84,8 @@ _GUI_DEPENDS+=	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils
 		${LOCALBASE}/bin/splint:devel/splint
 # Documentation building:
 _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp/javahelp.xsl:textproc/docbook-xsl \
-		${JAVALIBDIR}/saxon-he-12.5.jar:textproc/saxon-he \
-		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
+		${JAVALIBDIR}/saxon-he-12.6.jar:textproc/saxon-he \
+		${_JAVADIR}/xml-commons/xml-apis-ext.jar:textproc/xml-commons \
 		xsltproc:textproc/libxslt
 # Other gui deps:
 _GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks \
@@ -162,16 +163,21 @@ post-patch-GUI-on:
 	@${REINPLACE_CMD} -e 's|/usr/lib/java|${JAVALIBDIR}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/lib64/jni|${LOCALBASE}/lib/|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} 's,\(DEFAULT_JAR_DIR="\),\1 \
-		${LOCALBASE}/share/java/classes \
-		${LOCALBASE}/share/java/fop/build \
-		${LOCALBASE}/share/java/batik/lib \
-		${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure
+		${JAVALIBDIR} \
+		${_JAVADIR} \
+		${_JAVADIR}/batik/lib \
+		${_JAVADIR}/fop/build \
+		${_JAVADIR}/jeuclid/repo \
+		${_JAVADIR}/xml-commons \
+		,' ${WRKSRC}/configure
 # Prefer non-versioned files to avoid excessive rebuilds. This also fixes detection of fop.
 	@${REINPLACE_CMD} 's|batik-all\*\.jar|batik-all.jar|g; \
 			s|commons-io\*\.jar|commons-io.jar|g; \
 			s|commons-logging\*\.jar|commons-logging.jar|g; \
 			s|fop\*\.jar|fop.jar|g; \
 			s|jlatexmath\*\.jar|jlatexmath.jar|g; \
+			s|jrosetta-API.jar|jrosetta-api.jar|g; \
+			s|saxon9he.jar|saxon-he-*.jar|g; \
 			s|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \
 			${WRKSRC}/configure
 # Part of the jogamp-jogl-2.3 patch: