Date: Mon, 1 Jun 2020 20:02:40 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r537507 - head/math/scilab Message-ID: <202006012002.051K2eJb035974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Mon Jun 1 20:02:39 2020 New Revision: 537507 URL: https://svnweb.freebsd.org/changeset/ports/537507 Log: math/scilab: - Chase devel/apache-commons-io update to 2.7. Although it is binary compatible with 2.6, scilab hardcodes path to the versioned jar. - Patch scilab configure script to avoid dependencies on versioned jar files. Modified: head/math/scilab/Makefile Modified: head/math/scilab/Makefile ============================================================================== --- head/math/scilab/Makefile Mon Jun 1 20:02:06 2020 (r537506) +++ head/math/scilab/Makefile Mon Jun 1 20:02:39 2020 (r537507) @@ -3,6 +3,7 @@ PORTNAME= scilab PORTVERSION= 6.1.0 +PORTREVISION= 1 CATEGORIES= math cad java MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} @@ -145,7 +146,14 @@ post-patch-GUI-on: ${LOCALBASE}/share/java/fop/build \ ${LOCALBASE}/share/java/batik/lib \ ${LOCALBASE}/share/java/jeuclid/repo ,' ${WRKSRC}/configure - @${REINPLACE_CMD} 's|fop\*.jar|fop.jar|' ${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|xmlgraphics-commons\*\.jar|xmlgraphics-commons.jar|g' \ + ${WRKSRC}/configure # Part of the jogamp-jogl-2.3 patch: @${REINPLACE_CMD} -e 's|javax.media.opengl.glu.GLUnurbs|com.jogamp.opengl.glu.GLUnurbs|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|jogamp.common.os.MachineDescriptionRuntime|jogamp.common.os.MachineDataInfoRuntime|' ${WRKSRC}/configure
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006012002.051K2eJb035974>